epicshop 6.84.0 → 6.84.2

package/dist/commands/cleanup.js

@@ -119,6 +119,45 @@ async function isDirectoryEmpty(targetPath) {
         return false;
     }
 }
+async function findWorkshopEntryFromCwd(startDir) {
+    let currentDir = startDir ? path.resolve(startDir) : process.cwd();
+    // If the user gave us a file path (or something that isn't a directory),
+    // treat the containing folder as the start point.
+    try {
+        const stats = await fs.stat(currentDir);
+        if (!stats.isDirectory()) {
+            currentDir = path.dirname(currentDir);
+        }
+    }
+    catch {
+        // If the path doesn't exist, we still attempt to walk upward from it.
+    }
+    const root = path.parse(currentDir).root;
+    while (currentDir !== root) {
+        const packageJsonPath = path.join(currentDir, 'package.json');
+        try {
+            const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
+            if (packageJson.epicshop) {
+                return {
+                    title: (typeof packageJson.epicshop?.title === 'string' &&
+                        packageJson.epicshop.title
+                        ? packageJson.epicshop.title
+                        : packageJson.name || path.basename(currentDir)) ?? currentDir,
+                    repoName: path.basename(currentDir),
+                    path: currentDir,
+                };
+            }
+        }
+        catch {
+            // Not a workshop root, keep walking up.
+        }
+        const parentDir = path.dirname(currentDir);
+        if (parentDir === currentDir)
+            break;
+        currentDir = parentDir;
+    }
+    return null;
+}
 async function listWorkshopsInDirectory(reposDir) {
     try {
         const entries = await fs.readdir(reposDir, { withFileTypes: true });
@@ -544,6 +583,7 @@ export async function cleanup({ silent = false, force = false, targets, workshop
     try {
         let selectedTargets = resolveCleanupTargets(targets);
         let selectedWorkshopTargets = resolveWorkshopCleanupTargets(workshopTargets);
+        const hasExplicitWorkshopSelection = (workshops?.length ?? 0) > 0;
         if ((workshops?.length ?? 0) > 0 || selectedWorkshopTargets.length > 0) {
             if (!selectedTargets.includes('workshops')) {
                 selectedTargets.push('workshops');
@@ -558,6 +598,7 @@ export async function cleanup({ silent = false, force = false, targets, workshop
         let configPath = '';
         let allWorkshops = [];
         let workshopIdentities = [];
+        let contextWorkshop = null;
         let workshopSummaries = [];
         let workshopBytes = 0;
         let legacyCacheBytes = 0;
@@ -582,12 +623,38 @@ export async function cleanup({ silent = false, force = false, targets, workshop
             } = await resolveCleanupPaths(paths));
             const needsWorkshopInventory = selectedTargets.length === 0 || selectedTargets.includes('workshops');
             if (needsWorkshopInventory) {
-                updateSpinner(analysisSpinner, 'Finding installed workshops...');
-                allWorkshops = await listWorkshopsInDirectory(reposDir);
+                const workshopFromCwd = await findWorkshopEntryFromCwd();
+                const shouldScopeToCwdWorkshop = !hasExplicitWorkshopSelection && Boolean(workshopFromCwd);
+                if (shouldScopeToCwdWorkshop && workshopFromCwd) {
+                    // Context-aware behavior: when running inside a workshop and no
+                    // explicit `--workshops` were provided, we treat the current workshop
+                    // as the only workshop candidate. This avoids suggesting other
+                    // workshops in prompts and keeps size estimates accurate.
+                    allWorkshops = [workshopFromCwd];
+                }
+                else {
+                    updateSpinner(analysisSpinner, 'Finding installed workshops...');
+                    allWorkshops = await listWorkshopsInDirectory(reposDir);
+                    // If we're inside a workshop that isn't in the configured repos
+                    // directory (e.g. working on a workshop repo elsewhere), still allow
+                    // cleanup to target the current workshop.
+                    if (workshopFromCwd) {
+                        const cwdId = getWorkshopInstanceId(workshopFromCwd.path);
+                        const alreadyIncluded = allWorkshops.some((w) => getWorkshopInstanceId(w.path) === cwdId);
+                        if (!alreadyIncluded) {
+                            allWorkshops.push(workshopFromCwd);
+                        }
+                    }
+                }
                 workshopIdentities = allWorkshops.map((workshop) => ({
                     ...workshop,
                     id: getWorkshopInstanceId(workshop.path),
                 }));
+                if (workshopFromCwd) {
+                    const cwdId = getWorkshopInstanceId(workshopFromCwd.path);
+                    contextWorkshop =
+                        workshopIdentities.find((workshop) => workshop.id === cwdId) ?? null;
+                }
             }
             if (selectedTargets.length === 0) {
                 if (allWorkshops.length > 0) {
@@ -685,6 +752,12 @@ export async function cleanup({ silent = false, force = false, targets, workshop
                     console.log(chalk.yellow('No workshops found to clean up.'));
                 }
             }
+            else if (!hasExplicitWorkshopSelection && contextWorkshop) {
+                // Context-aware default: if we're running from inside a workshop and no
+                // `--workshops` were provided, skip suggesting other workshops and
+                // default to the current workshop.
+                selectedWorkshops = [contextWorkshop];
+            }
             else if (workshops && workshops.length > 0) {
                 const resolved = resolveWorkshopSelection(workshopIdentities, workshops);
                 if (resolved.missing.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epicshop",
-  "version": "6.84.0",
+  "version": "6.84.2",
   "publishConfig": {
     "access": "public"
   },
@@ -99,7 +99,7 @@
     "build:watch": "nx watch --projects=epicshop -- nx run \\$NX_PROJECT_NAME:build"
   },
   "dependencies": {
-    "@epic-web/workshop-utils": "6.84.0",
+    "@epic-web/workshop-utils": "6.84.2",
     "@inquirer/prompts": "^8.2.0",
     "@sentry/node": "^10.38.0",
     "chalk": "^5.6.2",