epicshop 6.65.0 → 6.67.0

package/dist/cli.js

@@ -5,9 +5,11 @@ import { matchSorter } from 'match-sorter';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 import { assertCanPrompt } from "./utils/cli-runtime.js";
+import { initCliSentry } from "./utils/sentry-cli.js";
 // Check for --help on start command before yargs parses
 // (yargs exits before command handler when help is requested)
 const args = hideBin(process.argv);
+const cliSentry = initCliSentry(args);
 if ((args.includes('--help') || args.includes('-h')) &&
     (args.length === 0 || args[0] === 'start')) {
     const { displayHelp } = await import("./commands/start.js");
@@ -34,6 +36,9 @@ const cli = yargs(args)
     .alias('h', 'help')
     .version(false)
     .showHelpOnFail(true)
+    .middleware((argv) => {
+    cliSentry.setCommandContextFromArgv(argv);
+})
     .command('start [workshop]', 'Start a workshop (auto-detects if inside a workshop directory)', (yargs) => {
     return yargs
         .positional('workshop', {
@@ -663,6 +668,12 @@ const cli = yargs(args)
             throw error;
         }
     }
+    if (!argv.subcommand) {
+        cliSentry.setCommandContext({
+            command: 'auth',
+            subcommand,
+        });
+    }
     let result;
     switch (subcommand) {
         case 'status':
@@ -1172,6 +1183,7 @@ try {
                 });
             },
         });
+        cliSentry.setCommandContext({ command: subcommand, interactive: true });
         switch (subcommand) {
             case 'start': {
                 const { findWorkshopRoot, startWorkshop } = await import("./commands/workshops.js");
@@ -1421,6 +1433,10 @@ try {
                         });
                     },
                 });
