Merge pull request #386 from Merit-Systems/master

[RELEASE] Monorepo restructuring + Echo Start AUI

Author: zdql

.dockerignore

@@ -61,8 +61,8 @@ Thumbs.db
 Dockerfile
 
 # Generated files
-echo-server/src/generated
-echo-control/src/generated
+packages/app/server/src/generated
+packages/app/control/src/generated
 
 # Cache
 .npm

.github/workflows/integration-tests.yml

@@ -3,23 +3,23 @@ name: Tests
 on:
   pull_request:
     paths:
-      - 'echo-control/**'
-      - 'echo-server/**'
-      - 'echo-react-sdk/**'
-      - 'echo-next-sdk/**'
-      - 'echo-typescript-sdk/**'
-      - 'integration-tests/**'
+      - 'packages/app/control/**'
+      - 'packages/app/server/**'
+      - 'packages/sdk/react/**'
+      - 'packages/sdk/next/**'
+      - 'packages/sdk/ts/**'
+      - 'packages/tests/integration/**'
       - '.github/workflows/**'
       - 'pnpm-lock.yaml'
       - 'package.json'
   push:
     branches: [main]
     paths:
-      - 'echo-control/**'
-      - 'echo-server/**'
-      - 'echo-react-sdk/**'
-      - 'echo-typescript-sdk/**'
-      - 'integration-tests/**'
+      - 'packages/app/control/**'
+      - 'packages/app/server/**'
+      - 'packages/sdk/react/**'
+      - 'packages/sdk/ts/**'
+      - 'packages/tests/integration/**'
       - '.github/workflows/**'
 
 jobs:
@@ -66,7 +66,7 @@ jobs:
           echo "✅ All workspace unit tests passed"
 
       - name: Create integration test environment file
-        working-directory: integration-tests
+        working-directory: packages/tests/integration
         run: |
           cat > .env.test << EOF
           # Database Configuration
@@ -119,13 +119,13 @@ jobs:
           done'
 
       - name: Setup Prisma schema
-        working-directory: echo-control
+        working-directory: packages/app/control
         env:
           DATABASE_URL: postgresql://test:test@localhost:5433/echo_integration_test
-        run: pnpm prisma:generate 
+        run: pnpm prisma:generate
 
       - name: Setup integration test environment
-        working-directory: integration-tests
+        working-directory: packages/tests/integration
         env:
           DATABASE_URL: postgresql://test:test@localhost:5433/echo_integration_test
           ECHO_CONTROL_URL: http://localhost:3001
@@ -153,11 +153,11 @@ jobs:
           pnpm run env:setup
 
       - name: Run Echo Data Server Tests
-        working-directory: integration-tests
+        working-directory: packages/tests/integration
         run: pnpm test:echo-data-server
 
       - name: Run OAuth Protocol Tests
-        working-directory: integration-tests
+        working-directory: packages/tests/integration
         run: pnpm test:oauth-protocol
 
       # TODO: Re-enable echo-server integration tests when properly configured
@@ -170,13 +170,13 @@ jobs:
         with:
           name: integration-test-results
           path: |
-            integration-tests/test-results/
-            integration-tests/coverage/
+            packages/tests/integration/test-results/
+            packages/tests/integration/coverage/
           retention-days: 30
 
       - name: Cleanup integration environment
         if: always()
-        working-directory: integration-tests
+        working-directory: packages/tests/integration
         run: |
           chmod +x scripts/teardown-integration-env.sh
           ./scripts/teardown-integration-env.sh
@@ -205,11 +205,11 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Install Playwright browsers
-        working-directory: integration-tests
+        working-directory: packages/tests/integration
         run: npx playwright install --with-deps
 
       - name: Create environment file for E2E tests
-        working-directory: integration-tests
+        working-directory: packages/tests/integration
         run: |
           cat > .env.test << EOF
           DATABASE_URL=postgresql://test:test@postgres-test:5432/echo_integration_test
@@ -227,7 +227,7 @@ jobs:
           EOF
 
       - name: Create Docker environment overrides
-        working-directory: integration-tests/docker
+        working-directory: packages/tests/integration/docker
         run: |
           cat > .env.docker << EOF
           DATABASE_URL=postgresql://test:test@postgres-test:5432/echo_integration_test
