Adopt monorepo structure

.buildkite/commands/build-for-windows.ps1

@@ -54,7 +54,7 @@ if ($BuildType -eq $BUILD_TYPE_DEV) {
 $env:FILE_ARCHITECTURE=$Architecture
 
 Write-Host "Building for architecture: $Architecture"
-npm run "make:windows-$Architecture"
+npm -w studio-app run "make:windows-$Architecture"
 If ($LastExitCode -ne 0) { Exit $LastExitCode }
 
 # Rename NuGet package files with generic name

.buildkite/commands/install-node-dependencies.sh

@@ -7,10 +7,11 @@ ARCHITECTURE=$(uname -m)
 NODE_VERSION=$(node --version)
 PACKAGE_HASH=$(hash_file package-lock.json)
 
-if [ -d patches ]; then
-  PATCHES_HASH=$(hash_directory patches/)
-else
-  PATCHES_HASH=nopatch
+PATCHES_HASH=nopatch
+if [ -d apps/cli/patches ] || [ -d apps/studio/patches ]; then
+  CLI_PATCHES_HASH=$( [ -d apps/cli/patches ] && hash_directory apps/cli/patches || echo none )
+  STUDIO_PATCHES_HASH=$( [ -d apps/studio/patches ] && hash_directory apps/studio/patches || echo none )
+  PATCHES_HASH="${CLI_PATCHES_HASH}-${STUDIO_PATCHES_HASH}"
 fi
 
 CACHEKEY="$BUILDKITE_PIPELINE_SLUG-npm-$PLATFORM-$ARCHITECTURE-node-$NODE_VERSION-$PACKAGE_HASH-$PATCHES_HASH"
@@ -44,14 +45,6 @@ npm ci \
   --maxsockets "$MAX_SOCKETS" \
   "$@"
 
-cd cli
-npm ci \
-  --prefer-offline \
-  --no-audit \
-  --no-progress \
-  --maxsockets "$MAX_SOCKETS"
-cd -
-
 echo "--- :npm: Save cache if necessary"
 # Notice that we don't cache the local node_modules.
 # Those get regenerated by npm ci as per Node reccomendations.

.buildkite/commands/run-e2e-tests.sh

@@ -31,8 +31,7 @@ esac
 # `make` creates signed distributables (installers), which requires code signing setup.
 # `package` creates an unsigned app bundle, sufficient for E2E testing.
 echo "--- :package: Package app for testing ($PLATFORM-$ARCH)"
-npx electron-vite build --outDir=dist
-npx electron-forge package --arch="$ARCH" --platform="$FORGE_PLATFORM"
+npm -w studio-app run package -- --arch="$ARCH" --platform="$FORGE_PLATFORM"
 
 echo '--- :playwright: Run End To End Tests'
 

.buildkite/commands/run-metrics-tests.sh

@@ -9,38 +9,32 @@ echo '--- :package: Install main dependencies'
 bash .buildkite/commands/install-node-dependencies.sh
 
 echo '--- :package: Install compare-perf dependencies'
-cd scripts/compare-perf
-npm ci
-cd -
+npm -w compare-perf install
 
 export IS_DEV_BUILD=true
-export ARTIFACTS_PATH=${PWD}/artifacts
+export ARTIFACTS_PATH=${PWD}/tools/metrics/artifacts
 export SKIP_WORKER_THREAD_BUILD='true'
 
 # Detect if this is a PR or trunk push
 if [ "${BUILDKITE_PULL_REQUEST}" != "false" ]; then
   # PR context - compare against trunk
   echo "--- :chart_with_upwards_trend: Running performance comparison against trunk"
-  cd scripts/compare-perf
-  npm run compare -- perf $BUILDKITE_COMMIT trunk --tests-branch $BUILDKITE_COMMIT --rounds 3
+  npm -w compare-perf run compare -- perf $BUILDKITE_COMMIT trunk --tests-branch $BUILDKITE_COMMIT --rounds 3
 
   echo "--- :github: Posting results to PR"
   # Parse repo from git@github.com:owner/repo.git or https://github.com/owner/repo.git format
   REPO_PATH=$(echo $BUILDKITE_REPO | sed 's|^git@github\.com:||' | sed 's|^https://github\.com/||' | sed 's|\.git$||')
-  npm run post-to-github -- $GITHUB_TOKEN $REPO_PATH $BUILDKITE_PULL_REQUEST trunk $BUILDKITE_COMMIT
-  cd -
+  npm -w compare-perf run post-to-github -- $GITHUB_TOKEN $REPO_PATH $BUILDKITE_PULL_REQUEST trunk $BUILDKITE_COMMIT
 elif [ "${BUILDKITE_BRANCH}" == "trunk" ]; then
   # Trunk push context - compare against baseline
   BASELINE_COMMIT="58c52bfee7e585614ced202f43f217a01f94f029"
 
   echo "--- :chart_with_upwards_trend: Running performance comparison against baseline"
-  cd scripts/compare-perf
-  npm run compare -- perf $BUILDKITE_COMMIT $BASELINE_COMMIT --tests-branch $BUILDKITE_COMMIT --rounds 3
+  npm -w compare-perf run compare -- perf $BUILDKITE_COMMIT $BASELINE_COMMIT --tests-branch $BUILDKITE_COMMIT --rounds 3
 
   echo "--- :bar_chart: Logging metrics to CodeVitals"
   COMMITTED_AT=$(git show -s $BUILDKITE_COMMIT --format="%cI")
-  npm run log-to-codevitals -- $CODEVITALS_AUTH_TOKEN trunk $BUILDKITE_COMMIT $BASELINE_COMMIT $COMMITTED_AT
-  cd -
+  npm -w compare-perf run log-to-codevitals -- $CODEVITALS_AUTH_TOKEN trunk $BUILDKITE_COMMIT $BASELINE_COMMIT $COMMITTED_AT
 else
   # Other branches - skip metrics
   echo "--- :information_source: Skipping metrics for non-trunk branch"

.buildkite/commands/should-skip-job.sh

@@ -10,7 +10,7 @@ set -eu
 # Job types:
 #   - validation: Skip if changes are limited to documentation, config, localization, and non-code files.
 #                 Used for lint, unit tests, and e2e tests.
-#   - metrics: Same as validation, but also skips on test-only changes (e2e/**, *.test.ts).
+#   - metrics: Same as validation, but also skips on test-only changes (apps/studio/e2e/**, *.test.ts).
 #              Since metrics measure app performance, test file changes don't affect them.
 #   - build: Skip if changes are limited to documentation and config files.
 #            Does NOT skip on localization changes since builds should include translation updates.
@@ -53,7 +53,7 @@ COMMON_NON_CODE_PATTERNS=(
 
   # Installer assets and configuration
   "installers/**"
-  "assets/appx/**"
+  "apps/studio/assets/appx/**"
 
   # Claude AI configuration
   ".claude/**"
@@ -62,17 +62,17 @@ COMMON_NON_CODE_PATTERNS=(
 
 # Localization files - changes here don't affect runtime behavior or performance
 LOCALIZATION_PATTERNS=(
-  "common/translations/**"
+  "tools/common/translations/**"
 )
 
 # Test files - changes here don't affect app performance (for metrics)
 TEST_PATTERNS=(
-  "e2e/**"
-  "src/tests/**"
-  "src/**/*.test.ts"
-  "src/**/*.test.tsx"
-  "cli/**/*.test.ts"
-  "common/**/*.test.ts"
+  "apps/studio/e2e/**"
+  "apps/studio/src/tests/**"
+  "apps/studio/src/**/*.test.ts"
+  "apps/studio/src/**/*.test.tsx"
+  "apps/cli/**/*.test.ts"
+  "tools/common/**/*.test.ts"
   "metrics/**"
 )
 

.buildkite/pipeline.yml

@@ -121,8 +121,8 @@ steps:
           bundle exec fastlane notarize_binary
         plugins: [$CI_TOOLKIT_PLUGIN, $NVM_PLUGIN]
         artifact_paths:
-          - out/**/*.app.zip
-          - out/*.dmg
+          - apps/studio/out/**/*.app.zip
+          - apps/studio/out/*.dmg
         matrix:
           - x64
           - arm64
@@ -220,8 +220,8 @@ steps:
           bundle exec fastlane notarize_binary
         plugins: [$CI_TOOLKIT_PLUGIN, $NVM_PLUGIN]
         artifact_paths:
-          - out/**/*.app.zip
-          - out/*.dmg
+          - apps/studio/out/**/*.app.zip
+          - apps/studio/out/*.dmg
         matrix:
           - x64
           - arm64

.gitignore

@@ -112,9 +112,9 @@ dist
 test-results
 
 # E2E test import files (not versioned)
-e2e/imports/*.tar.gz
-e2e/imports/*.zip
-e2e/imports/*.wpress
+apps/studio/e2e/imports/*.tar.gz
+apps/studio/e2e/imports/*.zip
+apps/studio/e2e/imports/*.wpress
 
 # Metrics traces
 artifacts
@@ -126,8 +126,8 @@ artifacts
 CLAUDE.md
 
 # Bundled Node binary (downloaded during build)
-bin/node
-bin/node.exe
+apps/studio/bin/node
+apps/studio/bin/node.exe
 
 # CLI launcher executable (built during packaging via @yao-pkg/pkg)
 bin/studio-cli.exe

.prettierignore

@@ -1,2 +1 @@
-src/translations
-common/translations
+tools/common/translations

AGENTS.md

@@ -16,50 +16,50 @@ WordPress Studio - Electron desktop app for managing local WordPress sites. Buil
 
 **MUST** build CLI before testing: `npm run cli:build && node dist/cli/main.js <command>`
 - **Auth**: `auth login|logout|status` - WordPress.com OAuth (tokens valid 2 weeks)
-- **Preview Sites**: See `cli/commands/preview/`
-- **Local Sites**: See `cli/commands/site/`
+- **Preview Sites**: See `apps/cli/commands/preview/`
+- **Local Sites**: See `apps/cli/commands/site/`
 
 ## Architecture
 
 **Electron 3-Process**: Main (Node.js) → Preload (IPC bridge) → Renderer (React)
-**Main Process** (`src/`): IPC handlers, site servers, storage, OAuth, sync, migrations
-**Renderer** (`src/components`, `src/hooks`): React UI, Redux stores, TailwindCSS
-**CLI** (`cli/`): WordPress Playground (PHP WASM), yargs commands, child process of desktop app
+**Main Process** (`apps/studio/src/`): IPC handlers, site servers, storage, OAuth, sync, migrations
+**Renderer** (`apps/studio/src/components`, `apps/studio/src/hooks`): React UI, Redux stores, TailwindCSS
+**CLI** (`apps/cli/`): WordPress Playground (PHP WASM), yargs commands, child process of desktop app
 
 ## Directory Structure
 
-**`/src`**: Main (index.ts, ipc-handlers.ts, site-server.ts, storage/, lib/) | Renderer (components/, hooks/, stores/) | modules/ (sync, cli, user-settings, preview-site)
-**`/cli`**: index.ts, commands/ (auth, preview, site), lib/ (appdata, i18n, browser)
-**`/common`**: Shared lib/ (fs-utils, port-finder, oauth), types/, translations/
-**`/packages`**: eslint-plugin-studio
+**`/apps/studio/src`**: Main (index.ts, ipc-handlers.ts, site-server.ts, storage/, lib/) | Renderer (components/, hooks/, stores/) | modules/ (sync, cli, user-settings, preview-site)
+**`/apps/cli`**: index.ts, commands/ (auth, preview, site), lib/ (appdata, i18n, browser)
+**`/tools/common`**: Shared lib/ (fs-utils, port-finder, oauth), types/, translations/
+**`/tools/eslint-plugin-studio`**: eslint-plugin-studio
 
 ## Key Patterns
 
 **IPC**: Renderer → `window.ipcApi.*` → Preload (contextBridge) → Main `ipc-handlers.ts` → Business logic
-**CliServerProcess**: Desktop spawns CLI as child process (`src/modules/cli/lib/cli-server-process.ts`)
+**CliServerProcess**: Desktop spawns CLI as child process (`apps/studio/src/modules/cli/lib/cli-server-process.ts`)
 **Redux Stores**: chat, sync, connectedSites, snapshot, onboarding | RTK Query APIs: wpcomApi, installedAppsApi, wordpressVersionsApi
-**SiteServer** (`src/site-server.ts`): Manages site instances, server start/stop, SSL certs, ports
+**SiteServer** (`apps/studio/src/site-server.ts`): Manages site instances, server start/stop, SSL certs, ports
 
 ## Tech Stack
 
 **Frontend**: React 18, Redux Toolkit + RTK Query, @wordpress/components, TailwindCSS, TypeScript, Vite
-**Main**: Electron 38, express
+**Main**: Electron, express
 **CLI**: @wp-playground/cli, @php-wasm/node, @wp-playground/blueprints
 **Dev**: electron-vite, electron-forge, Vitest, Playwright
 **Other**: Sentry, wpcom, zod, yargs
 
 ## Build & Distribution
 
-**Build**: CLI (`vite build --config vite.cli.config.ts`) → Electron (`electron-vite build`) → Package (`electron-forge make`)
+**Build**: CLI (`vite build --config apps/cli/vite.config.ts`) → Electron (`electron-vite build --config apps/studio/electron.vite.config.ts`) → Package (`electron-forge make --config apps/studio/forge.config.ts`)
 **Platforms**: macOS (x64/ARM64 DMG), Windows (x64/ARM64 MSIX), Linux (DEB)
 **Bundling**: Rollup (main), Vite (renderer with code splitting), ASAR (resources)
 
 ## Conventions
 
 **Files**: React components (PascalCase), utils (camelCase), tests (.test.ts/.tsx)
-**IPC Handlers** (`src/ipc-handlers.ts`): **MUST** `export async function handlerName(event, ...args): Promise<ReturnType>` | Handler names in `src/constants.ts` | All handlers MUST be async and return Promises
+**IPC Handlers** (`apps/studio/src/ipc-handlers.ts`): **MUST** `export async function handlerName(event, ...args): Promise<ReturnType>` | Handler names in `apps/studio/src/constants.ts` | All handlers MUST be async and return Promises
 **Storage**: **CRITICAL** - Always use file locking: `lockAppdata()` / `unlockAppdata()` to prevent data corruption
-**i18n**: `@wordpress/i18n` (`__()` function), `common/translations/`, `<I18nProvider>` (renderer), `loadTranslations()` (CLI)
+**i18n**: `@wordpress/i18n` (`__()` function), `tools/common/translations/`, `<I18nProvider>` (renderer), `loadTranslations()` (CLI)
 
 ## WordPress Studio Paths
 
@@ -109,7 +109,7 @@ For in-depth information, see these docs:
 ## Quick Reference
 
 **WP Playground**: CLI runs WordPress via PHP WASM, Blueprints for config, `filterUnsupportedBlueprintFeatures()` for compatibility
-**Sync**: OAuth via `common/lib/oauth.ts`, Redux `sync` slice, pull/push WordPress.com sites
+**Sync**: OAuth via `tools/common/lib/oauth.ts`, Redux `sync` slice, pull/push WordPress.com sites
 **Security**: Renderer sandboxed, IPC validation, strict CSP, no Node integration, self-signed HTTPS certs
 
 ---

__mocks__/pm2.ts → apps/cli/__mocks__/pm2.ts

@@ -12,8 +12,8 @@ export class custom {
 	launchBus = vi.fn( ( callback: ( error?: Error, bus?: any ) => void ) =>
 		callback( undefined, {} )
 	);
-	sendDataToProcessId = vi.fn( ( processId: number, data: any, callback: ( error?: Error ) => void ) =>
-		callback()
+	sendDataToProcessId = vi.fn(
+		( processId: number, data: any, callback: ( error?: Error ) => void ) => callback()
 	);
 }
 

cli/commands/_events.ts → apps/cli/commands/_events.ts

@@ -7,10 +7,10 @@
  *
  */
 import fs from 'fs';
+import { sequential } from '@studio/common/lib/sequential';
+import { SITE_EVENTS, siteDetailsSchema, SiteEvent } from '@studio/common/lib/site-events';
+import { SiteCommandLoggerAction as LoggerAction } from '@studio/common/logger-actions';
 import { __ } from '@wordpress/i18n';
-import { sequential } from 'common/lib/sequential';
-import { SITE_EVENTS, siteDetailsSchema, SiteEvent } from 'common/lib/site-events';
-import { SiteCommandLoggerAction as LoggerAction } from 'common/logger-actions';
 import axon from 'pm2-axon';
 import { z } from 'zod';
 import { getSiteUrl, readAppdata, SiteData } from 'cli/lib/appdata';

cli/commands/auth/login.ts → apps/cli/commands/auth/login.ts

@@ -1,8 +1,8 @@
 import { input } from '@inquirer/prompts';
+import { DEFAULT_TOKEN_LIFETIME_MS } from '@studio/common/constants';
+import { getAuthenticationUrl } from '@studio/common/lib/oauth';
+import { AuthCommandLoggerAction as LoggerAction } from '@studio/common/logger-actions';
 import { __, sprintf } from '@wordpress/i18n';
-import { DEFAULT_TOKEN_LIFETIME_MS } from 'common/constants';
-import { getAuthenticationUrl } from 'common/lib/oauth';
-import { AuthCommandLoggerAction as LoggerAction } from 'common/logger-actions';
 import { getUserInfo } from 'cli/lib/api';
 import {
 	getAuthToken,

cli/commands/auth/logout.ts → apps/cli/commands/auth/logout.ts

@@ -1,5 +1,5 @@
+import { AuthCommandLoggerAction as LoggerAction } from '@studio/common/logger-actions';
 import { __ } from '@wordpress/i18n';
-import { AuthCommandLoggerAction as LoggerAction } from 'common/logger-actions';
 import { revokeAuthToken } from 'cli/lib/api';
 import {
 	readAppdata,

cli/commands/auth/status.ts → apps/cli/commands/auth/status.ts

@@ -1,5 +1,5 @@
+import { AuthCommandLoggerAction as LoggerAction } from '@studio/common/logger-actions';
 import { __, sprintf } from '@wordpress/i18n';
-import { AuthCommandLoggerAction as LoggerAction } from 'common/logger-actions';
 import { getUserInfo } from 'cli/lib/api';
 import { getAuthToken } from 'cli/lib/appdata';
 import { Logger, LoggerError } from 'cli/logger';

cli/commands/auth/tests/login.test.ts → apps/cli/commands/auth/tests/login.test.ts

@@ -1,5 +1,5 @@
 import { input } from '@inquirer/prompts';
-import { getAuthenticationUrl } from 'common/lib/oauth';
+import { getAuthenticationUrl } from '@studio/common/lib/oauth';
 import { vi } from 'vitest';
 import { getUserInfo } from 'cli/lib/api';
 import {
@@ -23,7 +23,7 @@ import {
 import { runCommand } from '../login';
 
 vi.mock( '@inquirer/prompts' );
-vi.mock( 'common/lib/oauth' );
+vi.mock( '@studio/common/lib/oauth' );
 vi.mock( 'cli/lib/api' );
 vi.mock( 'cli/lib/appdata' );
 vi.mock( 'cli/lib/browser' );

cli/commands/preview/create.ts → apps/cli/commands/preview/create.ts

@@ -1,8 +1,8 @@
 import os from 'os';
 import path from 'path';
+import { getWordPressVersion } from '@studio/common/lib/get-wordpress-version';
+import { PreviewCommandLoggerAction as LoggerAction } from '@studio/common/logger-actions';
 import { __, sprintf } from '@wordpress/i18n';
-import { getWordPressVersion } from 'common/lib/get-wordpress-version';
-import { PreviewCommandLoggerAction as LoggerAction } from 'common/logger-actions';
 import { uploadArchive, waitForSiteReady } from 'cli/lib/api';
 import { getAuthToken, getSiteByFolder } from 'cli/lib/appdata';
 import { archiveSiteContent, cleanup } from 'cli/lib/archive';

cli/commands/preview/delete.ts → apps/cli/commands/preview/delete.ts

@@ -1,5 +1,5 @@
+import { PreviewCommandLoggerAction as LoggerAction } from '@studio/common/logger-actions';
 import { __ } from '@wordpress/i18n';
-import { PreviewCommandLoggerAction as LoggerAction } from 'common/logger-actions';
 import { deleteSnapshot } from 'cli/lib/api';
 import { getAuthToken } from 'cli/lib/appdata';
 import { deleteSnapshotFromAppdata, getSnapshotsFromAppdata } from 'cli/lib/snapshots';

cli/commands/preview/list.ts → apps/cli/commands/preview/list.ts

@@ -1,6 +1,6 @@
+import { PreviewCommandLoggerAction as LoggerAction } from '@studio/common/logger-actions';
 import { __, _n, sprintf } from '@wordpress/i18n';
 import Table from 'cli-table3';
-import { PreviewCommandLoggerAction as LoggerAction } from 'common/logger-actions';
 import { format } from 'date-fns';
 import { getAuthToken, getSiteByFolder } from 'cli/lib/appdata';
 import {

cli/commands/preview/tests/create.test.ts → apps/cli/commands/preview/tests/create.test.ts

@@ -1,6 +1,6 @@
 import os from 'os';
 import path from 'path';
-import { getWordPressVersion } from 'common/lib/get-wordpress-version';
+import { getWordPressVersion } from '@studio/common/lib/get-wordpress-version';
 import { vi } from 'vitest';
 import { uploadArchive, waitForSiteReady } from 'cli/lib/api';
 import { getAuthToken, getSiteByFolder } from 'cli/lib/appdata';
@@ -17,7 +17,7 @@ const mockReportProgress = vi.fn();
 const mockReportWarning = vi.fn();
 const mockReportKeyValuePair = vi.fn();
 
-vi.mock( 'common/lib/get-wordpress-version' );
+vi.mock( '@studio/common/lib/get-wordpress-version' );
 vi.mock( 'cli/lib/appdata', async () => ( {
 	...( await vi.importActual( 'cli/lib/appdata' ) ),
 	getAppdataDirectory: vi.fn().mockReturnValue( '/test/appdata' ),

cli/commands/preview/tests/update.test.ts → apps/cli/commands/preview/tests/update.test.ts

@@ -1,8 +1,8 @@
 import os from 'os';
 import path from 'path';
+import { DEMO_SITE_EXPIRATION_DAYS } from '@studio/common/constants';
+import { getWordPressVersion } from '@studio/common/lib/get-wordpress-version';
 import { Archiver } from 'archiver';
-import { DEMO_SITE_EXPIRATION_DAYS } from 'common/constants';
-import { getWordPressVersion } from 'common/lib/get-wordpress-version';
 import { vi } from 'vitest';
 import { uploadArchive, waitForSiteReady } from 'cli/lib/api';
 import { getAuthToken, getSiteByFolder } from 'cli/lib/appdata';
@@ -12,7 +12,7 @@ import { LoggerError } from 'cli/logger';
 import { mockReportStart, mockReportSuccess, mockReportError } from 'cli/tests/test-utils';
 import { runCommand } from '../update';
 
-vi.mock( 'common/lib/get-wordpress-version' );
+vi.mock( '@studio/common/lib/get-wordpress-version' );
 vi.mock( 'cli/lib/appdata', async () => {
 	const actual = await vi.importActual( 'cli/lib/appdata' );
 	return {