epicshop 6.80.2 → 6.82.0

package/dist/cli.js

@@ -28,6 +28,13 @@ function formatHelp(helpText) {
         .replace(/--[\w-]+/g, (match) => chalk.yellow(match))
         .replace(/-\w(?=\s|,)/g, (match) => chalk.yellow(match));
 }
+function resolveWorkshopContextCwd(explicitWorkshopDir) {
+    const fromFlag = explicitWorkshopDir?.trim() ? explicitWorkshopDir.trim() : undefined;
+    if (fromFlag)
+        return fromFlag;
+    const fromEnv = process.env.EPICSHOP_CONTEXT_CWD;
+    return fromEnv?.trim() ? fromEnv.trim() : undefined;
+}
 // Set up yargs CLI
 const cli = yargs(args)
     .scriptName('epicshop')
@@ -767,6 +774,11 @@ const cli = yargs(args)
         type: 'boolean',
         description: 'Output saved playgrounds as JSON (saved list)',
         default: false,
+    })
+        .option('workshop-dir', {
+        alias: 'w',
+        type: 'string',
+        description: 'Path to a workshop directory to use as context (instead of the current working directory)',
     })
         .option('silent', {
         alias: 's',
@@ -784,9 +796,9 @@ const cli = yargs(args)
         .example('$0 playground saved 2026.01.18_11.12.00_01.01.problem', 'Set playground from a saved copy');
 }, async (argv) => {
     const { findWorkshopRoot } = await import("./commands/workshops.js");
-    const workshopRoot = await findWorkshopRoot();
+    const workshopRoot = await findWorkshopRoot(resolveWorkshopContextCwd(argv.workshopDir));
     if (!workshopRoot) {
-        console.error(chalk.red('❌ Not inside a workshop directory. Please cd into a workshop first.'));
+        console.error(chalk.red('❌ Workshop not found. Please cd into a workshop directory or pass --workshop-dir.'));
         process.exit(1);
     }
     const originalCwd = process.cwd();
@@ -903,6 +915,11 @@ const cli = yargs(args)
         type: 'boolean',
         description: 'Output as JSON',
         default: false,
+    })
+        .option('workshop-dir', {
+        alias: 'w',
+        type: 'string',
+        description: 'Path to a workshop directory to use as context (instead of the current working directory)',
     })
         .option('silent', {
         alias: 's',
@@ -917,9 +934,9 @@ const cli = yargs(args)
         .example('$0 progress update 01-01-problem --incomplete', 'Mark lesson as incomplete');
 }, async (argv) => {
     const { findWorkshopRoot } = await import("./commands/workshops.js");
-    const workshopRoot = await findWorkshopRoot();
+    const workshopRoot = await findWorkshopRoot(resolveWorkshopContextCwd(argv.workshopDir));
     if (!workshopRoot) {
-        console.error(chalk.red('❌ Not inside a workshop directory. Please cd into a workshop first.'));
+        console.error(chalk.red('❌ Workshop not found. Please cd into a workshop directory or pass --workshop-dir.'));
         process.exit(1);
     }
     const originalCwd = process.cwd();
@@ -970,14 +987,19 @@ const cli = yargs(args)
         type: 'boolean',
         description: 'Run without output logs',
         default: false,
+    })
+        .option('workshop-dir', {
+        alias: 'w',
+        type: 'string',
+        description: 'Path to a workshop directory to use as context (instead of the current working directory)',
     })
         .example('$0 diff', 'Select apps to diff (defaults to playground vs solution)')
         .example('$0 diff 01.02.problem 01.02.solution', 'Show diff between two apps');
 }, async (argv) => {
     const { findWorkshopRoot } = await import("./commands/workshops.js");
-    const workshopRoot = await findWorkshopRoot();
+    const workshopRoot = await findWorkshopRoot(resolveWorkshopContextCwd(argv.workshopDir));
     if (!workshopRoot) {
-        console.error(chalk.red('❌ Not inside a workshop directory. Please cd into a workshop first.'));
+        console.error(chalk.red('❌ Workshop not found. Please cd into a workshop directory or pass --workshop-dir.'));
         process.exit(1);
     }
     const originalCwd = process.cwd();
@@ -1027,6 +1049,11 @@ const cli = yargs(args)
         type: 'boolean',
         description: 'Run without output logs',
         default: false,
+    })
+        .option('workshop-dir', {
+        alias: 'w',
+        type: 'string',
+        description: 'Path to a workshop directory to use as context (instead of the current working directory)',
     })
         .example('$0 exercises', 'List all exercises with progress')
         .example('$0 exercises 1', 'Show details for exercise 1')