@@ -236,7 +236,7 @@ jobs:
           EOF
 
       - name: Start Docker services for E2E tests
-        working-directory: integration-tests
+        working-directory: packages/tests/integration
         run: |
           docker-compose -f docker/docker-compose.yml up -d
           echo "Waiting for services to be healthy..."
@@ -246,18 +246,18 @@ jobs:
           done'
 
       - name: Run E2E tests
-        working-directory: integration-tests
+        working-directory: packages/tests/integration
         run: pnpm test:e2e
 
       - name: Upload Playwright report
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: playwright-report
-          path: integration-tests/playwright-report/
+          path: packages/tests/integration/playwright-report/
           retention-days: 30
 
       - name: Cleanup Docker services
         if: always()
-        working-directory: integration-tests
+        working-directory: packages/tests/integration
         run: docker-compose -f docker/docker-compose.yml down -v

.github/workflows/migrate-db.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches: [master, production]
     paths:
-      - 'echo-control/prisma/**'
+      - 'packages/app/control/prisma/**'
 
 jobs:
   migrate-staging:
@@ -29,11 +29,11 @@ jobs:
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile --filter echo-control
-        working-directory: ./echo-control
+        working-directory: ./packages/app/control
 
       - name: Run Prisma migrate deploy (Staging)
         run: pnpm run prisma:migrate-deploy
-        working-directory: ./echo-control
+        working-directory: ./packages/app/control
         env:
           DATABASE_URL: ${{ secrets.STAGING_DB_URL }}
 
@@ -58,10 +58,10 @@ jobs:
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile --filter echo-control
-        working-directory: ./echo-control
+        working-directory: ./packages/app/control
 
       - name: Run Prisma migrate deploy (Production)
         run: pnpm run prisma:migrate-deploy
-        working-directory: ./echo-control
+        working-directory: ./packages/app/control
         env:
           DATABASE_URL: ${{ secrets.PRODUCTION_DB_URL }}

.github/workflows/publish-sdks.yml

@@ -20,6 +20,7 @@ jobs:
       typescript-published: ${{ steps.publish-typescript.outputs.published }}
       react-published: ${{ steps.publish-react.outputs.published }}
       next-published: ${{ steps.publish-next.outputs.published }}
+      echo-start-published: ${{ steps.publish-echo-start.outputs.published }}
       version: ${{ steps.get-version.outputs.version }}
 
     steps:
@@ -43,22 +44,22 @@ jobs:
 
       - name: Get version from TypeScript SDK
         id: get-version
-        working-directory: ./echo-typescript-sdk
+        working-directory: ./packages/sdk/ts
         run: |
           PACKAGE_VERSION=$(node -p "require('./package.json').version")
           echo "version=$PACKAGE_VERSION" >> $GITHUB_OUTPUT
           echo "📦 Release version: $PACKAGE_VERSION"
 
       # TypeScript SDK
       - name: Build TypeScript SDK
-        working-directory: ./echo-typescript-sdk
+        working-directory: ./packages/sdk/ts
         run: |
           echo "🔨 Building TypeScript SDK..."
           pnpm run build
           echo "✅ TypeScript SDK built"
 
       - name: Test TypeScript SDK
-        working-directory: ./echo-typescript-sdk
+        working-directory: ./packages/sdk/ts
         run: |
           echo "🧪 Testing TypeScript SDK..."
           pnpm run test
@@ -67,7 +68,7 @@ jobs:
 
       - name: Check and publish TypeScript SDK
         id: publish-typescript
-        working-directory: ./echo-typescript-sdk
+        working-directory: ./packages/sdk/ts
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
@@ -95,14 +96,14 @@ jobs:
 
       # React SDK
       - name: Build React SDK
-        working-directory: ./echo-react-sdk
+        working-directory: ./packages/sdk/react
         run: |
           echo "🔨 Building React SDK..."
           pnpm run build
           echo "✅ React SDK built"
 
       - name: Test React SDK
-        working-directory: ./echo-react-sdk
+        working-directory: ./packages/sdk/react
         run: |
           echo "🧪 Testing React SDK..."
           # Note: Some authentication-related tests are currently failing due to SSR removal
