@effect-app/cli 1.23.13 → 1.23.15

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @effect-app/cli
 
+## 1.23.15
+
+### Patch Changes
+
+- 8994599: fix some wiki commands
+
+## 1.23.14
+
+### Patch Changes
+
+- 2cad28a: some fixes to wiki commands
+
 ## 1.23.13
 
 ### Patch Changes

package/dist/index.js

@@ -21,9 +21,20 @@ Effect
      * @param cwd - Optional working directory to execute the command in
      * @returns An Effect that succeeds with the exit code or fails with a PlatformError
      */
-    const runNodeCommand = (cmd, cwd) => NodeCommand
+    const runNodeCommandEC = (cmd, cwd) => NodeCommand
         .make("sh", "-c", cmd)
         .pipe(NodeCommand.stdout("inherit"), NodeCommand.stderr("inherit"), cwd ? NodeCommand.workingDirectory(cwd) : identity, NodeCommand.exitCode);
+    /**
+     * Executes a shell command using Node.js Command API and captures output as string.
+     * The command is run through the system shell (/bin/sh) for proper command parsing.
+     *
+     * @param cmd - The shell command to execute
+     * @param cwd - Optional working directory to execute the command in
+     * @returns An Effect that succeeds with the command output or fails with a PlatformError
+     */
+    const runNodeCommand = (cmd, cwd) => NodeCommand
+        .make("sh", "-c", cmd)
+        .pipe(cwd ? NodeCommand.workingDirectory(cwd) : identity, NodeCommand.string);
     /**
      * Executes a bash script file using Node.js Command API with inherited stdio streams.
      * The script file is executed directly through the shell (/bin/sh).
@@ -48,8 +59,8 @@ Effect
     const updateEffectAppPackages = Effect.fn("effa-cli.ue.updateEffectAppPackages")(function* () {
         const filters = ["effect-app", "@effect-app/*"];
         for (const filter of filters) {
-            yield* runNodeCommand(`pnpm exec ncu -u --filter "${filter}"`);
-            yield* runNodeCommand(`pnpm -r exec ncu -u --filter "${filter}"`);
+            yield* runNodeCommandEC(`pnpm exec ncu -u --filter "${filter}"`);
+            yield* runNodeCommandEC(`pnpm -r exec ncu -u --filter "${filter}"`);
         }
     })();
     /**
@@ -60,8 +71,8 @@ Effect
     const updateEffectPackages = Effect.fn("effa-cli.ue.updateEffectPackages")(function* () {
         const effectFilters = ["effect", "@effect/*", "@effect-atom/*"];
         for (const filter of effectFilters) {
-            yield* runNodeCommand(`pnpm exec ncu -u --filter "${filter}"`);
-            yield* runNodeCommand(`pnpm -r exec ncu -u --filter "${filter}"`);
+            yield* runNodeCommandEC(`pnpm exec ncu -u --filter "${filter}"`);
+            yield* runNodeCommandEC(`pnpm -r exec ncu -u --filter "${filter}"`);
         }
     })();
     /**
@@ -89,7 +100,7 @@ Effect
         pj.resolutions = resolutions;
         yield* fs.writeFileString(packageJsonPath, JSON.stringify(pj, null, 2));
         yield* Effect.logInfo("Updated package.json with local file resolutions");
-        yield* runNodeCommand("pnpm i");
+        yield* runNodeCommandEC("pnpm i");
         yield* Effect.logInfo("Successfully linked local packages");
     });
     /**
@@ -113,7 +124,7 @@ Effect
         pj.resolutions = filteredResolutions;
         yield* fs.writeFileString(packageJsonPath, JSON.stringify(pj, null, 2));
         yield* Effect.logInfo("Removed effect-app file resolutions from package.json");
-        yield* runNodeCommand("pnpm i");
+        yield* runNodeCommandEC("pnpm i");
         yield* Effect.logInfo("Successfully unlinked local packages");
     })();
     /**
@@ -148,7 +159,7 @@ Effect
                 if (existingFiles.length > 0) {
                     yield* Effect.logInfo(`Controller change detected: ${event.path}, fixing files: ${existingFiles.join(", ")}`);
                     const eslintArgs = existingFiles.map((f) => `"../${f}"`).join(" ");
-                    yield* runNodeCommand(`cd api && pnpm eslint --fix ${eslintArgs}`);
+                    yield* runNodeCommandEC(`cd api && pnpm eslint --fix ${eslintArgs}`);
                     break;
                 }
                 i++;
@@ -173,7 +184,7 @@ Effect
             if (event.path.endsWith(indexFile))
                 return;
             yield* Effect.logInfo(`Root change detected: ${event.path}, fixing: ${indexFile}`);
-            yield* runNodeCommand(`pnpm eslint --fix "${indexFile}"`);
+            yield* runNodeCommandEC(`pnpm eslint --fix "${indexFile}"`);
         })))
             .pipe(Effect.andThen(Effect.addFinalizer(() => Effect.logInfo(`Stopped monitoring root indexes in: ${watchPath} -> ${indexFile}`))), Effect.forkScoped);
     });
@@ -300,7 +311,7 @@ Effect
                 ? wrapOption.value.join(" ")
                 : wrapOption.value;
             yield* Effect.logInfo(`Spawning child command: ${val}`);
-            yield* runNodeCommand(val);
+            yield* runNodeCommandEC(val);
         }
         return;
     }, (_) => Effect.scoped(_)));
@@ -345,11 +356,11 @@ Effect
         });
         switch (prompted) {
             case "effect-app":
-                return yield* updateEffectAppPackages.pipe(Effect.andThen(runNodeCommand("pnpm i")));
+                return yield* updateEffectAppPackages.pipe(Effect.andThen(runNodeCommandEC("pnpm i")));
             case "effect":
-                return yield* updateEffectPackages.pipe(Effect.andThen(runNodeCommand("pnpm i")));
+                return yield* updateEffectPackages.pipe(Effect.andThen(runNodeCommandEC("pnpm i")));
             case "both":
-                return yield* updateEffectPackages.pipe(Effect.andThen(updateEffectAppPackages), Effect.andThen(runNodeCommand("pnpm i")));
+                return yield* updateEffectPackages.pipe(Effect.andThen(updateEffectAppPackages), Effect.andThen(runNodeCommandEC("pnpm i")));
         }
     }))
         .pipe(Command.withDescription("Update effect-app and/or effect packages"));
@@ -416,11 +427,11 @@ Effect
         switch (action) {
             case "sync": {
                 yield* Effect.logInfo("Initializing/updating git submodule for documentation...");
-                return yield* runNodeCommand("git submodule update --init --recursive --remote doc");
+                return yield* runNodeCommandEC("git submodule update --init --recursive --remote doc");
             }
             case "update": {
                 yield* Effect.logInfo("Pulling latest changes from remote submodule...");
-                yield* runNodeCommand("git submodule update --init --recursive --remote doc");
+                yield* runNodeCommandEC("git submodule update --init --recursive --remote doc");
                 const commitMessage = yield* Prompt.text({
                     message: "Enter commit message:",
                     default: "update doc",
@@ -429,11 +440,26 @@ Effect
                         : Effect.fail("Commit message cannot be empty")
                 });
                 yield* Effect.logInfo("Committing and pushing changes in submodule...");
-                yield* runNodeCommand(`git -C doc add . && git -C doc commit -m '${commitMessage}' && git -C doc push`);
+                yield* runNodeCommandEC(`git -C doc add . && git -C doc commit -m '${commitMessage}' && git -C doc push`);
                 return yield* Effect.logInfo("Submodule updated and pushed successfully");
             }
             case "init-wiki": {
                 yield* Effect.logInfo("⚠️  IMPORTANT: This is a one-time project setup command!");
+                // Check if doc directory already exists in git index
+                const docInIndex = yield* runNodeCommand("git ls-files")
+                    .pipe(Effect.map((output) => output.includes("doc/")), Effect.catchAll(() => Effect.succeed(false)));
+                if (docInIndex) {
+                    return yield* Effect.logError(`❌ ERROR: A 'doc' directory already exists in the git index!
+
+This suggests the wiki submodule may have been initialized before, or there are conflicting files.
+
+Required actions before proceeding:
+1. Move existing doc files to GitHub wiki or another location
+2. Remove the doc directory from git index: git rm --cached -r doc/
+3. Re-run this command
+
+Operation cancelled for safety.`);
+                }
                 const confirmation = yield* Prompt.confirm({
                     message: `This command will initialize the wiki submodule for this project.
 
@@ -453,9 +479,7 @@ Are you sure you want to proceed with the one-time project setup?`,
                     return yield* Effect.logInfo("Operation cancelled. Use 'effa wiki sync' for normal wiki operations.");
                 }
                 yield* Effect.logInfo("Extracting project name from git remote...");
-                const remoteUrl = yield* NodeCommand
-                    .make("git", "config", "--get", "remote.origin.url")
-                    .pipe(NodeCommand.string);
+                const remoteUrl = yield* runNodeCommand("git config --get remote.origin.url");
                 // Extract project name from URL (supports both SSH and HTTPS)
                 // Examples:
                 // - git@github.com:user/project-name.git -> project-name
@@ -479,16 +503,16 @@ Are you sure you want to proceed with the one-time project setup?`,
                 });
                 yield* Effect.logInfo(`Using project name: ${detectedProjectName}`);
                 yield* Effect.logInfo("Creating .gitmodules file...");
-                yield* runNodeCommand(`echo '' >> .gitmodules`);
-                yield* runNodeCommand(`echo '[submodule "doc"]' >> .gitmodules`);
-                yield* runNodeCommand(`echo '  path = doc' >> .gitmodules`);
-                yield* runNodeCommand(`echo '  url = ../${detectedProjectName}.wiki.git' >> .gitmodules`);
-                yield* runNodeCommand(`echo '  branch = master' >> .gitmodules`);
-                yield* runNodeCommand(`echo '  update = merge' >> .gitmodules`);
+                yield* runNodeCommandEC(`echo '' >> .gitmodules`);
+                yield* runNodeCommandEC(`echo '[submodule "doc"]' >> .gitmodules`);
+                yield* runNodeCommandEC(`echo '  path = doc' >> .gitmodules`);
+                yield* runNodeCommandEC(`echo '  url = ../${detectedProjectName}.wiki.git' >> .gitmodules`);
+                yield* runNodeCommandEC(`echo '  branch = master' >> .gitmodules`);
+                yield* runNodeCommandEC(`echo '  update = merge' >> .gitmodules`);
                 yield* Effect.logInfo("Adding git submodule for documentation wiki...");
-                yield* runNodeCommand(`git submodule add -b master ../${detectedProjectName}.wiki.git doc`);
+                yield* runNodeCommandEC(`git submodule add -b master ../${detectedProjectName}.wiki.git doc`);
                 yield* Effect.logInfo("Committing wiki submodule addition...");
-                yield* runNodeCommand("git commit -m 'Add doc submodule'");
+                yield* runNodeCommandEC("git add . && git commit -am 'Add doc submodule'");
                 return yield* Effect.logInfo("Wiki submodule initialized successfully");
             }
             default: {
@@ -508,12 +532,12 @@ Available actions:
         .make("nuke", { dryRun: DryRunOption, storePrune: PruneStoreOption }, Effect.fn("effa-cli.nuke")(function* ({ dryRun, storePrune }) {
         yield* Effect.logInfo(dryRun ? "Performing dry run cleanup..." : "Performing nuclear cleanup...");
         if (dryRun) {
-            yield* runNodeCommand("find . -depth \\( -type d \\( -name 'node_modules' -o -name '.nuxt' -o -name 'dist' -o -name '.output' -o -name '.nitro' -o -name '.cache' -o -name 'test-results' -o -name 'test-out' -o -name 'coverage' \\) -print \\) -o \\( -type f \\( -name '*.log' -o -name '*.tsbuildinfo' \\) -print \\)");
+            yield* runNodeCommandEC("find . -depth \\( -type d \\( -name 'node_modules' -o -name '.nuxt' -o -name 'dist' -o -name '.output' -o -name '.nitro' -o -name '.cache' -o -name 'test-results' -o -name 'test-out' -o -name 'coverage' \\) -print \\) -o \\( -type f \\( -name '*.log' -o -name '*.tsbuildinfo' \\) -print \\)");
         }
         else {
-            yield* runNodeCommand("find . -depth \\( -type d \\( -name 'node_modules' -o -name '.nuxt' -o -name 'dist' -o -name '.output' -o -name '.nitro' -o -name '.cache' -o -name 'test-results' -o -name 'test-out' -o -name 'coverage' \\) -exec rm -rf -- {} + \\) -o \\( -type f \\( -name '*.log' -o -name '*.tsbuildinfo' \\) -delete \\)");
+            yield* runNodeCommandEC("find . -depth \\( -type d \\( -name 'node_modules' -o -name '.nuxt' -o -name 'dist' -o -name '.output' -o -name '.nitro' -o -name '.cache' -o -name 'test-results' -o -name 'test-out' -o -name 'coverage' \\) -exec rm -rf -- {} + \\) -o \\( -type f \\( -name '*.log' -o -name '*.tsbuildinfo' \\) -delete \\)");
             if (storePrune) {
-                yield* runNodeCommand("pnpm store prune");
+                yield* runNodeCommandEC("pnpm store prune");
             }
         }
         yield* Effect.logInfo("Cleanup operation completed");
@@ -538,4 +562,4 @@ Available actions:
     return yield* cli(process.argv);
 })()
     .pipe(Effect.scoped, Effect.provide(NodeContext.layer), NodeRuntime.runMain);
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/cli",
-  "version": "1.23.13",
+  "version": "1.23.15",
   "license": "MIT",
   "type": "module",
   "bin": {

package/src/index.ts

@@ -27,7 +27,7 @@ Effect
      * @param cwd - Optional working directory to execute the command in
      * @returns An Effect that succeeds with the exit code or fails with a PlatformError
      */
