Revert "refactor: restructure repo into apps/services/packages monorepo"

.github/workflows/bump-openclaw.yml

@@ -15,15 +15,15 @@ jobs:
     steps:
       - uses: useblacksmith/checkout@41cdeedae8edb2e684ba22896a5fd2a3cb85db6b # v1
         with:
-          sparse-checkout: services/kiloclaw/Dockerfile
+          sparse-checkout: kiloclaw/Dockerfile
           sparse-checkout-cone-mode: false
 
       - name: Get current pinned version
         id: current
         run: |
-          version=$(grep -oP 'openclaw@\K[0-9]+\.[0-9]+\.[0-9]+' services/kiloclaw/Dockerfile || true)
+          version=$(grep -oP 'openclaw@\K[0-9]+\.[0-9]+\.[0-9]+' kiloclaw/Dockerfile || true)
           if [ -z "$version" ]; then
-            echo "::error::Failed to extract openclaw version from services/kiloclaw/Dockerfile"
+            echo "::error::Failed to extract openclaw version from kiloclaw/Dockerfile"
             exit 1
           fi
           echo "version=$version" >> "$GITHUB_OUTPUT"

.github/workflows/chromatic.yml

@@ -108,7 +108,7 @@ jobs:
 
       - name: Install Storybook dependencies
         run: |
-          cd apps/storybook
+          cd storybook
           pnpm install --frozen-lockfile
 
       - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
@@ -118,12 +118,12 @@ jobs:
 
       - name: Generate Stories from Playwright Screenshots
         run: |
-          cd apps/storybook
+          cd storybook
           pnpm generate-screenshot-stories
 
       - name: Build Storybook
         run: |
-          cd apps/storybook
+          cd storybook
           pnpm build-storybook
 
       - name: Run Chromatic
@@ -132,8 +132,8 @@ jobs:
         continue-on-error: true
         with:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
-          storybookBaseDir: apps/storybook/
-          storybookBuildDir: apps/storybook/storybook-static
+          storybookBaseDir: storybook/
+          storybookBuildDir: storybook/storybook-static
           onlyChanged: true
           exitOnceUploaded: ${{ github.event_name == 'pull_request' }}
           exitZeroOnChanges: true

.github/workflows/ci.yml

@@ -32,9 +32,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v4.4.0
-
       - name: Setup Node
         uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
         with:
@@ -46,29 +43,28 @@ jobs:
         with:
           filters: |
             kilocode_backend:
-              - 'apps/web/src/**'
-              - 'apps/web/package.json'
-              - 'apps/web/tsconfig.json'
-              - 'apps/web/tsconfig.*.json'
-              - 'apps/web/next.config.mjs'
-              - 'apps/web/jest.config.ts'
-              - 'apps/web/postcss.config.mjs'
-              - 'apps/web/sentry.*'
+              - 'src/**'
               - 'packages/db/**'
               - 'packages/encryption/**'
               - 'packages/trpc/**'
               - 'packages/worker-utils/**'
               - 'package.json'
               - 'pnpm-lock.yaml'
+              - 'tsconfig.json'
+              - 'tsconfig.*.json'
+              - 'next.config.mjs'
+              - 'jest.config.ts'
+              - 'postcss.config.mjs'
+              - 'sentry.*'
             cloud_agent:
-              - 'services/cloud-agent/**'
+              - 'cloud-agent/**'
             cloud_agent_next:
-              - 'services/cloud-agent-next/**'
+              - 'cloud-agent-next/**'
 
       - name: Detect changed workspaces with tests
         id: workspaces
         run: |
-          matrix=$(scripts/changed-workspaces.sh --exclude services/cloud-agent --exclude services/cloud-agent-next --exclude apps/web)
+          matrix=$(scripts/changed-workspaces.sh --exclude cloud-agent --exclude cloud-agent-next)
           echo "matrix=$matrix" >> "$GITHUB_OUTPUT"
 
   typecheck:
@@ -252,13 +248,12 @@ jobs:
         with:
           path: |
             ~/.npm
-            ${{ github.workspace }}/apps/web/.next/cache
+            ${{ github.workspace }}/.next/cache
           key: ${{ runner.os }}-nextjs-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
           restore-keys: |
             ${{ runner.os }}-nextjs-${{ hashFiles('**/pnpm-lock.yaml') }}-
 
       - name: Setup Vercel ENV
-        working-directory: apps/web
         run: |
           pnpm install --global vercel@latest
           vercel link --project=kilocode-app --token=${{ secrets.VERCEL_TOKEN }} --yes
@@ -299,7 +294,7 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Build wrapper bundle
-        working-directory: services/cloud-agent/wrapper
+        working-directory: cloud-agent/wrapper
         run: bun run build.ts
 
       - name: Run cloud-agent tests
@@ -334,7 +329,7 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Build wrapper bundle
-        working-directory: services/cloud-agent-next/wrapper
+        working-directory: cloud-agent-next/wrapper
         run: bun run build.ts
 
       - name: Run cloud-agent-next tests