+                cliSentry.setCommandContext({
+                    command: 'auth',
+                    subcommand: authSubcommand,
+                });
                 let authResult;
                 switch (authSubcommand) {
                     case 'status':
@@ -1532,6 +1548,8 @@ catch (error) {
     if (error.message === 'USER_QUIT') {
         process.exit(0);
     }
+    cliSentry.captureException(error);
+    await cliSentry.flush();
     console.error(chalk.red('❌ Error:'), error);
     process.exit(1);
 }

package/dist/utils/sentry-cli.d.ts

@@ -0,0 +1,18 @@
+type CliCommandContext = {
+    command?: string;
+    subcommand?: string;
+    flags?: string[];
+    interactive?: boolean;
+    help?: boolean;
+};
+type CliSentry = {
+    enabled: boolean;
+    setCommandContext: (update: Partial<CliCommandContext>) => void;
+    setCommandContextFromArgv: (argv: {
+        _: Array<string | number>;
+    }) => void;
+    captureException: (error: unknown) => void;
+    flush: (timeoutMs?: number) => Promise<boolean>;
+};
+export declare function initCliSentry(args: string[]): CliSentry;
+export {};

package/dist/utils/sentry-cli.js

@@ -0,0 +1,135 @@
+import * as Sentry from '@sentry/node';
+import { getEnv } from '@epic-web/workshop-utils/init-env';
+const HELP_FLAGS = new Set(['--help', '-h']);
+function extractFlags(args) {
+    const flags = new Set();
+    for (let i = 0; i < args.length; i += 1) {
+        const arg = args[i];
+        if (!arg || arg === '-' || !arg.startsWith('-')) {
+            continue;
+        }
+        if (arg === '--') {
+            break;
+        }
+        if (arg.startsWith('--')) {
+            const [flag] = arg.split('=');
+            if (flag)
+                flags.add(flag);
+            if (!arg.includes('=') && args[i + 1] && !args[i + 1]?.startsWith('-')) {
+                i += 1;
+            }
+        }
+        else {
+            flags.add(arg);
+            if (arg.length === 2 && args[i + 1] && !args[i + 1]?.startsWith('-')) {
+                i += 1;
+            }
+        }
+    }
+    return Array.from(flags).sort();
+}
+function deriveCommandContext(args) {
+    const interactive = args.length === 0;
+    const doubleDashIndex = args.indexOf('--');
+    const argsBeforeDoubleDash = doubleDashIndex >= 0 ? args.slice(0, doubleDashIndex) : args;
+    const help = argsBeforeDoubleDash.some((arg) => HELP_FLAGS.has(arg));
+    const flags = extractFlags(args);
+    let command;
+    const firstNonFlagIndex = args.findIndex((arg) => !arg.startsWith('-'));
+    if (firstNonFlagIndex >= 0) {
+        command = args[firstNonFlagIndex];
+    }
+    if (!command) {
+        if (help) {
+            command = 'help';
+        }
+        else if (interactive) {
+            command = 'chooser';
+        }
+    }
+    return {
+        command,
+        flags,
+        interactive,
+        help: help || command === 'help',
+    };
+}
+function deriveCommandContextFromArgv(args, argv) {
+    const baseContext = deriveCommandContext(args);
+    const segments = argv._?.map(String).filter(Boolean) ?? [];
+    const command = segments[0] ?? baseContext.command;
+    const hasSubcommand = Object.prototype.hasOwnProperty.call(argv, 'subcommand');
+    const subcommand = hasSubcommand && typeof argv.subcommand === 'string'
+        ? argv.subcommand
+        : baseContext.subcommand;
+    const help = Boolean(argv.help ?? argv.h ?? baseContext.help);
+    return {
+        ...baseContext,
+        command,
+        subcommand,
+        help,
+    };
+}
+function applyCommandContext(context) {
+    Sentry.setTag('cli.command', context.command ?? 'unknown');
+    Sentry.setTag('cli.subcommand', context.subcommand ?? 'none');
+    if (context.interactive !== undefined) {
+        Sentry.setTag('cli.interactive', context.interactive ? 'true' : 'false');
+    }
+    if (context.help !== undefined) {
+        Sentry.setTag('cli.help', context.help ? 'true' : 'false');
+    }
+    Sentry.setContext('cli', {
+        command: context.command ?? 'unknown',
+        subcommand: context.subcommand ?? null,
+        flags: context.flags ?? [],
+        interactive: context.interactive ?? false,
+        help: context.help ?? false,
+        stdin_tty: Boolean(process.stdin.isTTY),
+        stdout_tty: Boolean(process.stdout.isTTY),
+    });
+}
+export function initCliSentry(args) {
+    const env = getEnv();
+    const enabled = env.EPICSHOP_IS_PUBLISHED && Boolean(env.SENTRY_DSN);
+    if (!enabled) {
+        return {
+            enabled,
+            setCommandContext: () => { },
+            setCommandContextFromArgv: () => { },
+            captureException: () => { },
+            flush: async () => true,
+        };
+    }
+    Sentry.init({
+        dsn: env.SENTRY_DSN,
+        sendDefaultPii: false,
+        environment: env.EPICSHOP_IS_PUBLISHED ? 'production' : 'development',
+        tracesSampleRate: 1,
+    });
+    Sentry.setTags({
+        epicshop_github_repo: env.EPICSHOP_GITHUB_REPO || 'unknown',
+        epicshop_workshop_instance_id: env.EPICSHOP_WORKSHOP_INSTANCE_ID || 'unknown',
+        epicshop_app_version: env.EPICSHOP_APP_VERSION || 'unknown',
+        epicshop_published: env.EPICSHOP_IS_PUBLISHED ? 'true' : 'false',
+    });
+    let currentContext = deriveCommandContext(args);
+    applyCommandContext(currentContext);
+    return {
+        enabled,
+        setCommandContext(update) {
+            currentContext = { ...currentContext, ...update };
+            applyCommandContext(currentContext);
+        },
+        setCommandContextFromArgv(argv) {
+            currentContext = deriveCommandContextFromArgv(args, argv);
+            applyCommandContext(currentContext);
+        },
+        captureException(error) {
+            Sentry.captureException(error);
+        },
+        flush(timeoutMs = 2000) {
+            return Sentry.flush(timeoutMs);
+        },
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epicshop",
-  "version": "6.65.0",
+  "version": "6.67.0",
   "publishConfig": {
     "access": "public"
   },
@@ -93,15 +93,16 @@
     "build:watch": "nx watch --projects=epicshop -- nx run \\$NX_PROJECT_NAME:build"
   },
   "dependencies": {
-    "@epic-web/workshop-utils": "6.65.0",
+    "@epic-web/workshop-utils": "6.67.0",
     "@inquirer/prompts": "^8.2.0",
+    "@sentry/node": "^10.35.0",
     "chalk": "^5.6.2",
     "close-with-grace": "^2.4.0",
     "execa": "^9.6.1",
     "get-port": "^7.1.0",
     "match-sorter": "^8.2.0",
-    "openid-client": "^6.8.1",
     "open": "^11.0.0",
+    "openid-client": "^6.8.1",
     "ora": "^9.0.0",
     "yargs": "^18.0.0"
   },
@@ -109,8 +110,8 @@
     "@epic-web/config": "^1.21.3",
     "@types/node": "^25.0.9",
     "@types/yargs": "^17.0.35",
-    "zshy": "^0.7.0",
-    "vitest": "^4.0.17"
+    "vitest": "^4.0.17",
+    "zshy": "^0.7.0"
   },
   "repository": {
     "type": "git",