@@ -113,7 +114,7 @@ jobs:
 
       - name: Check and publish React SDK
         id: publish-react
-        working-directory: ./echo-react-sdk
+        working-directory: ./packages/sdk/react
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
@@ -141,14 +142,14 @@ jobs:
 
       # Next.js SDK
       - name: Build Next.js SDK
-        working-directory: ./echo-next-sdk
+        working-directory: ./packages/sdk/next
         run: |
           echo "🔨 Building Next.js SDK..."
           pnpm run build
           echo "✅ Next.js SDK built"
 
       - name: Test Next.js SDK
-        working-directory: ./echo-next-sdk
+        working-directory: ./packages/sdk/next
         run: |
           echo "🧪 Testing Next.js SDK..."
           pnpm run test
@@ -157,7 +158,51 @@ jobs:
 
       - name: Check and publish Next.js SDK
         id: publish-next
-        working-directory: ./echo-next-sdk
+        working-directory: ./packages/sdk/next
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: |
+          PACKAGE_NAME=$(node -p "require('./package.json').name")
+          PACKAGE_VERSION=$(node -p "require('./package.json').version")
+          FORCE_PUBLISH="${{ github.event.inputs.force_publish }}"
+
+          if npm view "$PACKAGE_NAME@$PACKAGE_VERSION" version 2>/dev/null; then
+            if [ "$FORCE_PUBLISH" = "true" ]; then
+              echo "⚠️  Version $PACKAGE_VERSION of $PACKAGE_NAME already exists on npm, but force_publish is enabled"
+              echo "🚀 Publishing $PACKAGE_NAME to npm..."
+              npm publish --access public
+              echo "published=true" >> $GITHUB_OUTPUT
+              echo "✅ Successfully published $PACKAGE_NAME"
+            else
+              echo "❌ Version $PACKAGE_VERSION of $PACKAGE_NAME already exists on npm - skipping"
+              echo "published=false" >> $GITHUB_OUTPUT
+            fi
+          else
+            echo "🚀 Publishing $PACKAGE_NAME to npm..."
+            npm publish --access public
+            echo "published=true" >> $GITHUB_OUTPUT
+            echo "✅ Successfully published $PACKAGE_NAME"
+          fi
+
+      # Echo Start CLI
+      - name: Build Echo Start CLI
+        working-directory: ./packages/sdk/echo-start
+        run: |
+          echo "🔨 Building Echo Start CLI..."
+          pnpm run build
+          echo "✅ Echo Start CLI built"
+
+      - name: Test Echo Start CLI
+        working-directory: ./packages/sdk/echo-start
+        run: |
+          echo "🧪 Testing Echo Start CLI..."
+          pnpm run type-check
+          pnpm run lint
+          echo "✅ Echo Start CLI tests passed"
+
+      - name: Check and publish Echo Start CLI
+        id: publish-echo-start
+        working-directory: ./packages/sdk/echo-start
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
@@ -187,7 +232,7 @@ jobs:
     name: Create version tag
     runs-on: ubuntu-latest
     needs: publish
-    if: (needs.publish.outputs.typescript-published == 'true' || needs.publish.outputs.react-published == 'true' || needs.publish.outputs.next-published == 'true') && github.ref == 'refs/heads/production' && !startsWith(github.ref, 'refs/tags/')
+    if: (needs.publish.outputs.typescript-published == 'true' || needs.publish.outputs.react-published == 'true' || needs.publish.outputs.next-published == 'true' || needs.publish.outputs.echo-start-published == 'true') && github.ref == 'refs/heads/production' && !startsWith(github.ref, 'refs/tags/')
 
     steps:
       - name: Checkout code
@@ -248,12 +293,14 @@ jobs:
             - \`@merit-systems/echo-typescript-sdk\`
             - \`@merit-systems/echo-react-sdk\`
             - \`@merit-systems/echo-next-sdk\`
+            - \`echo-start\` (CLI tool)
 
             ### Installation
             \`\`\`bash
             npm install @merit-systems/echo-typescript-sdk
             npm install @merit-systems/echo-react-sdk
             npm install @merit-systems/echo-next-sdk
+            npm install -g echo-start
             \`\`\`
 
             This tag was automatically created after successful npm publishing from the production branch.