.github/workflows/deploy-kiloclaw.yml

@@ -29,7 +29,7 @@ jobs:
           cache: 'pnpm'
 
       - name: Install dependencies
-        working-directory: services/kiloclaw
+        working-directory: kiloclaw
         run: pnpm install --frozen-lockfile
 
       # ── Compute source content hash ─────────────────────────────
@@ -51,7 +51,7 @@ jobs:
       #   - wrangler.jsonc     (worker config)
       - name: Compute source content hash
         id: image-hash
-        working-directory: services/kiloclaw
+        working-directory: kiloclaw
         run: |
           # Validate all expected paths exist before hashing
           for path in Dockerfile controller container skills \
@@ -126,8 +126,8 @@ jobs:
         if: steps.check-image.outputs.exists != 'true'
         uses: useblacksmith/build-push-action@cbd1f60d194a98cb3be5523b15134501eaf0fbf3 # v2.1.0
         with:
-          context: services/kiloclaw
-          file: services/kiloclaw/Dockerfile
+          context: kiloclaw
+          file: kiloclaw/Dockerfile
           platforms: linux/amd64
           push: true
           tags: |
@@ -157,7 +157,7 @@ jobs:
       - name: Extract OpenClaw version
         id: openclaw-version
         run: |
-          VERSION=$(sed -n 's/.*openclaw@\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/p' services/kiloclaw/Dockerfile | head -1)
+          VERSION=$(sed -n 's/.*openclaw@\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/p' kiloclaw/Dockerfile | head -1)
           if [ -z "$VERSION" ]; then
             echo "::error::Failed to extract OpenClaw version from Dockerfile"
             exit 1
@@ -171,7 +171,7 @@ jobs:
         uses: cloudflare/wrangler-action@da0e0dfe58b7a431659754fdf3f186c529afbe65 # v3.14.1
         with:
           apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          workingDirectory: services/kiloclaw
+          workingDirectory: kiloclaw
           command: >-
             deploy
             --var FLY_IMAGE_TAG:${{ steps.image-hash.outputs.tag }}

.github/workflows/deploy-production.yml

@@ -38,12 +38,7 @@ jobs:
       # Setup Vercel ENV
       - run: pnpm install --global vercel@latest
       - run: vercel link --project=kilocode-app --token=${{ secrets.VERCEL_TOKEN }} --yes
-        working-directory: apps/web
       - run: vercel env pull .env.local --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
-        working-directory: apps/web
-
-      # packages/db/drizzle.config.ts reads ../../.env.local (repo root) — copy it there
-      - run: cp apps/web/.env.local .env.local
 
       - name: Run Drizzle migrations
         run: NODE_ENV=production pnpm run drizzle migrate
@@ -81,7 +76,7 @@ jobs:
         with:
           path: |
             ~/.npm
-            ${{ github.workspace }}/apps/web/.next/cache
+            ${{ github.workspace }}/.next/cache
           key: ${{ runner.os }}-nextjs-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
           restore-keys: |
             ${{ runner.os }}-nextjs-${{ hashFiles('**/pnpm-lock.yaml') }}-
@@ -90,21 +85,17 @@ jobs:
         run: pnpm install --global vercel@latest
 
       - run: vercel link --project=kilocode-app --token=${{ secrets.VERCEL_TOKEN }} --yes
-        working-directory: apps/web
 
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
-        working-directory: apps/web
 
       - name: Build Project Artifacts
         env:
           NODE_OPTIONS: '--max-old-space-size=8192'
         run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
-        working-directory: apps/web
 
       - name: Deploy Project Artifacts to Vercel
         run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}
-        working-directory: apps/web
 
   deploy-global-app:
     runs-on: ${{ vars.RUNNER_LARGE_LABEL || 'ubuntu-24.04-8core' }}
@@ -139,7 +130,7 @@ jobs:
         with:
           path: |
             ~/.npm
-            ${{ github.workspace }}/apps/web/.next/cache
+            ${{ github.workspace }}/.next/cache
           key: ${{ runner.os }}-nextjs-${{ hashFiles('**/pnpm-lock.yaml') }}-${{ hashFiles('**/*.js', '**/*.jsx', '**/*.ts', '**/*.tsx') }}
           restore-keys: |
             ${{ runner.os }}-nextjs-${{ hashFiles('**/pnpm-lock.yaml') }}-
@@ -148,21 +139,17 @@ jobs:
         run: pnpm install --global vercel@latest
 
       - run: vercel link --project=kilocode-global-app --token=${{ secrets.VERCEL_TOKEN }} --yes
-        working-directory: apps/web
 
       - name: Pull Vercel Environment Information
         run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
-        working-directory: apps/web
 
       - name: Build Project Artifacts
         env:
           NODE_OPTIONS: '--max-old-space-size=8192'
         run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
