motia 0.8.4-beta.142-001319 → 0.8.5-beta.142

package/dist/cjs/cli.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 require("./cloud");
 const config_utils_1 = require("./cloud/config-utils");
+const analytics_1 = require("./utils/analytics");
 const version_1 = require("./version");
 const defaultPort = 3000;
 const defaultHost = '0.0.0.0';
@@ -48,19 +49,19 @@ commander_1.program
 commander_1.program
     .command('generate-types')
     .description('Generate types.d.ts file for your project')
-    .action(async () => {
+    .action((0, analytics_1.wrapAction)(async () => {
     const { generateTypes } = require('./generate-types');
     await generateTypes(process.cwd());
     process.exit(0);
-});
+}));
 commander_1.program
     .command('install')
     .description('Sets up Python virtual environment and install dependencies')
     .option('-v, --verbose', 'Enable verbose logging')
-    .action(async (options) => {
+    .action((0, analytics_1.wrapAction)(async (options) => {
     const { install } = require('./install');
     await install({ isVerbose: options.verbose });
-});
+}));
 commander_1.program
     .command('dev')
     .description('Start the development server')
@@ -70,7 +71,7 @@ commander_1.program
     .option('-d, --debug', 'Enable debug logging')
     .option('-m, --mermaid', 'Enable mermaid diagram generation')
     .option('--motia-dir <path>', 'Path where .motia folder will be created')
-    .action(async (arg) => {
+    .action((0, analytics_1.wrapAction)(async (arg) => {
     if (arg.debug) {
         console.log('🔍 Debug logging enabled');
         process.env.LOG_LEVEL = 'debug';
@@ -79,7 +80,7 @@ commander_1.program
     const host = arg.host ? arg.host : defaultHost;
     const { dev } = require('./dev');
     await dev(port, host, arg.disableVerbose, arg.mermaid, arg.motiaDir);
-});
+}));
 commander_1.program
     .command('start')
     .description('Start a server to run your Motia project')
@@ -88,7 +89,7 @@ commander_1.program
     .option('-v, --disable-verbose', 'Disable verbose logging')
     .option('-d, --debug', 'Enable debug logging')
     .option('--motia-dir <path>', 'Path where .motia folder will be created')
-    .action(async (arg) => {
+    .action((0, analytics_1.wrapAction)(async (arg) => {
     if (arg.debug) {
         console.log('🔍 Debug logging enabled');
         process.env.LOG_LEVEL = 'debug';
@@ -97,89 +98,85 @@ commander_1.program
     const host = arg.host ? arg.host : defaultHost;
     const { start } = require('./start');
     await start(port, host, arg.disableVerbose, arg.motiaDir);
-});
+}));
 commander_1.program
     .command('emit')
     .description('Emit an event to the Motia server')
     .requiredOption('--topic <topic>', 'Event topic/type to emit')
     .requiredOption('--message <message>', 'Event payload as JSON string')
     .option('-p, --port <number>', 'Port number (default: 3000)')
-    .action(async (options) => {
+    .action((0, analytics_1.wrapAction)(async (options) => {
     const port = options.port || 3000;
     const url = `http://localhost:${port}/emit`;
-    try {
-        const response = await fetch(url, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({
-                topic: options.topic,
-                data: JSON.parse(options.message),
-            }),
-        });
-        if (!response.ok) {
-            throw new Error(`HTTP error! status: ${response.status}`);
-        }
-        const result = await response.json();
-        console.log('Event emitted successfully:', result);
-    }
-    catch (error) {
-        console.error('Error:', error instanceof Error ? error.message : 'Unknown error');
-        process.exit(1);
+    const response = await fetch(url, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+            topic: options.topic,
+            data: JSON.parse(options.message),
+        }),
+    });
+    if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`);
     }
-});
+    const result = await response.json();
+    console.log('Event emitted successfully:', result);
+}));
 const generate = commander_1.program.command('generate').description('Generate motia resources');
 generate
     .command('step')
     .description('Create a new step with interactive prompts')
     .option('-d, --dir <step file path>', 'The path relative to the steps directory, used to create the step file')
-    .action(async (arg) => {
+    .action((0, analytics_1.wrapAction)(async (arg) => {
     const { createStep } = require('./create-step');
     await createStep({
         stepFilePath: arg.dir,
     });
-});
+}));
 generate
     .command('openapi')
     .description('Generate OpenAPI spec for your project')
     .option('-t, --title <title>', 'Title for the OpenAPI document. Defaults to project name')
     .option('-v, --version <version>', 'Version for the OpenAPI document. Defaults to 1.0.0', '1.0.0')
     .option('-o, --output <output>', 'Output file for the OpenAPI document. Defaults to openapi.json', 'openapi.json')
-    .action(async (options) => {
+    .action((0, analytics_1.wrapAction)(async (options) => {
     const { generateLockedData } = require('./generate-locked-data');
     const { generateOpenApi } = require('./openapi/generate');
     const lockedData = await generateLockedData({ projectDir: process.cwd() });
     const apiSteps = lockedData.apiSteps();
     generateOpenApi(process.cwd(), apiSteps, options.title, options.version, options.output);
     process.exit(0);
-});
+}));
 const docker = commander_1.program.command('docker').description('Motia docker commands');
 docker
     .command('setup')
     .description('Setup a motia-docker for your project')
-    .action(async () => {
+    .action((0, analytics_1.wrapAction)(async () => {
     const { setup } = require('./docker/setup');
     await setup();
     process.exit(0);
-});
+}));
 docker
     .command('run')
     .description('Build and run your project in a docker container')
     .option('-p, --port <port>', 'The port to run the server on', `${defaultPort}`)
     .option('-n, --project-name <project name>', 'The name for your project')
     .option('-s, --skip-build', 'Skip docker build')
-    .action(async (arg) => {
+    .action((0, analytics_1.wrapAction)(async (arg) => {
     const { run } = require('./docker/run');
     await run(arg.port, arg.projectName, arg.skipBuild);
     process.exit(0);
-});
+}));
 docker
     .command('build')
     .description('Build your project in a docker container')
     .option('-n, --project-name <project name>', 'The name for your project')
-    .action(async (arg) => {
+    .action((0, analytics_1.wrapAction)(async (arg) => {
     const { build } = require('./docker/build');
     await build(arg.projectName);
     process.exit(0);
-});
+}));
 commander_1.program.version(version_1.version, '-V, --version', 'Output the current version');
-commander_1.program.parse(process.argv);
+commander_1.program.parseAsync(process.argv).catch(() => {
+    process.exit(1);
+});

package/dist/cjs/cloud/config-utils.js

@@ -2,7 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CliContext = void 0;
 exports.handler = handler;
+const analytics_node_1 = require("@amplitude/analytics-node");
+const analytics_1 = require("../utils/analytics");
 const cli_output_manager_1 = require("./cli-output-manager");
+const getCommandName = () => {
+    const args = process.argv.slice(2);
+    const commandParts = [];
+    for (let i = 0; i < args.length && i < 3; i++) {
+        const arg = args[i];
+        if (!arg.startsWith('-') && !arg.startsWith('--')) {
+            commandParts.push(arg);
+        }
+        else {
+            break;
+        }
+    }
+    return commandParts.join(' ') || 'unknown';
+};
 class CliContext {
     constructor() {
         this.output = new cli_output_manager_1.CLIOutputManager();
@@ -27,10 +43,15 @@ exports.CliContext = CliContext;
 function handler(handler) {
     return async (args) => {
         const context = new CliContext();
+        const commandName = getCommandName();
         try {
             await handler(args, context);
         }
         catch (error) {
+            (0, analytics_1.logCliError)(commandName, error);
+            await (0, analytics_node_1.flush)().promise.catch(() => {
+                // Silently fail
+            });
             if (error instanceof Error) {
                 context.log('error', (message) => message.tag('failed').append(error.message));
                 context.exit(1);

package/dist/cjs/dev-watchers.d.ts

@@ -1,3 +1,4 @@
 import { type CronManager, type LockedData, type MotiaEventManager, type MotiaServer } from '@motiadev/core';
-import { Watcher } from './watcher';
-export declare const createDevWatchers: (lockedData: LockedData, server: MotiaServer, eventHandler: MotiaEventManager, cronManager: CronManager) => Watcher;
+export declare const createDevWatchers: (lockedData: LockedData, server: MotiaServer, eventHandler: MotiaEventManager, cronManager: CronManager) => {
+    stop: () => Promise<void>;
+};

package/dist/cjs/dev-watchers.js

@@ -5,11 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDevWatchers = void 0;
 const core_1 = require("@motiadev/core");
+const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const watcher_1 = require("./watcher");
-const createDevWatchers = (lockedData, server, eventHandler, cronManager) => {
-    const stepDir = path_1.default.join(process.cwd(), 'steps');
-    const watcher = new watcher_1.Watcher(stepDir, lockedData);
+const setupWatcherHandlers = (watcher, lockedData, server, eventHandler, cronManager) => {
     watcher.onStreamChange((oldStream, stream) => {
         (0, core_1.trackEvent)('stream_updated', {
             streamName: stream.config.name,
@@ -80,6 +79,23 @@ const createDevWatchers = (lockedData, server, eventHandler, cronManager) => {
             cronManager.removeCronJob(step);
         lockedData.deleteStep(step);
     });
-    return watcher;
+};
+const createDevWatchers = (lockedData, server, eventHandler, cronManager) => {
+    const baseDir = process.cwd();
+    const dirs = [path_1.default.join(baseDir, 'steps'), path_1.default.join(baseDir, 'src')];
+    const watchers = [];
+    dirs.forEach((dir) => {
+        if ((0, fs_1.existsSync)(dir)) {
+            const watcher = new watcher_1.Watcher(dir, lockedData);
+            setupWatcherHandlers(watcher, lockedData, server, eventHandler, cronManager);
+            watcher.init();
+            watchers.push(watcher);
+        }
+    });
+    return {
+        stop: async () => {
+            await Promise.all(watchers.map((watcher) => watcher.stop()));
+        },
+    };
 };
 exports.createDevWatchers = createDevWatchers;

package/dist/cjs/dev.js

@@ -57,7 +57,6 @@ const dev = async (port, hostname, disableVerbose, enableMermaid, motiaFileStora
         mermaidGenerator.initialize(lockedData);
         (0, core_1.trackEvent)('mermaid_generator_initialized');
     }
-    watcher.init();
     (0, endpoints_1.deployEndpoints)(motiaServer, lockedData);
     motiaServer.app.get('/__motia', (_, res) => {
         const meta = {

package/dist/cjs/generate-locked-data.js

@@ -8,25 +8,40 @@ const core_1 = require("@motiadev/core");
 const printer_1 = require("@motiadev/core/dist/src/printer");
 const colors_1 = __importDefault(require("colors"));
 const crypto_1 = require("crypto");
+const fs_1 = require("fs");
 const glob_1 = require("glob");
 const path_1 = __importDefault(require("path"));
 const activate_python_env_1 = require("./utils/activate-python-env");
 const compilation_error_1 = require("./utils/errors/compilation.error");
 const version = `${(0, crypto_1.randomUUID)()}:${Math.floor(Date.now() / 1000)}`;
+const getStepFilesFromDir = (dir) => {
+    if (!(0, fs_1.existsSync)(dir)) {
+        return [];
+    }
+    return [
+        ...(0, glob_1.globSync)('**/*.step.{ts,js,rb}', { absolute: true, cwd: dir }),
+        ...(0, glob_1.globSync)('**/*_step.{ts,js,py,rb}', { absolute: true, cwd: dir }),
+    ];
+};
 const getStepFiles = (projectDir) => {
     const stepsDir = path_1.default.join(projectDir, 'steps');
+    const srcDir = path_1.default.join(projectDir, 'src');
+    return [...getStepFilesFromDir(stepsDir), ...getStepFilesFromDir(srcDir)];
+};
+exports.getStepFiles = getStepFiles;
+const getStreamFilesFromDir = (dir) => {
+    if (!(0, fs_1.existsSync)(dir)) {
+        return [];
+    }
     return [
-        ...(0, glob_1.globSync)('**/*.step.{ts,js,rb}', { absolute: true, cwd: stepsDir }),
-        ...(0, glob_1.globSync)('**/*_step.{ts,js,py,rb}', { absolute: true, cwd: stepsDir }),
+        ...(0, glob_1.globSync)('**/*.stream.{ts,js,rb}', { absolute: true, cwd: dir }),
+        ...(0, glob_1.globSync)('**/*_stream.{ts,js,py,rb}', { absolute: true, cwd: dir }),
     ];
 };
-exports.getStepFiles = getStepFiles;
 const getStreamFiles = (projectDir) => {
     const stepsDir = path_1.default.join(projectDir, 'steps');
-    return [
-        ...(0, glob_1.globSync)('**/*.stream.{ts,js,rb}', { absolute: true, cwd: stepsDir }),
-        ...(0, glob_1.globSync)('**/*_stream.{ts,js,py,rb}', { absolute: true, cwd: stepsDir }),
-    ];
+    const srcDir = path_1.default.join(projectDir, 'src');
+    return [...getStreamFilesFromDir(stepsDir), ...getStreamFilesFromDir(srcDir)];
 };
 exports.getStreamFiles = getStreamFiles;
 // Helper function to recursively collect flow data
@@ -34,7 +49,12 @@ const collectFlows = async (projectDir, lockedData) => {
     const invalidSteps = [];
     const stepFiles = (0, exports.getStepFiles)(projectDir);
     const streamFiles = (0, exports.getStreamFiles)(projectDir);
-    const deprecatedSteps = (0, glob_1.globSync)('**/*.step.py', { absolute: true, cwd: path_1.default.join(projectDir, 'steps') });
+    const stepsDir = path_1.default.join(projectDir, 'steps');
+    const srcDir = path_1.default.join(projectDir, 'src');
+    const deprecatedSteps = [
+        ...((0, fs_1.existsSync)(stepsDir) ? (0, glob_1.globSync)('**/*.step.py', { absolute: true, cwd: stepsDir }) : []),
+        ...((0, fs_1.existsSync)(srcDir) ? (0, glob_1.globSync)('**/*.step.py', { absolute: true, cwd: srcDir }) : []),
+    ];
     const hasPythonFiles = stepFiles.some((file) => file.endsWith('.py'));
     if (hasPythonFiles) {
         (0, activate_python_env_1.activatePythonVenv)({ baseDir: projectDir });

package/dist/cjs/utils/analytics.d.ts

@@ -1,3 +1,5 @@
 export declare const enableAnalytics: () => void;
 export declare const disableAnalytics: () => void;
 export declare const identifyUser: () => void;
+export declare const logCliError: (command: string, error: unknown) => void;
+export declare const wrapAction: <T extends (...args: any[]) => Promise<any>>(action: T) => T;

package/dist/cjs/utils/analytics.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.identifyUser = exports.disableAnalytics = exports.enableAnalytics = void 0;
+exports.wrapAction = exports.logCliError = exports.identifyUser = exports.disableAnalytics = exports.enableAnalytics = void 0;
 const analytics_node_1 = require("@amplitude/analytics-node");
 const core_1 = require("@motiadev/core");
 const utils_1 = require("@motiadev/core/dist/src/analytics/utils");
@@ -38,3 +38,51 @@ const identifyUser = () => {
     }
 };
 exports.identifyUser = identifyUser;
+const logCliError = (command, error) => {
+    try {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        const errorType = error instanceof Error ? error.constructor.name : 'Unknown';
+        const errorStack = error instanceof Error && error.stack ? error.stack.split('\n').slice(0, 10).join('\n') : undefined;
+        const truncatedMessage = errorMessage.length > 500 ? `${errorMessage.substring(0, 500)}...` : errorMessage;
+        (0, core_1.trackEvent)('cli_command_error', {
+            command,
+            error_message: truncatedMessage,
+            error_type: errorType,
+            ...(errorStack && { error_stack: errorStack }),
+        });
+    }
+    catch (logError) {
+        // Silently fail to not disrupt CLI operations
+    }
+};
+exports.logCliError = logCliError;
+const getCommandNameFromArgs = () => {
+    const args = process.argv.slice(2);
+    const commandParts = [];
+    for (let i = 0; i < args.length && i < 3; i++) {
+        const arg = args[i];
+        if (!arg.startsWith('-') && !arg.startsWith('--')) {
+            commandParts.push(arg);
+        }
+        else {
+            break;
+        }
+    }
+    return commandParts.join(' ') || 'unknown';
+};
+const wrapAction = (action) => {
+    return (async (...args) => {
+        try {
+            return await action(...args);
+        }
+        catch (error) {
+            const commandName = getCommandNameFromArgs();
+            (0, exports.logCliError)(commandName, error);
+            await (0, analytics_node_1.flush)().promise.catch(() => {
+                // Silently fail
+            });
+            throw error;
+        }
+    });
+};
+exports.wrapAction = wrapAction;

package/dist/esm/cli.js

@@ -2,6 +2,7 @@
 import { program } from 'commander';
 import './cloud';
 import { handler } from './cloud/config-utils';
+import { wrapAction } from './utils/analytics';
 import { version } from './version';
 const defaultPort = 3000;
 const defaultHost = '0.0.0.0';
@@ -46,19 +47,19 @@ program
 program
     .command('generate-types')
     .description('Generate types.d.ts file for your project')
-    .action(async () => {
+    .action(wrapAction(async () => {
     const { generateTypes } = require('./generate-types');
     await generateTypes(process.cwd());
     process.exit(0);
-});
+}));
 program
     .command('install')
     .description('Sets up Python virtual environment and install dependencies')
     .option('-v, --verbose', 'Enable verbose logging')
-    .action(async (options) => {
+    .action(wrapAction(async (options) => {
     const { install } = require('./install');
     await install({ isVerbose: options.verbose });
-});
+}));
 program
     .command('dev')
     .description('Start the development server')
@@ -68,7 +69,7 @@ program
     .option('-d, --debug', 'Enable debug logging')
     .option('-m, --mermaid', 'Enable mermaid diagram generation')
     .option('--motia-dir <path>', 'Path where .motia folder will be created')
-    .action(async (arg) => {
+    .action(wrapAction(async (arg) => {
     if (arg.debug) {
         console.log('🔍 Debug logging enabled');
         process.env.LOG_LEVEL = 'debug';
@@ -77,7 +78,7 @@ program
     const host = arg.host ? arg.host : defaultHost;
     const { dev } = require('./dev');
     await dev(port, host, arg.disableVerbose, arg.mermaid, arg.motiaDir);
-});
+}));
 program
     .command('start')
     .description('Start a server to run your Motia project')
@@ -86,7 +87,7 @@ program
     .option('-v, --disable-verbose', 'Disable verbose logging')
     .option('-d, --debug', 'Enable debug logging')
     .option('--motia-dir <path>', 'Path where .motia folder will be created')
-    .action(async (arg) => {
+    .action(wrapAction(async (arg) => {
     if (arg.debug) {
         console.log('🔍 Debug logging enabled');
         process.env.LOG_LEVEL = 'debug';
@@ -95,89 +96,85 @@ program
     const host = arg.host ? arg.host : defaultHost;
     const { start } = require('./start');
     await start(port, host, arg.disableVerbose, arg.motiaDir);
-});
+}));
 program
     .command('emit')
     .description('Emit an event to the Motia server')
     .requiredOption('--topic <topic>', 'Event topic/type to emit')
     .requiredOption('--message <message>', 'Event payload as JSON string')
     .option('-p, --port <number>', 'Port number (default: 3000)')
-    .action(async (options) => {
+    .action(wrapAction(async (options) => {
     const port = options.port || 3000;
     const url = `http://localhost:${port}/emit`;
-    try {
-        const response = await fetch(url, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({
-                topic: options.topic,
-                data: JSON.parse(options.message),
-            }),
-        });
-        if (!response.ok) {
-            throw new Error(`HTTP error! status: ${response.status}`);
-        }
-        const result = await response.json();
-        console.log('Event emitted successfully:', result);
-    }
-    catch (error) {
-        console.error('Error:', error instanceof Error ? error.message : 'Unknown error');
-        process.exit(1);
+    const response = await fetch(url, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+            topic: options.topic,
+            data: JSON.parse(options.message),
+        }),
+    });
+    if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`);
     }
-});
+    const result = await response.json();
+    console.log('Event emitted successfully:', result);
+}));
 const generate = program.command('generate').description('Generate motia resources');
 generate
     .command('step')
     .description('Create a new step with interactive prompts')
     .option('-d, --dir <step file path>', 'The path relative to the steps directory, used to create the step file')
-    .action(async (arg) => {
+    .action(wrapAction(async (arg) => {
     const { createStep } = require('./create-step');
     await createStep({
         stepFilePath: arg.dir,
     });
-});
+}));
 generate
     .command('openapi')
     .description('Generate OpenAPI spec for your project')
     .option('-t, --title <title>', 'Title for the OpenAPI document. Defaults to project name')
     .option('-v, --version <version>', 'Version for the OpenAPI document. Defaults to 1.0.0', '1.0.0')
     .option('-o, --output <output>', 'Output file for the OpenAPI document. Defaults to openapi.json', 'openapi.json')
-    .action(async (options) => {
+    .action(wrapAction(async (options) => {
     const { generateLockedData } = require('./generate-locked-data');
     const { generateOpenApi } = require('./openapi/generate');
     const lockedData = await generateLockedData({ projectDir: process.cwd() });
     const apiSteps = lockedData.apiSteps();
     generateOpenApi(process.cwd(), apiSteps, options.title, options.version, options.output);
     process.exit(0);
-});
+}));
 const docker = program.command('docker').description('Motia docker commands');
 docker
     .command('setup')
     .description('Setup a motia-docker for your project')
-    .action(async () => {
+    .action(wrapAction(async () => {
     const { setup } = require('./docker/setup');
     await setup();
     process.exit(0);
-});
+}));
 docker
     .command('run')
     .description('Build and run your project in a docker container')
     .option('-p, --port <port>', 'The port to run the server on', `${defaultPort}`)
     .option('-n, --project-name <project name>', 'The name for your project')
     .option('-s, --skip-build', 'Skip docker build')
-    .action(async (arg) => {
+    .action(wrapAction(async (arg) => {
     const { run } = require('./docker/run');
     await run(arg.port, arg.projectName, arg.skipBuild);
     process.exit(0);
-});
+}));
 docker
     .command('build')
     .description('Build your project in a docker container')
     .option('-n, --project-name <project name>', 'The name for your project')
-    .action(async (arg) => {
+    .action(wrapAction(async (arg) => {
     const { build } = require('./docker/build');
     await build(arg.projectName);
     process.exit(0);
-});
+}));
 program.version(version, '-V, --version', 'Output the current version');
-program.parse(process.argv);
+program.parseAsync(process.argv).catch(() => {
+    process.exit(1);
+});

package/dist/esm/cloud/config-utils.js

@@ -1,4 +1,20 @@
+import { flush } from '@amplitude/analytics-node';
+import { logCliError } from '../utils/analytics';
 import { CLIOutputManager } from './cli-output-manager';
+const getCommandName = () => {
+    const args = process.argv.slice(2);
+    const commandParts = [];
+    for (let i = 0; i < args.length && i < 3; i++) {
+        const arg = args[i];
+        if (!arg.startsWith('-') && !arg.startsWith('--')) {
+            commandParts.push(arg);
+        }
+        else {
+            break;
+        }
+    }
+    return commandParts.join(' ') || 'unknown';
+};
 export class CliContext {
     constructor() {
         this.output = new CLIOutputManager();
@@ -22,10 +38,15 @@ export class CliContext {
 export function handler(handler) {
     return async (args) => {
         const context = new CliContext();
+        const commandName = getCommandName();
         try {
             await handler(args, context);
         }
         catch (error) {
+            logCliError(commandName, error);
+            await flush().promise.catch(() => {
+                // Silently fail
+            });
             if (error instanceof Error) {
                 context.log('error', (message) => message.tag('failed').append(error.message));
                 context.exit(1);

package/dist/esm/dev-watchers.d.ts

@@ -1,3 +1,4 @@
 import { type CronManager, type LockedData, type MotiaEventManager, type MotiaServer } from '@motiadev/core';
-import { Watcher } from './watcher';
-export declare const createDevWatchers: (lockedData: LockedData, server: MotiaServer, eventHandler: MotiaEventManager, cronManager: CronManager) => Watcher;
+export declare const createDevWatchers: (lockedData: LockedData, server: MotiaServer, eventHandler: MotiaEventManager, cronManager: CronManager) => {
+    stop: () => Promise<void>;
+};

package/dist/esm/dev-watchers.js

@@ -1,9 +1,8 @@
 import { isApiStep, isCronStep, isEventStep, trackEvent, } from '@motiadev/core';
+import { existsSync } from 'fs';
 import path from 'path';
 import { Watcher } from './watcher';
-export const createDevWatchers = (lockedData, server, eventHandler, cronManager) => {
-    const stepDir = path.join(process.cwd(), 'steps');
-    const watcher = new Watcher(stepDir, lockedData);
+const setupWatcherHandlers = (watcher, lockedData, server, eventHandler, cronManager) => {
     watcher.onStreamChange((oldStream, stream) => {
         trackEvent('stream_updated', {
             streamName: stream.config.name,
@@ -74,5 +73,22 @@ export const createDevWatchers = (lockedData, server, eventHandler, cronManager)
             cronManager.removeCronJob(step);
         lockedData.deleteStep(step);
     });
-    return watcher;
+};
+export const createDevWatchers = (lockedData, server, eventHandler, cronManager) => {
+    const baseDir = process.cwd();
+    const dirs = [path.join(baseDir, 'steps'), path.join(baseDir, 'src')];
+    const watchers = [];
+    dirs.forEach((dir) => {
+        if (existsSync(dir)) {
+            const watcher = new Watcher(dir, lockedData);
+            setupWatcherHandlers(watcher, lockedData, server, eventHandler, cronManager);
+            watcher.init();
+            watchers.push(watcher);
+        }
+    });
+    return {
+        stop: async () => {
+            await Promise.all(watchers.map((watcher) => watcher.stop()));
+        },
+    };
 };

package/dist/esm/dev.js

@@ -51,7 +51,6 @@ export const dev = async (port, hostname, disableVerbose, enableMermaid, motiaFi
         mermaidGenerator.initialize(lockedData);
         trackEvent('mermaid_generator_initialized');
     }
-    watcher.init();
     deployEndpoints(motiaServer, lockedData);
     motiaServer.app.get('/__motia', (_, res) => {
         const meta = {

package/dist/esm/generate-locked-data.js

@@ -2,31 +2,51 @@ import { getStepConfig, getStreamConfig, LockedData } from '@motiadev/core';
 import { NoPrinter, Printer } from '@motiadev/core/dist/src/printer';
 import colors from 'colors';
 import { randomUUID } from 'crypto';
+import { existsSync } from 'fs';
 import { globSync } from 'glob';
 import path from 'path';
 import { activatePythonVenv } from './utils/activate-python-env';
 import { CompilationError } from './utils/errors/compilation.error';
 const version = `${randomUUID()}:${Math.floor(Date.now() / 1000)}`;
+const getStepFilesFromDir = (dir) => {
+    if (!existsSync(dir)) {
+        return [];
+    }
+    return [
+        ...globSync('**/*.step.{ts,js,rb}', { absolute: true, cwd: dir }),
+        ...globSync('**/*_step.{ts,js,py,rb}', { absolute: true, cwd: dir }),
+    ];
+};
 export const getStepFiles = (projectDir) => {
     const stepsDir = path.join(projectDir, 'steps');
+    const srcDir = path.join(projectDir, 'src');
+    return [...getStepFilesFromDir(stepsDir), ...getStepFilesFromDir(srcDir)];
+};
+const getStreamFilesFromDir = (dir) => {
+    if (!existsSync(dir)) {
+        return [];
+    }
     return [
-        ...globSync('**/*.step.{ts,js,rb}', { absolute: true, cwd: stepsDir }),
-        ...globSync('**/*_step.{ts,js,py,rb}', { absolute: true, cwd: stepsDir }),
+        ...globSync('**/*.stream.{ts,js,rb}', { absolute: true, cwd: dir }),
+        ...globSync('**/*_stream.{ts,js,py,rb}', { absolute: true, cwd: dir }),
     ];
 };
 export const getStreamFiles = (projectDir) => {
     const stepsDir = path.join(projectDir, 'steps');
-    return [
-        ...globSync('**/*.stream.{ts,js,rb}', { absolute: true, cwd: stepsDir }),
-        ...globSync('**/*_stream.{ts,js,py,rb}', { absolute: true, cwd: stepsDir }),
-    ];
+    const srcDir = path.join(projectDir, 'src');
+    return [...getStreamFilesFromDir(stepsDir), ...getStreamFilesFromDir(srcDir)];
 };
 // Helper function to recursively collect flow data
 export const collectFlows = async (projectDir, lockedData) => {
     const invalidSteps = [];
     const stepFiles = getStepFiles(projectDir);
     const streamFiles = getStreamFiles(projectDir);
-    const deprecatedSteps = globSync('**/*.step.py', { absolute: true, cwd: path.join(projectDir, 'steps') });
+    const stepsDir = path.join(projectDir, 'steps');
+    const srcDir = path.join(projectDir, 'src');
+    const deprecatedSteps = [
+        ...(existsSync(stepsDir) ? globSync('**/*.step.py', { absolute: true, cwd: stepsDir }) : []),
+        ...(existsSync(srcDir) ? globSync('**/*.step.py', { absolute: true, cwd: srcDir }) : []),
+    ];
     const hasPythonFiles = stepFiles.some((file) => file.endsWith('.py'));
     if (hasPythonFiles) {
         activatePythonVenv({ baseDir: projectDir });

package/dist/esm/utils/analytics.d.ts

@@ -1,3 +1,5 @@
 export declare const enableAnalytics: () => void;
 export declare const disableAnalytics: () => void;
 export declare const identifyUser: () => void;
+export declare const logCliError: (command: string, error: unknown) => void;
+export declare const wrapAction: <T extends (...args: any[]) => Promise<any>>(action: T) => T;

package/dist/esm/utils/analytics.js

@@ -1,5 +1,5 @@
-import { add, Identify, identify, init, setOptOut, Types } from '@amplitude/analytics-node';
-import { getUserIdentifier, isAnalyticsEnabled } from '@motiadev/core';
+import { add, flush, Identify, identify, init, setOptOut, Types } from '@amplitude/analytics-node';
+import { getUserIdentifier, isAnalyticsEnabled, trackEvent } from '@motiadev/core';
 import { getProjectName } from '@motiadev/core/dist/src/analytics/utils';
 import { version } from '../version';
 import { MotiaEnrichmentPlugin } from './amplitude/enrichment-plugin';
@@ -32,3 +32,49 @@ export const identifyUser = () => {
         // Silently fail
     }
 };
+export const logCliError = (command, error) => {
+    try {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        const errorType = error instanceof Error ? error.constructor.name : 'Unknown';
+        const errorStack = error instanceof Error && error.stack ? error.stack.split('\n').slice(0, 10).join('\n') : undefined;
+        const truncatedMessage = errorMessage.length > 500 ? `${errorMessage.substring(0, 500)}...` : errorMessage;
+        trackEvent('cli_command_error', {
+            command,
+            error_message: truncatedMessage,
+            error_type: errorType,
+            ...(errorStack && { error_stack: errorStack }),
+        });
+    }
+    catch (logError) {
+        // Silently fail to not disrupt CLI operations
+    }
+};
+const getCommandNameFromArgs = () => {
+    const args = process.argv.slice(2);
+    const commandParts = [];
+    for (let i = 0; i < args.length && i < 3; i++) {
+        const arg = args[i];
+        if (!arg.startsWith('-') && !arg.startsWith('--')) {
+            commandParts.push(arg);
+        }
+        else {
+            break;
+        }
+    }
+    return commandParts.join(' ') || 'unknown';
+};
+export const wrapAction = (action) => {
+    return (async (...args) => {
+        try {
+            return await action(...args);
+        }
+        catch (error) {
+            const commandName = getCommandNameFromArgs();
+            logCliError(commandName, error);
+            await flush().promise.catch(() => {
+                // Silently fail
+            });
+            throw error;
+        }
+    });
+};

package/dist/types/dev-watchers.d.ts

@@ -1,3 +1,4 @@
 import { type CronManager, type LockedData, type MotiaEventManager, type MotiaServer } from '@motiadev/core';
-import { Watcher } from './watcher';
-export declare const createDevWatchers: (lockedData: LockedData, server: MotiaServer, eventHandler: MotiaEventManager, cronManager: CronManager) => Watcher;
+export declare const createDevWatchers: (lockedData: LockedData, server: MotiaServer, eventHandler: MotiaEventManager, cronManager: CronManager) => {
+    stop: () => Promise<void>;
+};

package/dist/types/utils/analytics.d.ts

@@ -1,3 +1,5 @@
 export declare const enableAnalytics: () => void;
 export declare const disableAnalytics: () => void;
 export declare const identifyUser: () => void;
+export declare const logCliError: (command: string, error: unknown) => void;
+export declare const wrapAction: <T extends (...args: any[]) => Promise<any>>(action: T) => T;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "motia",
   "description": "A Modern Unified Backend Framework for APIs, Events and Agents",
-  "version": "0.8.4-beta.142-001319",
+  "version": "0.8.5-beta.142",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -46,9 +46,9 @@
     "python-ast": "^0.1.0",
     "table": "^6.9.0",
     "ts-node": "^10.9.2",
-    "@motiadev/stream-client-node": "0.8.4-beta.142-001319",
-    "@motiadev/workbench": "0.8.4-beta.142-001319",
-    "@motiadev/core": "0.8.4-beta.142-001319"
+    "@motiadev/core": "0.8.5-beta.142",
+    "@motiadev/workbench": "0.8.5-beta.142",
+    "@motiadev/stream-client-node": "0.8.5-beta.142"
   },
   "devDependencies": {
     "@amplitude/analytics-types": "^2.9.2",