-    const runNodeCommand = (cmd: string, cwd?: string) =>
+    const runNodeCommandEC = (cmd: string, cwd?: string) =>
       NodeCommand
         .make("sh", "-c", cmd)
         .pipe(
@@ -37,6 +37,22 @@ Effect
           NodeCommand.exitCode
         )
 
+    /**
+     * Executes a shell command using Node.js Command API and captures output as string.
+     * The command is run through the system shell (/bin/sh) for proper command parsing.
+     *
+     * @param cmd - The shell command to execute
+     * @param cwd - Optional working directory to execute the command in
+     * @returns An Effect that succeeds with the command output or fails with a PlatformError
+     */
+    const runNodeCommand = (cmd: string, cwd?: string) =>
+      NodeCommand
+        .make("sh", "-c", cmd)
+        .pipe(
+          cwd ? NodeCommand.workingDirectory(cwd) : identity,
+          NodeCommand.string
+        )
+
     /**
      * Executes a bash script file using Node.js Command API with inherited stdio streams.
      * The script file is executed directly through the shell (/bin/sh).
@@ -62,8 +78,8 @@ Effect
     const updateEffectAppPackages = Effect.fn("effa-cli.ue.updateEffectAppPackages")(function*() {
       const filters = ["effect-app", "@effect-app/*"]
       for (const filter of filters) {
-        yield* runNodeCommand(`pnpm exec ncu -u --filter "${filter}"`)
-        yield* runNodeCommand(`pnpm -r exec ncu -u --filter "${filter}"`)
+        yield* runNodeCommandEC(`pnpm exec ncu -u --filter "${filter}"`)
+        yield* runNodeCommandEC(`pnpm -r exec ncu -u --filter "${filter}"`)
       }
     })()
 
@@ -75,8 +91,8 @@ Effect
     const updateEffectPackages = Effect.fn("effa-cli.ue.updateEffectPackages")(function*() {
       const effectFilters = ["effect", "@effect/*", "@effect-atom/*"]
       for (const filter of effectFilters) {
-        yield* runNodeCommand(`pnpm exec ncu -u --filter "${filter}"`)
-        yield* runNodeCommand(`pnpm -r exec ncu -u --filter "${filter}"`)
+        yield* runNodeCommandEC(`pnpm exec ncu -u --filter "${filter}"`)
+        yield* runNodeCommandEC(`pnpm -r exec ncu -u --filter "${filter}"`)
       }
     })()
 
@@ -110,7 +126,7 @@ Effect
       yield* fs.writeFileString(packageJsonPath, JSON.stringify(pj, null, 2))
       yield* Effect.logInfo("Updated package.json with local file resolutions")
 
-      yield* runNodeCommand("pnpm i")
+      yield* runNodeCommandEC("pnpm i")
 
       yield* Effect.logInfo("Successfully linked local packages")
     })
@@ -143,7 +159,7 @@ Effect
       yield* fs.writeFileString(packageJsonPath, JSON.stringify(pj, null, 2))
       yield* Effect.logInfo("Removed effect-app file resolutions from package.json")
 
-      yield* runNodeCommand("pnpm i")
+      yield* runNodeCommandEC("pnpm i")
       yield* Effect.logInfo("Successfully unlinked local packages")
     })()
 
@@ -190,7 +206,7 @@ Effect
                     )
 
                     const eslintArgs = existingFiles.map((f) => `"../${f}"`).join(" ")
-                    yield* runNodeCommand(`cd api && pnpm eslint --fix ${eslintArgs}`)
+                    yield* runNodeCommandEC(`cd api && pnpm eslint --fix ${eslintArgs}`)
                     break
                   }
                   i++
@@ -230,7 +246,7 @@ Effect
 
                 yield* Effect.logInfo(`Root change detected: ${event.path}, fixing: ${indexFile}`)
 
-                yield* runNodeCommand(`pnpm eslint --fix "${indexFile}"`)
+                yield* runNodeCommandEC(`pnpm eslint --fix "${indexFile}"`)
               })
             )
           )
@@ -452,7 +468,7 @@ Effect
               : wrapOption.value
 
             yield* Effect.logInfo(`Spawning child command: ${val}`)
-            yield* runNodeCommand(val)
+            yield* runNodeCommandEC(val)
           }
 
           return
@@ -520,17 +536,17 @@ Effect
           switch (prompted) {
             case "effect-app":
               return yield* updateEffectAppPackages.pipe(
-                Effect.andThen(runNodeCommand("pnpm i"))
+                Effect.andThen(runNodeCommandEC("pnpm i"))
               )
 
             case "effect":
               return yield* updateEffectPackages.pipe(
-                Effect.andThen(runNodeCommand("pnpm i"))
+                Effect.andThen(runNodeCommandEC("pnpm i"))
               )
             case "both":
               return yield* updateEffectPackages.pipe(
                 Effect.andThen(updateEffectAppPackages),
-                Effect.andThen(runNodeCommand("pnpm i"))
+                Effect.andThen(runNodeCommandEC("pnpm i"))
               )
           }
         })
@@ -649,11 +665,11 @@ Effect
           switch (action) {
             case "sync": {
               yield* Effect.logInfo("Initializing/updating git submodule for documentation...")
-              return yield* runNodeCommand("git submodule update --init --recursive --remote doc")
+              return yield* runNodeCommandEC("git submodule update --init --recursive --remote doc")
             }
             case "update": {
               yield* Effect.logInfo("Pulling latest changes from remote submodule...")
-              yield* runNodeCommand("git submodule update --init --recursive --remote doc")
+              yield* runNodeCommandEC("git submodule update --init --recursive --remote doc")
 
               const commitMessage = yield* Prompt.text({
                 message: "Enter commit message:",
@@ -665,13 +681,33 @@ Effect
               })
 
               yield* Effect.logInfo("Committing and pushing changes in submodule...")
-              yield* runNodeCommand(`git -C doc add . && git -C doc commit -m '${commitMessage}' && git -C doc push`)
+              yield* runNodeCommandEC(`git -C doc add . && git -C doc commit -m '${commitMessage}' && git -C doc push`)
 
               return yield* Effect.logInfo("Submodule updated and pushed successfully")
             }
             case "init-wiki": {
               yield* Effect.logInfo("⚠️  IMPORTANT: This is a one-time project setup command!")
 
+              // Check if doc directory already exists in git index
+              const docInIndex = yield* runNodeCommand("git ls-files")
+                .pipe(
+                  Effect.map((output) => output.includes("doc/")),
+                  Effect.catchAll(() => Effect.succeed(false))
+                )
+
+              if (docInIndex) {
+                return yield* Effect.logError(`❌ ERROR: A 'doc' directory already exists in the git index!
+
+This suggests the wiki submodule may have been initialized before, or there are conflicting files.
+
+Required actions before proceeding:
+1. Move existing doc files to GitHub wiki or another location
+2. Remove the doc directory from git index: git rm --cached -r doc/
+3. Re-run this command
+
+Operation cancelled for safety.`)
+              }
+
               const confirmation = yield* Prompt.confirm({
                 message: `This command will initialize the wiki submodule for this project.
 
@@ -693,9 +729,7 @@ Are you sure you want to proceed with the one-time project setup?`,
               }
 
               yield* Effect.logInfo("Extracting project name from git remote...")
-              const remoteUrl = yield* NodeCommand
-                .make("git", "config", "--get", "remote.origin.url")
-                .pipe(NodeCommand.string)
+              const remoteUrl = yield* runNodeCommand("git config --get remote.origin.url")
 
               // Extract project name from URL (supports both SSH and HTTPS)
               // Examples:
@@ -725,18 +759,18 @@ Are you sure you want to proceed with the one-time project setup?`,
               yield* Effect.logInfo(`Using project name: ${detectedProjectName}`)
 
               yield* Effect.logInfo("Creating .gitmodules file...")
-              yield* runNodeCommand(`echo '' >> .gitmodules`)
-              yield* runNodeCommand(`echo '[submodule "doc"]' >> .gitmodules`)
-              yield* runNodeCommand(`echo '  path = doc' >> .gitmodules`)
-              yield* runNodeCommand(`echo '  url = ../${detectedProjectName}.wiki.git' >> .gitmodules`)
-              yield* runNodeCommand(`echo '  branch = master' >> .gitmodules`)
-              yield* runNodeCommand(`echo '  update = merge' >> .gitmodules`)
+              yield* runNodeCommandEC(`echo '' >> .gitmodules`)
+              yield* runNodeCommandEC(`echo '[submodule "doc"]' >> .gitmodules`)
+              yield* runNodeCommandEC(`echo '  path = doc' >> .gitmodules`)
+              yield* runNodeCommandEC(`echo '  url = ../${detectedProjectName}.wiki.git' >> .gitmodules`)
+              yield* runNodeCommandEC(`echo '  branch = master' >> .gitmodules`)
+              yield* runNodeCommandEC(`echo '  update = merge' >> .gitmodules`)
 
               yield* Effect.logInfo("Adding git submodule for documentation wiki...")
-              yield* runNodeCommand(`git submodule add -b master ../${detectedProjectName}.wiki.git doc`)
+              yield* runNodeCommandEC(`git submodule add -b master ../${detectedProjectName}.wiki.git doc`)
 
               yield* Effect.logInfo("Committing wiki submodule addition...")
-              yield* runNodeCommand("git commit -m 'Add doc submodule'")
+              yield* runNodeCommandEC("git add . && git commit -am 'Add doc submodule'")
 
               return yield* Effect.logInfo("Wiki submodule initialized successfully")
             }
@@ -771,16 +805,16 @@ Available actions:
           yield* Effect.logInfo(dryRun ? "Performing dry run cleanup..." : "Performing nuclear cleanup...")
 
           if (dryRun) {
-            yield* runNodeCommand(
+            yield* runNodeCommandEC(
               "find . -depth \\( -type d \\( -name 'node_modules' -o -name '.nuxt' -o -name 'dist' -o -name '.output' -o -name '.nitro' -o -name '.cache' -o -name 'test-results' -o -name 'test-out' -o -name 'coverage' \\) -print \\) -o \\( -type f \\( -name '*.log' -o -name '*.tsbuildinfo' \\) -print \\)"
             )
           } else {
-            yield* runNodeCommand(
+            yield* runNodeCommandEC(
               "find . -depth \\( -type d \\( -name 'node_modules' -o -name '.nuxt' -o -name 'dist' -o -name '.output' -o -name '.nitro' -o -name '.cache' -o -name 'test-results' -o -name 'test-out' -o -name 'coverage' \\) -exec rm -rf -- {} + \\) -o \\( -type f \\( -name '*.log' -o -name '*.tsbuildinfo' \\) -delete \\)"
             )
 
             if (storePrune) {
-              yield* runNodeCommand(
+              yield* runNodeCommandEC(
                 "pnpm store prune"
               )
             }