fixup! Merge remote-tracking branch 'devbox-origin/happy' into feat-merge-happy-devbox

Author: GrocerPublishAgent

.github/workflows/ci.yml

@@ -48,9 +48,9 @@ jobs:
           node-version: '24'
           cache: 'yarn'
           cache-dependency-path: |
-            happy-cli/yarn.lock
-            happy-server/yarn.lock
-            happy/yarn.lock
+            cli/yarn.lock
+            server/yarn.lock
+            expo-app/yarn.lock
 
       - name: Install yarn
         run: npm install -g yarn
@@ -70,26 +70,26 @@ jobs:
           npx playwright install chromium
           npx playwright install-deps chromium
 
-      - name: Install happy-cli dependencies
-        working-directory: happy-cli
+      - name: Install cli dependencies
+        working-directory: cli
         run: yarn install --frozen-lockfile
 
-      - name: Install happy-server dependencies
-        working-directory: happy-server
+      - name: Install server dependencies
+        working-directory: server
         run: yarn install --frozen-lockfile
 
       # Note: Slot-specific databases (handy_test_N) are created automatically
       # by happy-launcher.sh when starting services for that slot.
       # We pre-run migrations here to ensure the schema is ready and to catch
       # any migration errors early in the CI pipeline.
-      - name: Setup happy-server database (Prisma migrations)
-        working-directory: happy-server
+      - name: Setup server database (Prisma migrations)
+        working-directory: server
         run: yarn migrate
         env:
           DATABASE_URL: postgresql://postgres:postgres@localhost:5432/handy
 
-      - name: Install happy webapp dependencies
-        working-directory: happy
+      - name: Install expo-app dependencies
+        working-directory: expo-app
         run: yarn install --frozen-lockfile
 
       - name: Install E2E test dependencies

scripts/e2e/helpers/cli.ts

@@ -10,7 +10,7 @@ import * as fs from 'node:fs';
 import { SlotConfig } from './slots.js';
 
 const ROOT_DIR = path.resolve(import.meta.dirname, '..', '..', '..');
-const CLI_PATH = path.join(ROOT_DIR, 'happy-cli', 'bin', 'happy.mjs');
+const CLI_PATH = path.join(ROOT_DIR, 'cli', 'bin', 'happy.mjs');
 
 export interface DaemonHandle {
     process: ChildProcess | null;

scripts/node_modules

@@ -1 +1 @@
-../happy-cli/node_modules
+../cli/node_modules

scripts/rebase-upstream.sh

@@ -398,9 +398,9 @@ async function main() {
         console.log('  4. You\'ll be logged in and can control CLI sessions!\n');
 
         console.log('To use the CLI:');
-        console.log(`  HAPPY_HOME_DIR=${HAPPY_HOME_DIR} HAPPY_SERVER_URL=${SERVER_URL} ./happy-cli/bin/happy.mjs\n`);
+        console.log(`  HAPPY_HOME_DIR=${HAPPY_HOME_DIR} HAPPY_SERVER_URL=${SERVER_URL} ./cli/bin/happy.mjs\n`);
         console.log(`Or run the integration tests with:`);
-        console.log(`  cd happy-cli && yarn test:integration-test-env\n`);
+        console.log(`  cd cli && yarn test:integration-test-env\n`);
     } catch (error) {
         console.error('\n✗ Setup failed:', error.message);
         process.exit(1);

scripts/setup-submodules.sh

@@ -129,9 +129,9 @@ if [ "$E2E_ONLY" = false ]; then
     echo "=== Build Validation ==="
     echo ""
 
-    run_test "happy-cli build" "cd '$ROOT_DIR/happy-cli' && yarn build" || true
-    run_test "happy-server typecheck" "cd '$ROOT_DIR/happy-server' && yarn build" || true
-    run_test "happy webapp typecheck" "cd '$ROOT_DIR/happy' && yarn typecheck" || true
+    run_test "cli build" "cd '$ROOT_DIR/cli' && yarn build" || true
+    run_test "server typecheck" "cd '$ROOT_DIR/server' && yarn build" || true
+    run_test "expo-app typecheck" "cd '$ROOT_DIR/expo-app' && yarn typecheck" || true
 
     # =============================================================================
     # Unit Tests
@@ -140,18 +140,18 @@ if [ "$E2E_ONLY" = false ]; then
     echo "=== Unit Tests ==="
     echo ""
 
-    # happy-server unit tests (if they exist)
-    if [ -f "$ROOT_DIR/happy-server/package.json" ] && grep -q '"test"' "$ROOT_DIR/happy-server/package.json"; then
-        run_test "happy-server unit tests" "cd '$ROOT_DIR/happy-server' && yarn test --run 2>/dev/null || true" || true
+    # server unit tests (if they exist)
+    if [ -f "$ROOT_DIR/server/package.json" ] && grep -q '"test"' "$ROOT_DIR/server/package.json"; then
+        run_test "server unit tests" "cd '$ROOT_DIR/server' && yarn test --run 2>/dev/null || true" || true
     else
-        echo "  Skipping happy-server unit tests (no test script found)"
+        echo "  Skipping server unit tests (no test script found)"
     fi
 
-    # happy-cli unit tests (if they exist)
-    if [ -f "$ROOT_DIR/happy-cli/package.json" ] && grep -q '"test"' "$ROOT_DIR/happy-cli/package.json"; then
-        run_test "happy-cli unit tests" "cd '$ROOT_DIR/happy-cli' && yarn test --run 2>/dev/null || true" || true
+    # cli unit tests (if they exist)
+    if [ -f "$ROOT_DIR/cli/package.json" ] && grep -q '"test"' "$ROOT_DIR/cli/package.json"; then
+        run_test "cli unit tests" "cd '$ROOT_DIR/cli' && yarn test --run 2>/dev/null || true" || true
     else
-        echo "  Skipping happy-cli unit tests (no test script found)"
+        echo "  Skipping cli unit tests (no test script found)"
     fi
 
     echo ""