Merge pull request #375 from Merit-Systems/rfs/structure

Restructure monorepo

Author: rsproule

.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

Dockerfile.railway

@@ -76,29 +76,29 @@ COPY package.json ./
 COPY tsconfig.base.json ./
 
 # Copy all project files first
-COPY echo-control/ ./echo-control/
-COPY echo-server/ ./echo-server/
-COPY echo-typescript-sdk/ ./echo-typescript-sdk/
-COPY echo-next-sdk/ ./echo-next-sdk/
-COPY echo-react-sdk/ ./echo-react-sdk/
+COPY packages/app/control/ ./packages/app/control/
+COPY packages/app/server/ ./packages/app/server/
+COPY packages/sdk/ts/ ./packages/sdk/ts/
+COPY packages/sdk/next/ ./packages/sdk/next/
+COPY packages/sdk/react/ ./packages/sdk/react/
 
 # Install dependencies for both projects (including dev dependencies for build)
-WORKDIR /app/echo-control
+WORKDIR /app/packages/app/control
 RUN pnpm install
 
-WORKDIR /app/echo-server
+WORKDIR /app/packages/app/server
 RUN pnpm install
 
 # Step 1: Build echo-control and generate Prisma client
-WORKDIR /app/echo-control
+WORKDIR /app/packages/app/control
 RUN pnpm run prisma:generate
 RUN pnpm run build
 
-WORKDIR /app/echo-typescript-sdk
+WORKDIR /app/packages/sdk/ts
 RUN pnpm install
 RUN pnpm run build
 
-WORKDIR /app/echo-server
+WORKDIR /app/packages/app/server
 RUN pnpm run copy-prisma
 
 # Step 3: Build echo-server

README.md

@@ -35,23 +35,23 @@ Consider giving a star on GitHub!
 
 ## Core
 
-- [Echo Control](./echo-control): Next.js app for [echo.merit.systems](https://echo.merit.systems). Hosted site and api routes.
-- [Echo Server](./echo-server): Express server for router.echo.merit.systems. Proxy for routing and metering LLM requests from clients.
+- [Echo Control](./packages/app/control): Next.js app for [echo.merit.systems](https://echo.merit.systems). Hosted site and api routes.
+- [Echo Server](./packages/app/server): Express server for router.echo.merit.systems. Proxy for routing and metering LLM requests from clients.
 
 ## SDKs
 
-- [Echo TS SDK](./echo-typescript-sdk) Typescript SDK that all the framework specific SDKs are built on top of.
-- [Echo Next.js SDK](./echo-next-sdk) SDK for simple Next.js 15+ App Router integration.
-- [Echo React SDK](./echo-react-sdk) SDK for simple React client side SPA integration.
+- [Echo TS SDK](./packages/sdk/ts) Typescript SDK that all the framework specific SDKs are built on top of.
+- [Echo Next.js SDK](./packages/sdk/next) SDK for simple Next.js 15+ App Router integration.
+- [Echo React SDK](./packages/sdk/react) SDK for simple React client side SPA integration.
 
 ## Examples
 
-- [Echo Next.js Example](./examples/next-sdk-example)
-- [Echo React SDK](./examples/vite)
+- [Echo Next.js Example](./packages/sdk/examples/next)
+- [Echo React SDK](./packages/sdk/examples/vite)
 
 # Development
 
-Fill out `echo-control/.env` and `echo-server/.env`. Then...
+Fill out `packages/app/control/.env` and `packages/app/server/.env`. Then...
 
 - `pnpm i`
 - `pnpm dev`

echo-control/docs/react-sdk/use-chat.mdx

@@ -7,8 +7,8 @@
   "scripts": {
     "dev": "turbo run dev --filter=echo-control --filter=echo-server",
     "build": "pnpm run --recursive build",
-    "test:unit": "cd echo-typescript-sdk && pnpm run build && cd .. && pnpm run --recursive --filter=!echo-server test:unit",
-    "test:integration": "cd integration-tests && pnpm test",
+    "test:unit": "pnpm -C packages/sdk/ts run build && pnpm -r --filter=!packages/app/server run test:unit",
+    "test:integration": "pnpm -C packages/tests/integration test",
     "test:all": "pnpm run test:unit && pnpm run test:integration",
     "lint": "pnpm run --recursive lint",
     "lint:fix": "pnpm run --recursive lint:fix",
@@ -17,6 +17,7 @@
     "format:check": "prettier --check \"**/*.{ts,tsx,js,jsx,json,md}\""
   },
   "devDependencies": {
+    "@eslint/js": "^9.13.0",
     "@typescript-eslint/eslint-plugin": "^8.34.1",
     "@typescript-eslint/parser": "^8.34.1",
     "eslint": "^9.29.0",
@@ -26,6 +27,7 @@
     "eslint-plugin-unused-imports": "^4.1.4",
     "prettier": "^3.5.3",
     "tsup": "^8.5.0",
+    "turbo": "^2.5.6",
     "typescript": "^5.8.3"
   },
   "dependencies": {