@mbc-cqrs-serverless/cli 1.0.25 → 1.1.0-beta.0

package/dist/actions/install-skills.action.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VERSION_FILE_NAME = void 0;
+exports.VERSION_CACHE_TTL_MS = exports.VERSION_CACHE_FILE_NAME = exports.VERSION_FILE_NAME = void 0;
 exports.getSkillsSourcePath = getSkillsSourcePath;
 exports.getPersonalSkillsPath = getPersonalSkillsPath;
 exports.getProjectSkillsPath = getProjectSkillsPath;
@@ -11,7 +11,9 @@ exports.copySkills = copySkills;
 exports.getInstalledVersion = getInstalledVersion;
 exports.getPackageVersion = getPackageVersion;
 exports.writeVersionFile = writeVersionFile;
+exports.getLatestVersionFromRegistry = getLatestVersionFromRegistry;
 exports.default = installSkillsAction;
+const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
@@ -20,6 +22,18 @@ const ui_1 = require("../ui");
  * Version file name for tracking installed skills version
  */
 exports.VERSION_FILE_NAME = '.mbc-skills-version';
+/**
+ * Cache file name for storing latest version from npm registry
+ */
+exports.VERSION_CACHE_FILE_NAME = '.mbc-version-cache.json';
+/**
+ * Cache TTL in milliseconds (24 hours)
+ */
+exports.VERSION_CACHE_TTL_MS = 24 * 60 * 60 * 1000;
+/**
+ * npm package name for mcp-server
+ */
+const MCP_SERVER_PACKAGE = '@mbc-cqrs-serverless/mcp-server';
 /**
  * Get the path to the mcp-server skills source directory
  */
@@ -130,6 +144,61 @@ function writeVersionFile(destPath, version) {
     const versionFilePath = path_1.default.join(destPath, exports.VERSION_FILE_NAME);
     (0, fs_1.writeFileSync)(versionFilePath, version, 'utf-8');
 }