@@ -1034,9 +1061,9 @@ const cli = yargs(args)
         .example('$0 exercises --json', 'Output exercises as JSON');
 }, async (argv) => {
     const { findWorkshopRoot } = await import("./commands/workshops.js");
-    const workshopRoot = await findWorkshopRoot();
+    const workshopRoot = await findWorkshopRoot(resolveWorkshopContextCwd(argv.workshopDir));
     if (!workshopRoot) {
-        console.error(chalk.red('❌ Not inside a workshop directory. Please cd into a workshop first.'));
+        console.error(chalk.red('❌ Workshop not found. Please cd into a workshop directory or pass --workshop-dir.'));
         process.exit(1);
     }
     const originalCwd = process.cwd();
@@ -1087,7 +1114,7 @@ try {
     if (args.length === 0) {
         // Check if we're inside a workshop first
         const { findWorkshopRoot } = await import("./commands/workshops.js");
-        const workshopRoot = await findWorkshopRoot();
+        const workshopRoot = await findWorkshopRoot(resolveWorkshopContextCwd());
         // Get workshop title if we're inside one
         let workshopTitle = null;
         if (workshopRoot) {
@@ -1495,7 +1522,7 @@ try {
             }
             case 'exercises': {
                 const { findWorkshopRoot } = await import("./commands/workshops.js");
-                const wsRoot = await findWorkshopRoot();
+                const wsRoot = await findWorkshopRoot(resolveWorkshopContextCwd());
                 if (!wsRoot) {
                     console.error(chalk.red('❌ Not inside a workshop directory'));
                     process.exit(1);
@@ -1515,7 +1542,7 @@ try {
             }
             case 'playground': {
                 const { findWorkshopRoot } = await import("./commands/workshops.js");
-                const wsRoot = await findWorkshopRoot();
+                const wsRoot = await findWorkshopRoot(resolveWorkshopContextCwd());
                 if (!wsRoot) {
                     console.error(chalk.red('❌ Not inside a workshop directory'));
                     process.exit(1);
@@ -1535,7 +1562,7 @@ try {
             }
             case 'progress': {
                 const { findWorkshopRoot } = await import("./commands/workshops.js");
-                const wsRoot = await findWorkshopRoot();
+                const wsRoot = await findWorkshopRoot(resolveWorkshopContextCwd());
                 if (!wsRoot) {
                     console.error(chalk.red('❌ Not inside a workshop directory'));
                     process.exit(1);
@@ -1555,7 +1582,7 @@ try {
             }
             case 'diff': {
                 const { findWorkshopRoot } = await import("./commands/workshops.js");
-                const wsRoot = await findWorkshopRoot();
+                const wsRoot = await findWorkshopRoot(resolveWorkshopContextCwd());
                 if (!wsRoot) {
                     console.error(chalk.red('❌ Not inside a workshop directory'));
                     process.exit(1);

package/dist/commands/workshops.d.ts

@@ -4,7 +4,7 @@ import '@epic-web/workshop-utils/init-env';
  * looking for a package.json with an epicshop field.
  * Returns the workshop root path if found, null otherwise.
  */
-export declare function findWorkshopRoot(): Promise<string | null>;
+export declare function findWorkshopRoot(startDir?: string): Promise<string | null>;
 /**
  * Check if the current working directory is inside a workshop
  * (has epicshop config in package.json in current dir or any parent)

package/dist/commands/workshops.js

@@ -38,8 +38,21 @@ const EPIC_SITES = [
  * looking for a package.json with an epicshop field.
  * Returns the workshop root path if found, null otherwise.
  */
-export async function findWorkshopRoot() {
-    let currentDir = process.cwd();
+export async function findWorkshopRoot(startDir) {
+    let currentDir = startDir
+        ? path.resolve(resolvePathWithTilde(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 stat = await fs.promises.stat(currentDir);
+        if (!stat.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) {
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epicshop",
-  "version": "6.80.2",
+  "version": "6.82.0",
   "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.80.2",
+    "@epic-web/workshop-utils": "6.82.0",
     "@inquirer/prompts": "^8.2.0",
     "@sentry/node": "^10.38.0",
     "chalk": "^5.6.2",
@@ -108,13 +108,13 @@
     "get-port": "^7.1.0",
     "match-sorter": "^8.2.0",
     "open": "^11.0.0",
-    "openid-client": "^6.8.1",
-    "ora": "^9.1.0",
+    "openid-client": "^6.8.2",
+    "ora": "^9.3.0",
     "yargs": "^18.0.0"
   },
   "devDependencies": {
-    "@epic-web/config": "^1.21.3",
-    "@types/node": "^25.1.0",
+    "@epic-web/config": "^1.22.0",
+    "@types/node": "^25.2.3",
     "@types/yargs": "^17.0.35",
     "vitest": "^4.0.18",
     "zshy": "^0.7.0"