-        working-directory: apps/web
 
       - name: Deploy Project Artifacts to Vercel
         run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}
-        working-directory: apps/web
 
   check-kiloclaw-changes:
     runs-on: ${{ vars.RUNNER_DEFAULT_LABEL || 'ubuntu-latest' }}
@@ -181,7 +168,7 @@ jobs:
         with:
           filters: |
             kiloclaw:
-              - 'services/kiloclaw/**'
+              - 'kiloclaw/**'
 
   deploy-kiloclaw:
     needs: [check-kiloclaw-changes]

.github/workflows/deploy-workers.yml

@@ -6,29 +6,29 @@ on:
   workflow_dispatch:
     inputs:
       worker:
-        description: 'Worker folder to deploy (e.g. services/app-builder)'
+        description: 'Worker folder to deploy (e.g. cloudflare-app-builder)'
         required: true
         type: choice
         options:
-          - services/cloud-agent
-          - services/cloud-agent-next
-          - services/ai-attribution
-          - services/app-builder
-          - services/auto-fix-infra
-          - services/auto-triage-infra
-          - services/code-review-infra
-          - services/db-proxy
-          - services/deploy-infra/builder
-          - services/deploy-infra/dispatcher
-          - services/gastown
-          - services/git-token-service
-          - services/gmail-push
-          - services/images-mcp
-          - services/o11y
-          - services/security-auto-analysis
-          - services/security-sync
-          - services/session-ingest
-          - services/webhook-agent-ingest
+          - cloud-agent
+          - cloud-agent-next
+          - cloudflare-ai-attribution
+          - cloudflare-app-builder
+          - cloudflare-auto-fix-infra
+          - cloudflare-auto-triage-infra
+          - cloudflare-code-review-infra
+          - cloudflare-db-proxy
+          - cloudflare-deploy-infra/builder
+          - cloudflare-deploy-infra/dispatcher
+          - cloudflare-gastown
+          - cloudflare-git-token-service
+          - cloudflare-gmail-push
+          - cloudflare-images-mcp
+          - cloudflare-o11y
+          - cloudflare-security-auto-analysis
+          - cloudflare-security-sync
+          - cloudflare-session-ingest
+          - cloudflare-webhook-agent-ingest
 
 permissions:
   contents: read
@@ -93,25 +93,25 @@ jobs:
           # that were only touched in earlier commits of the same push.
           BASE_SHA="${{ github.event.before }}"
           WORKERS=(
-            services/cloud-agent
-            services/cloud-agent-next
-            services/ai-attribution
-            services/app-builder
-            services/auto-fix-infra
-            services/auto-triage-infra
-            services/code-review-infra
-            services/db-proxy
-            services/deploy-infra/builder
-            services/deploy-infra/dispatcher
-            services/gastown
-            services/git-token-service
-            services/gmail-push
-            services/images-mcp
-            services/o11y
-            services/security-auto-analysis
-            services/security-sync
-            services/session-ingest
-            services/webhook-agent-ingest
+            cloud-agent
+            cloud-agent-next
+            cloudflare-ai-attribution
+            cloudflare-app-builder
+            cloudflare-auto-fix-infra
+            cloudflare-auto-triage-infra
+            cloudflare-code-review-infra
+            cloudflare-db-proxy
+            cloudflare-deploy-infra/builder
+            cloudflare-deploy-infra/dispatcher
+            cloudflare-gastown
+            cloudflare-git-token-service
+            cloudflare-gmail-push
+            cloudflare-images-mcp
+            cloudflare-o11y
+            cloudflare-security-auto-analysis
+            cloudflare-security-sync
+            cloudflare-session-ingest
+            cloudflare-webhook-agent-ingest
           )
 
           CHANGED=()

.github/workflows/kilo-app-ci.yml

@@ -4,17 +4,17 @@ on:
   push:
     branches: [main]
     paths:
-      - 'apps/mobile/**'
+      - 'kilo-app/**'
       - 'packages/trpc/**'
-      - 'apps/web/src/routers/**'
+      - 'src/routers/**'
       - 'pnpm-lock.yaml'
       - '.github/workflows/kilo-app-ci.yml'
   pull_request:
     branches: [main]
     paths:
-      - 'apps/mobile/**'
+      - 'kilo-app/**'
       - 'packages/trpc/**'
-      - 'apps/web/src/routers/**'
+      - 'src/routers/**'
       - 'pnpm-lock.yaml'
       - '.github/workflows/kilo-app-ci.yml'
 
@@ -102,7 +102,7 @@ jobs:
       - name: Format check
         run: |
           pnpm --filter kilo-app run format:check || {
-            echo "::error::oxfmt formatting check failed. Run 'cd apps/mobile && pnpm format' locally and commit the changes."
+            echo "::error::oxfmt formatting check failed. Run 'cd kilo-app && pnpm format' locally and commit the changes."
             exit 1
           }