+/**
+ * Get the latest package version from npm registry with caching
+ * @param destPath - The destination path where cache file is stored
+ * @param forceRefresh - Force refresh from npm registry, ignoring cache
+ * @returns The latest version or null if not available
+ */
+function getLatestVersionFromRegistry(destPath, forceRefresh = false) {
+    const cacheFilePath = path_1.default.join(destPath, exports.VERSION_CACHE_FILE_NAME);
+    // Check cache first (unless force refresh)
+    if (!forceRefresh && (0, fs_1.existsSync)(cacheFilePath)) {
+        try {
+            const cache = JSON.parse((0, fs_1.readFileSync)(cacheFilePath, 'utf-8'));
+            const cacheAge = Date.now() - new Date(cache.checkedAt).getTime();
+            if (cacheAge < exports.VERSION_CACHE_TTL_MS) {
+                // Cache is still valid
+                return cache.version;
+            }
+        }
+        catch {
+            // Cache read failed, continue to fetch from registry
+        }
+    }
+    // Fetch from npm registry
+    try {
+        const version = (0, child_process_1.execSync)(`npm view ${MCP_SERVER_PACKAGE} version`, {
+            encoding: 'utf-8',
+            timeout: 10000,
+            stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+        // Ensure destination directory exists before writing cache
+        if (!(0, fs_1.existsSync)(destPath)) {
+            (0, fs_1.mkdirSync)(destPath, { recursive: true });
+        }
+        // Save to cache
+        const cache = {
+            version,
+            checkedAt: new Date().toISOString(),
+        };
+        (0, fs_1.writeFileSync)(cacheFilePath, JSON.stringify(cache, null, 2), 'utf-8');
+        return version;
+    }
+    catch {
+        // Offline or error - try to use expired cache as fallback
+        if ((0, fs_1.existsSync)(cacheFilePath)) {
+            try {
+                const cache = JSON.parse((0, fs_1.readFileSync)(cacheFilePath, 'utf-8'));
+                return cache.version;
+            }
+            catch {
+                return null;
+            }
+        }
+        return null;
+    }
+}
 /**
  * Install Claude Code skills for MBC CQRS Serverless
  */
@@ -170,23 +239,24 @@ async function installSkillsAction(options, command) {
     // Check mode - compare versions without installing
     if (check) {
         const installedVersion = getInstalledVersion(destPath);
-        const packageVersion = getPackageVersion(sourcePath);
+        // Get latest version from npm registry (with 24h cache)
+        const latestVersion = getLatestVersionFromRegistry(destPath, force);
         if (!installedVersion) {
             ui_1.logger.warn('Skills are not installed.');
-            ui_1.logger.info(`Available version: ${packageVersion || 'unknown'}`);
+            ui_1.logger.info(`Available version: ${latestVersion || 'unknown'}`);
             ui_1.logger.info('Run `mbc install-skills` to install.');
             return;
         }
-        if (!packageVersion) {
-            ui_1.logger.warn('Could not determine package version.');
+        if (!latestVersion) {
+            ui_1.logger.warn('Could not determine latest version. Check your network connection.');
             ui_1.logger.info(`Installed version: ${installedVersion}`);
             return;
         }
-        if (installedVersion === packageVersion) {
+        if (installedVersion === latestVersion) {
             ui_1.logger.success(`Skills are up to date (${installedVersion}).`);
         }
         else {
-            ui_1.logger.warn(`Update available: ${installedVersion} → ${packageVersion}`);
+            ui_1.logger.warn(`Update available: ${installedVersion} → ${latestVersion}`);
             ui_1.logger.info('Run `mbc install-skills --force` to update.');
         }
         return;
@@ -203,8 +273,10 @@ async function installSkillsAction(options, command) {
     // Copy skills
     ui_1.logger.title('install', `Installing skills to ${destPath}`);
     const copiedSkills = copySkills(sourcePath, destPath);
+    // Get version from npm registry (preferred) or fall back to local package.json
+    const latestVersion = getLatestVersionFromRegistry(destPath, true);
+    const packageVersion = latestVersion || getPackageVersion(sourcePath);
     // Write version file
-    const packageVersion = getPackageVersion(sourcePath);
     if (packageVersion) {
         writeVersionFile(destPath, packageVersion);
     }

package/dist/actions/install-skills.action.spec.js

@@ -39,7 +39,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const install_skills_action_1 = __importStar(require("./install-skills.action"));
 jest.mock('fs');
 jest.mock('os');
+jest.mock('child_process');
 const fs_1 = require("fs");
+const child_process_1 = require("child_process");
 const os_1 = __importDefault(require("os"));
 const mockExistsSync = fs_1.existsSync;
 const mockMkdirSync = fs_1.mkdirSync;
@@ -47,6 +49,7 @@ const mockCpSync = fs_1.cpSync;
 const mockReaddirSync = fs_1.readdirSync;
 const mockReadFileSync = fs_1.readFileSync;
 const mockWriteFileSync = fs_1.writeFileSync;
+const mockExecSync = child_process_1.execSync;
 describe('Install Skills Action', () => {
     const mockCommand = {
         name: () => 'install-skills',
@@ -55,6 +58,8 @@ describe('Install Skills Action', () => {
     beforeEach(() => {
         jest.clearAllMocks();
         os_1.default.homedir.mockReturnValue('/home/user');
+        // Default mock for npm registry - returns a test version
+        mockExecSync.mockReturnValue('1.0.25\n');
     });
     describe('getSkillsSourcePath', () => {
         it('should return the path to mcp-server skills directory', () => {
@@ -278,6 +283,81 @@ describe('Install Skills Action', () => {
                 expect(mockWriteFileSync).toHaveBeenCalledWith(expect.stringContaining(install_skills_action_1.VERSION_FILE_NAME), '1.0.25', 'utf-8');
             });
         });
+        describe('getLatestVersionFromRegistry', () => {
+            it('should fetch version from npm registry', () => {
+                mockExistsSync.mockReturnValue(false);
+                mockExecSync.mockReturnValue('1.0.26\n');
+                const version = (0, install_skills_action_1.getLatestVersionFromRegistry)('/dest/skills');
+                expect(version).toBe('1.0.26');
+                expect(mockExecSync).toHaveBeenCalledWith('npm view @mbc-cqrs-serverless/mcp-server version', expect.objectContaining({ encoding: 'utf-8', timeout: 10000 }));
+            });
+            it('should use cached version if cache is valid', () => {
+                const cacheData = {
+                    version: '1.0.25',
+                    checkedAt: new Date().toISOString(), // Fresh cache
+                };
+                mockExistsSync.mockReturnValue(true);
+                mockReadFileSync.mockReturnValue(JSON.stringify(cacheData));
+                const version = (0, install_skills_action_1.getLatestVersionFromRegistry)('/dest/skills');
+                expect(version).toBe('1.0.25');
+                expect(mockExecSync).not.toHaveBeenCalled();
+            });
+            it('should fetch from registry if cache is expired', () => {
+                const cacheData = {
+                    version: '1.0.24',
+                    checkedAt: new Date(Date.now() - 25 * 60 * 60 * 1000).toISOString(), // 25 hours ago
+                };
+                mockExistsSync.mockReturnValue(true);
+                mockReadFileSync.mockReturnValue(JSON.stringify(cacheData));
+                mockExecSync.mockReturnValue('1.0.26\n');
+                const version = (0, install_skills_action_1.getLatestVersionFromRegistry)('/dest/skills');
+                expect(version).toBe('1.0.26');
+                expect(mockExecSync).toHaveBeenCalled();
+            });
+            it('should force refresh when forceRefresh is true', () => {
+                const cacheData = {
+                    version: '1.0.24',
+                    checkedAt: new Date().toISOString(), // Fresh cache
+                };
+                mockExistsSync.mockReturnValue(true);
+                mockReadFileSync.mockReturnValue(JSON.stringify(cacheData));
+                mockExecSync.mockReturnValue('1.0.26\n');
+                const version = (0, install_skills_action_1.getLatestVersionFromRegistry)('/dest/skills', true);
+                expect(version).toBe('1.0.26');
+                expect(mockExecSync).toHaveBeenCalled();
+            });
+            it('should use expired cache as fallback when offline', () => {
+                const cacheData = {
+                    version: '1.0.24',
+                    checkedAt: new Date(Date.now() - 25 * 60 * 60 * 1000).toISOString(),
+                };
+                mockExistsSync.mockReturnValue(true);
+                mockReadFileSync.mockReturnValue(JSON.stringify(cacheData));
+                mockExecSync.mockImplementation(() => {
+                    throw new Error('Network error');
+                });
+                const version = (0, install_skills_action_1.getLatestVersionFromRegistry)('/dest/skills');
+                expect(version).toBe('1.0.24');
+            });
+            it('should return null when offline and no cache exists', () => {
+                mockExistsSync.mockReturnValue(false);
+                mockExecSync.mockImplementation(() => {
+                    throw new Error('Network error');
+                });
+                const version = (0, install_skills_action_1.getLatestVersionFromRegistry)('/dest/skills');
+                expect(version).toBeNull();
+            });
+            it('should save version to cache after fetching', () => {
+                mockExistsSync.mockReturnValue(true);
+                mockExecSync.mockReturnValue('1.0.26\n');
+                // Make cache read fail to trigger fetch
+                mockReadFileSync.mockImplementation(() => {
+                    throw new Error('No cache');
+                });
+                (0, install_skills_action_1.getLatestVersionFromRegistry)('/dest/skills');
+                expect(mockWriteFileSync).toHaveBeenCalledWith(expect.stringContaining(install_skills_action_1.VERSION_CACHE_FILE_NAME), expect.stringContaining('"version": "1.0.26"'), 'utf-8');
+            });
+        });
         describe('Check option', () => {
             beforeEach(() => {
                 mockReaddirSync.mockReturnValue([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mbc-cqrs-serverless/cli",
-  "version": "1.0.25",
+  "version": "1.1.0-beta.0",
   "description": "a CLI to get started with MBC CQRS serverless framework",
   "keywords": [
     "mbc",
@@ -58,5 +58,5 @@
     "@faker-js/faker": "^8.3.1",
     "copyfiles": "^2.4.1"
   },
-  "gitHead": "26c722916f5c8a71b5c066eca5b8db8c21dc7bcb"
+  "gitHead": "b16d8982c02933fd41a455d3e41f9750bbcf668c"
 }

package/templates/.env.local

@@ -12,36 +12,69 @@ COMPOSE_PROJECT_NAME=%%projectName%%
 LOG_LEVEL=verbose # debug, verbose, info, warn, error, fatal
 # disable event route for API GW integration
 EVENT_SOURCE_DISABLED=false
+
+# ============================================
+# Local Service Ports
+# Change these if you have port conflicts with other services
+# ============================================
+# Serverless Offline (API Gateway)
+LOCAL_HTTP_PORT=3000
+LOCAL_LAMBDA_PORT=3002
+# DynamoDB Local
+LOCAL_DYNAMODB_PORT=8000
+# MySQL (RDS)
+LOCAL_RDS_PORT=3306
+# LocalStack (S3)
+LOCAL_S3_PORT=4566
+# SNS
+LOCAL_SNS_PORT=4002
+# SQS (ElasticMQ)
+LOCAL_SQS_PORT=9324
+LOCAL_SQS_UI_PORT=9325
+# Step Functions Local
+LOCAL_SFN_PORT=8083
+# Cognito Local
+LOCAL_COGNITO_PORT=9229
+# AppSync Simulator
+LOCAL_APPSYNC_PORT=4001
+# EventBridge
+LOCAL_EVENTBRIDGE_PORT=4010
+LOCAL_EVENTBRIDGE_PUBSUB_PORT=4011
+# SES
+LOCAL_SES_PORT=8005
+# DynamoDB Admin UI
+LOCAL_DDB_ADMIN_PORT=8001
+
 # DynamoDB endpoint, useful for local development
-DYNAMODB_ENDPOINT=http://localhost:8000
+DYNAMODB_ENDPOINT=http://localhost:${LOCAL_DYNAMODB_PORT:-8000}
 DYNAMODB_REGION=ap-northeast-1
 # set the limit size for `attributes` of object in DDB
 ATTRIBUTE_LIMIT_SIZE=389120 # bytes, refer to https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/ServiceQuotas.html#limits-attributes
 # S3 endpoint, useful for local development
-S3_ENDPOINT=http://localhost:4566
+S3_ENDPOINT=http://localhost:${LOCAL_S3_PORT:-4566}
 S3_REGION=ap-northeast-1
 # save DDB attributes
 S3_BUCKET_NAME=local-bucket
 # Step Function endpoint, useful for local development
-SFN_ENDPOINT=http://localhost:8083
+SFN_ENDPOINT=http://localhost:${LOCAL_SFN_PORT:-8083}
 SFN_REGION=ap-northeast-1
 SFN_COMMAND_ARN=arn:aws:states:ap-northeast-1:101010101010:stateMachine:command
 SFN_TASK_ARN=arn:aws:states:ap-northeast-1:101010101010:stateMachine:sfn-task
 # SNS endpoint, useful for local development
-SNS_ENDPOINT=http://localhost:4002
+SNS_ENDPOINT=http://localhost:${LOCAL_SNS_PORT:-4002}
 SNS_REGION=ap-northeast-1
 SNS_TOPIC_ARN=arn:aws:sns:ap-northeast-1:101010101010:CqrsSnsTopic
 SNS_ALARM_TOPIC_ARN=arn:aws:sns:ap-northeast-1:101010101010:AlarmSnsTopic
 # Cognito endpoint, useful for local development
-COGNITO_URL=http://localhost:9229
+COGNITO_URL=http://localhost:${LOCAL_COGNITO_PORT:-9229}
 COGNITO_USER_POOL_ID=local_2G7noHgW
 COGNITO_USER_POLL_CLIENT_ID=dnk8y7ii3wled35p3lw0l2cd7
 COGNITO_REGION=ap-northeast-1
 # AppSync endpoint, useful for local development
-APPSYNC_ENDPOINT=http://localhost:4001/graphql
+APPSYNC_ENDPOINT=http://localhost:${LOCAL_APPSYNC_PORT:-4001}/graphql
 APPSYNC_API_KEY=da2-fakeApiId123456
 # SES email endpoint, useful for local development
-SES_ENDPOINT=http://localhost:8005
+SES_ENDPOINT=http://localhost:${LOCAL_SES_PORT:-8005}
 SES_REGION=ap-northeast-1
 SES_FROM_EMAIL=email@example.com
 
@@ -52,7 +85,7 @@ SES_FROM_EMAIL=email@example.com
 # Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
 # See the documentation for all the connection string options: https://pris.ly/d/connection-strings
 
-DATABASE_URL="mysql://root:RootCqrs@localhost:3306/cqrs?schema=public&connection_limit=1"
+DATABASE_URL="mysql://root:RootCqrs@localhost:${LOCAL_RDS_PORT:-3306}/cqrs?schema=public&connection_limit=1"
 
 # serverless dynamodb local stream
 LOCAL_DDB_SAMPLE_STREAM=arn:aws:dynamodb:ddblocal:000000000000:table/local-test-cli-sample-command/stream/2025-01-14T12:05:57.881

package/templates/infra-local/appsync-simulator/package-lock.json

@@ -406,7 +406,6 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.67.tgz",
       "integrity": "sha512-wI8uHusga+0ZugNp0Ol/3BqQfEcCCNfojtO6Oou9iVNGPTL6QNSdnUdqq85fRgIorLhLMuPIKpsN98QE9Nh+KQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -651,7 +650,6 @@
         "mime-types"
       ],
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "@aws-cdk/asset-awscli-v1": "^2.2.208",
         "@aws-cdk/asset-kubectl-v20": "^2.1.3",
@@ -1544,9 +1542,9 @@
       }
     },
     "node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.4.tgz",
+      "integrity": "sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
@@ -2208,7 +2206,6 @@
       "resolved": "https://registry.npmjs.org/graphql/-/graphql-14.7.0.tgz",
       "integrity": "sha512-l0xWZpoPKpppFzMfvVyFmp9vLN7w/ZZJPefUicMCepfJeQ8sMcztloGYY9DfjVPo6tIUDzU5Hw3MUbIjj9AVVA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "iterall": "^1.2.2"
       },
@@ -4293,7 +4290,6 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
       "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"

package/templates/infra-local/docker-compose.yml

@@ -3,15 +3,15 @@ services:
   stepfunctions-local:
     image: amazon/aws-stepfunctions-local
     ports:
-      - 8083:8083
+      - ${LOCAL_SFN_PORT:-8083}:8083
     environment:
       - AWS_ACCOUNT_ID=101010101010
       - AWS_DEFAULT_REGION=ap-northeast-1
-      - LAMBDA_ENDPOINT=http://host.docker.internal:3002
-      - SQS_ENDPOINT=http://host.docker.internal:9324
-      - SNS_ENDPOINT=http://host.docker.internal:4002
-      - DYNAMODB_ENDPOINT=http://host.docker.internal:8000
-      - STEP_FUNCTIONS_ENDPOINT=http://host.docker.internal:8083
+      - LAMBDA_ENDPOINT=http://host.docker.internal:${LOCAL_LAMBDA_PORT:-3002}
+      - SQS_ENDPOINT=http://host.docker.internal:${LOCAL_SQS_PORT:-9324}
+      - SNS_ENDPOINT=http://host.docker.internal:${LOCAL_SNS_PORT:-4002}
+      - DYNAMODB_ENDPOINT=http://host.docker.internal:${LOCAL_DYNAMODB_PORT:-8000}
+      - STEP_FUNCTIONS_ENDPOINT=http://host.docker.internal:${LOCAL_SFN_PORT:-8083}
       - ECS_ENDPOINT=VALUE
     extra_hosts:
       - 'host.docker.internal:host-gateway'
@@ -24,12 +24,12 @@ services:
     volumes:
       - ./docker-data/mysql:/var/lib/mysql
     ports:
-      - 3306:3306
+      - ${LOCAL_RDS_PORT:-3306}:3306
 
   dynamodb-local:
     image: amazon/dynamodb-local
     ports:
-      - 8000:8000
+      - ${LOCAL_DYNAMODB_PORT:-8000}:8000
     volumes:
       - ./docker-data/dynamodb-local:/home/dynamodblocal/data
     working_dir: /home/dynamodblocal
@@ -43,15 +43,15 @@ services:
       - AWS_ACCESS_KEY_ID=local
       - AWS_SECRET_ACCESS_KEY=local
     ports:
-      - 8001:8001
+      - ${LOCAL_DDB_ADMIN_PORT:-8001}:8001
     depends_on:
       - dynamodb-local
 
   queue:
     image: softwaremill/elasticmq-native:latest
     ports:
-      - 9324:9324 # sqs
-      - 9325:9325 # ui
+      - ${LOCAL_SQS_PORT:-9324}:9324 # sqs
+      - ${LOCAL_SQS_UI_PORT:-9325}:9325 # ui
     volumes:
       - ./elasticmq.conf:/opt/elasticmq.conf
       - ./docker-data/elasticmq:/data
@@ -59,7 +59,7 @@ services:
   localstack:
     image: localstack/localstack
     ports:
-      - '4566:4566'
+      - '${LOCAL_S3_PORT:-4566}:4566'
       - '4510-4559:4510-4559'
     environment:
       - SERVICES=s3
@@ -76,7 +76,7 @@ services:
       context: ./appsync-simulator
       dockerfile: Dockerfile
     ports:
-      - 4001:4001
+      - ${LOCAL_APPSYNC_PORT:-4001}:4001
     environment:
       - PORT=4001
       - API_KEY=da2-fakeApiId123456
@@ -86,6 +86,6 @@ services:
       context: ./cognito-local
       dockerfile: Dockerfile
     ports:
-      - 9229:9229
+      - ${LOCAL_COGNITO_PORT:-9229}:9229
     volumes:
       - ./docker-data/.cognito:/app/.cognito

package/templates/infra-local/scripts/trigger_ddb_stream.ps1

@@ -4,9 +4,7 @@ $env:AWS_ACCOUNT_ID = "101010101010"
 $env:AWS_ACCESS_KEY_ID = "local"
 $env:AWS_SECRET_ACCESS_KEY = "local"
 
-$endpoint = "http://localhost:8000"
-
-# Load environment variables from .env file (assuming you have a utility to load it)
+# Load environment variables from .env file
 Get-Content .env | ForEach-Object {
     if ($_ -match "^\s*#") {
         return
@@ -19,6 +17,22 @@ Get-Content .env | ForEach-Object {
     }
 }
 
+# Build table name prefix from environment variables
+# Default: NODE_ENV=local, APP_NAME from .env
+$tablePrefix = if ($env:NODE_ENV) { $env:NODE_ENV } else { "local" }
+$tablePrefix = "$tablePrefix-$env:APP_NAME"
+
+# Get ports from environment variables with defaults
+$dynamodbPort = if ($env:LOCAL_DYNAMODB_PORT) { $env:LOCAL_DYNAMODB_PORT } else { "8000" }
+$httpPort = if ($env:LOCAL_HTTP_PORT) { $env:LOCAL_HTTP_PORT } else { "3000" }
+
+$endpoint = "http://localhost:$dynamodbPort"
+
+Write-Host "Using configuration:"
+Write-Host "  TABLE_PREFIX: $tablePrefix"
+Write-Host "  DynamoDB endpoint: $endpoint"
+Write-Host "  Serverless HTTP port: $httpPort"
+
 Write-Host "Read table name"
 
 # Read table names from JSON file
@@ -34,9 +48,8 @@ foreach ($table in $tables) {
             exit 1
         }
 
-        Write-Host "Check health table local-$env:APP_NAME-$table-command"
-        Write-Host "local-$env:APP_NAME-$table-command"
-        $status = aws --endpoint $endpoint dynamodb describe-table --table-name "local-$env:APP_NAME-$table-command" --query "Table.TableStatus"
+        Write-Host "Check health table $tablePrefix-$table-command"
+        $status = aws --endpoint $endpoint dynamodb describe-table --table-name "$tablePrefix-$table-command" --query "Table.TableStatus"
 
         Write-Host "Table status: $status"
         if ($status -eq '"ACTIVE"') {
@@ -59,7 +72,7 @@ while ($true) {
     }
 
     Write-Host "Check health table tasks"
-    $status = aws --endpoint $endpoint dynamodb describe-table --table-name "local-$env:APP_NAME-tasks" --query "Table.TableStatus"
+    $status = aws --endpoint $endpoint dynamodb describe-table --table-name "$tablePrefix-tasks" --query "Table.TableStatus"
 
     Write-Host "Table status: $status"
     if ($status -eq '"ACTIVE"') {
@@ -82,7 +95,7 @@ while ($true) {
 
     Write-Host "Check health serverless"
     try {
-        $response = Invoke-WebRequest -Uri "http://localhost:3000" -UseBasicParsing -ErrorAction Stop
+        $response = Invoke-WebRequest -Uri "http://localhost:$httpPort" -UseBasicParsing -ErrorAction Stop
         $status = $response.StatusCode
     } catch {
         if ($_.Exception.Response -ne $null) {
@@ -122,12 +135,12 @@ foreach ($table in $tables) {
 
     Write-Host "Send a item to trigger command $table"
 
-    aws dynamodb put-item --endpoint http://localhost:8000 --table-name "local-$env:APP_NAME-$table-command" --item $escapedJsonItemString
+    aws dynamodb put-item --endpoint $endpoint --table-name "$tablePrefix-$table-command" --item $escapedJsonItemString
 }
 
-# Trigger asks stream
+# Trigger tasks stream
 Write-Host  "Send a command to trigger command stream tasks"
 $command = @"
-aws dynamodb put-item --endpoint http://localhost:8000 --table-name "local-$env:APP_NAME-tasks" --item '{\"input\":{\"M\":{}},\"sk\":{\"S\":\"$timestamp\"},\"pk\":{\"S\":\"test\"}}'
+aws dynamodb put-item --endpoint $endpoint --table-name "$tablePrefix-tasks" --item '{\"input\":{\"M\":{}},\"sk\":{\"S\":\"$timestamp\"},\"pk\":{\"S\":\"test\"}}'
 "@
 Invoke-Expression $command

package/templates/infra-local/scripts/trigger_ddb_stream.sh

@@ -5,10 +5,24 @@ export AWS_ACCOUNT_ID=101010101010
 export AWS_ACCESS_KEY_ID=local
 export AWS_SECRET_ACCESS_KEY=local
 
-endpoint='http://localhost:8000'
-
+# Load environment variables from .env file
 source .env
 
+# Build table name prefix from environment variables
+# Default: NODE_ENV=local, APP_NAME from .env
+TABLE_PREFIX="${NODE_ENV:-local}-${APP_NAME}"
+
+# Get ports from environment variables with defaults
+DYNAMODB_PORT="${LOCAL_DYNAMODB_PORT:-8000}"
+HTTP_PORT="${LOCAL_HTTP_PORT:-3000}"
+
+endpoint="http://localhost:${DYNAMODB_PORT}"
+
+echo "Using configuration:"
+echo "  TABLE_PREFIX: ${TABLE_PREFIX}"
+echo "  DynamoDB endpoint: ${endpoint}"
+echo "  Serverless HTTP port: ${HTTP_PORT}"
+
 echo "Read table name"
 declare -a tables
 while IFS= read -r line; do
@@ -27,7 +41,7 @@ for table in "${tables[@]}"; do
 		fi
 
 		echo "Check health table ${table}"
-		status=$(aws --endpoint=${endpoint} dynamodb describe-table --table-name local-${APP_NAME}-${table}-command --query 'Table.TableStatus')
+		status=$(aws --endpoint=${endpoint} dynamodb describe-table --table-name ${TABLE_PREFIX}-${table}-command --query 'Table.TableStatus')
 		echo "Table status: ${status}"
 		if [[ "${status}" == "\"ACTIVE\"" ]]; then
 			echo "Table ${table} is ACTIVE"
@@ -48,7 +62,7 @@ while true; do
 	fi
 
 	echo "Check health table tasks"
-	status=$(aws --endpoint=${endpoint} dynamodb describe-table --table-name local-${APP_NAME}-tasks --query 'Table.TableStatus')
+	status=$(aws --endpoint=${endpoint} dynamodb describe-table --table-name ${TABLE_PREFIX}-tasks --query 'Table.TableStatus')
 	echo "Table status: ${status}"
 	if [[ "${status}" == "\"ACTIVE\"" ]]; then
 		echo "Table tasks is ACTIVE"
@@ -70,7 +84,7 @@ while true; do
 	fi
 
 	echo "Check health serverless"
-	status=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:3000)
+	status=$(curl -s -o /dev/null -w "%{http_code}" http://localhost:${HTTP_PORT})
 	echo "Serverless status: ${status}"
 	if [[ "${status}" == "200" ]]; then
 		echo "Serverless is ACTIVE"
@@ -85,8 +99,8 @@ done
 timestamp=$(date +%s)
 for table in "${tables[@]}"; do
 	echo "Send a command to trigger command stream ${table}"
-	aws --endpoint=${endpoint} dynamodb put-item --table-name local-${APP_NAME}-${table}-command --item "{\"pk\": {\"S\": \"test\" }, \"sk\": { \"S\": \"${timestamp}\" }}"
+	aws --endpoint=${endpoint} dynamodb put-item --table-name ${TABLE_PREFIX}-${table}-command --item "{\"pk\": {\"S\": \"test\" }, \"sk\": { \"S\": \"${timestamp}\" }}"
 done
 
 echo "Send a command to trigger command stream tasks"
-aws --endpoint=http://localhost:8000 dynamodb put-item --table-name local-demo-tasks --item "{\"input\":{\"M\":{}},\"sk\":{\"S\":\"${timestamp}\"},\"pk\":{\"S\":\"test\"}}"
+aws --endpoint=${endpoint} dynamodb put-item --table-name ${TABLE_PREFIX}-tasks --item "{\"input\":{\"M\":{}},\"sk\":{\"S\":\"${timestamp}\"},\"pk\":{\"S\":\"test\"}}"

package/templates/infra-local/serverless.yml

@@ -14,23 +14,35 @@ plugins:
   - serverless-offline
 
 custom:
+  # Port configuration - override via environment variables in .env
+  httpPort: ${env:LOCAL_HTTP_PORT, 3000}
+  lambdaPort: ${env:LOCAL_LAMBDA_PORT, 3002}
+  dynamodbPort: ${env:LOCAL_DYNAMODB_PORT, 8000}
+  sqsPort: ${env:LOCAL_SQS_PORT, 9324}
+  snsPort: ${env:LOCAL_SNS_PORT, 4002}
+  eventBridgePort: ${env:LOCAL_EVENTBRIDGE_PORT, 4010}
+  sesPort: ${env:LOCAL_SES_PORT, 8005}
+  cognitoPort: ${env:LOCAL_COGNITO_PORT, 9229}
+
   serverless-offline:
     corsAllowOrigin: '*'
     corsAllowHeaders: '*'
     host: 0.0.0.0
+    httpPort: ${self:custom.httpPort}
+    lambdaPort: ${self:custom.lambdaPort}
     reloadHandler: true
     ignoreJWTSignature: true
   serverless-offline-ses-v2:
-    port: 8005
+    port: ${self:custom.sesPort}
   serverless-offline-sns:
-    port: 4002 # a free port for the sns server to run on
+    port: ${self:custom.snsPort}
     debug: true
     subscriptions:
       - topic:
           topicName: CqrsSnsTopic
           rawMessageDelivery: 'true'
           filterPolicy: { 'action': ['task-execute'] }
-        queue: http://localhost:9324/101010101010/task-action-queue
+        queue: http://localhost:${self:custom.sqsPort}/101010101010/task-action-queue
       - topic:
           topicName: CqrsSnsTopic
           rawMessageDelivery: 'true'
@@ -39,21 +51,21 @@ custom:
               'action':
                 ['notification-action', 'command-status', 'task-status'],
             }
-        queue: http://localhost:9324/101010101010/notification-queue
+        queue: http://localhost:${self:custom.sqsPort}/101010101010/notification-queue
       - topic:
           topicName: CqrsSnsTopic
           rawMessageDelivery: 'true'
           filterPolicy: { 'action': ['sub-task-status'] }
-        queue: http://localhost:9324/101010101010/sub-task-status-queue
+        queue: http://localhost:${self:custom.sqsPort}/101010101010/sub-task-status-queue
       - topic:
           topicName: CqrsSnsTopic
           rawMessageDelivery: 'true'
           filterPolicy: { 'action': ['import-execute'] }
-        queue: http://localhost:9324/101010101010/import-action-queue
+        queue: http://localhost:${self:custom.sqsPort}/101010101010/import-action-queue
       - topic:
           topicName: AlarmSnsTopic
           rawMessageDelivery: 'true'
-        queue: http://localhost:9324/101010101010/alarm-queue
+        queue: http://localhost:${self:custom.sqsPort}/101010101010/alarm-queue
     # host: 0.0.0.0 # Optional, defaults to 127.0.0.1 if not provided to serverless-offline
     # sns-endpoint: http://127.0.0.1:4567 # Optional. Only if you want to use a custom SNS provider endpoint
     # sns-subscribe-endpoint: http://127.0.0.1:3000 # Optional. Only if you want to use a custom subscribe endpoint from SNS to send messages back to
@@ -63,7 +75,7 @@ custom:
     accountId: 101010101010
     debug: true
     apiVersion: '2012-11-05'
-    endpoint: http://localhost:9324
+    endpoint: http://localhost:${self:custom.sqsPort}
     region: ap-northeast-1
     accessKeyId: root
     secretAccessKey: root
@@ -80,19 +92,19 @@ custom:
     start:
       docker: true
       inMemory: true
-      port: 8000
+      port: ${self:custom.dynamodbPort}
       noStart: true
       seed: true
       migrate: false # create tables on start
       onStart: false
       convertEmptyValues: true
   serverless-offline-dynamodb-streams:
-    endpoint: http://localhost:8000
+    endpoint: http://localhost:${self:custom.dynamodbPort}
   serverless-offline-aws-eventbridge:
-    port: 4010 # port to run the eventBridge mock server on
+    port: ${self:custom.eventBridgePort}
     mockEventBridgeServer: true # Set to false if EventBridge is already mocked by another stack
     hostname: 127.0.0.1 # IP or hostname of existing EventBridge if mocked by another stack
-    pubSubPort: 4011 # Port to run the MQ server (or just listen if using an EventBridge Mock server from another stack)
+    pubSubPort: ${env:LOCAL_EVENTBRIDGE_PUBSUB_PORT, 4011}
     debug: false # flag to show debug messages
     account: '' # account id that gets passed to the event
     maximumRetryAttempts: 10 # maximumRetryAttempts to retry lambda
@@ -113,7 +125,7 @@ provider:
       localAuthorizer:
         type: jwt
         identitySource: $request.header.Authorization
-        issuerUrl: http://localhost:9229/local_2G7noHgW
+        issuerUrl: http://localhost:${self:custom.cognitoPort}/local_2G7noHgW
         audience:
           - dnk8y7ii3wled35p3lw0l2cd7
       # keycloakAuthorizer: