happy-stacks 0.4.0 → 0.5.0

package/scripts/install.mjs

@@ -2,7 +2,7 @@ import './utils/env/env.mjs';
 import { parseArgs } from './utils/cli/args.mjs';
 import { pathExists } from './utils/fs/fs.mjs';
 import { run, runCapture } from './utils/proc/proc.mjs';
-import { getComponentDir, getRootDir } from './utils/paths/paths.mjs';
+import { getComponentDir, getComponentRepoDir, getRootDir, isHappyMonorepoRoot } from './utils/paths/paths.mjs';
 import { getServerComponentName } from './utils/server/server.mjs';
 import { ensureCliBuilt, ensureDepsInstalled, ensureHappyCliLocalNpmLinked } from './utils/proc/pm.mjs';
 import { dirname, join } from 'node:path';
@@ -12,6 +12,7 @@ import { printResult, wantsHelp, wantsJson } from './utils/cli/cli.mjs';
 import { ensureEnvLocalUpdated } from './utils/env/env_local.mjs';
 import { isTty, prompt, promptSelect, withRl } from './utils/cli/wizard.mjs';
 import { isSandboxed, sandboxAllowsGlobalSideEffects } from './utils/env/sandbox.mjs';
+import { bold, cyan, dim } from './utils/ui/ansi.mjs';
 
 /**
  * Install/setup the local stack:
@@ -35,8 +36,12 @@ const DEFAULT_FORK_REPOS = {
 const DEFAULT_UPSTREAM_REPOS = {
   // Upstream for server-light lives in the main happy-server repo.
   serverLight: 'https://github.com/slopus/happy-server.git',
-  serverFull: 'https://github.com/slopus/happy-server.git',
-  cli: 'https://github.com/slopus/happy-cli.git',
+  serverFull: 'https://github.com/slopus/happy.git',
+  // slopus/happy is now a monorepo that contains:
+  // - expo-app/ (UI)
+  // - cli/      (happy-cli)
+  // - server/   (happy-server)
+  cli: 'https://github.com/slopus/happy.git',
   ui: 'https://github.com/slopus/happy.git',
 };
 
@@ -54,8 +59,8 @@ function repoUrlsFromOwners({ forkOwner, upstreamOwner }) {
     upstream: {
       // server-light upstream lives in happy-server
       serverLight: up('happy-server'),
-      serverFull: up('happy-server'),
-      cli: up('happy-cli'),
+      serverFull: up('happy'),
+      cli: up('happy'),
       ui: up('happy'),
     },
   };
@@ -80,12 +85,14 @@ function resolveRepoSource({ flags }) {
 
 function getRepoUrls({ repoSource }) {
   const defaults = repoSource === 'upstream' ? DEFAULT_UPSTREAM_REPOS : DEFAULT_FORK_REPOS;
+  const ui = process.env.HAPPY_LOCAL_UI_REPO_URL?.trim() || defaults.ui;
   return {
     // Backwards compatible: HAPPY_LOCAL_SERVER_REPO_URL historically referred to the server-light component.
     serverLight: process.env.HAPPY_LOCAL_SERVER_LIGHT_REPO_URL?.trim() || process.env.HAPPY_LOCAL_SERVER_REPO_URL?.trim() || defaults.serverLight,
-    serverFull: process.env.HAPPY_LOCAL_SERVER_FULL_REPO_URL?.trim() || defaults.serverFull,
-    cli: process.env.HAPPY_LOCAL_CLI_REPO_URL?.trim() || defaults.cli,
-    ui: process.env.HAPPY_LOCAL_UI_REPO_URL?.trim() || defaults.ui,
+    // Default to the UI repo when using a monorepo (override to keep split repos).
+    serverFull: process.env.HAPPY_LOCAL_SERVER_FULL_REPO_URL?.trim() || defaults.serverFull || ui,
+    cli: process.env.HAPPY_LOCAL_CLI_REPO_URL?.trim() || defaults.cli || ui,
+    ui,
   };
 }
 
@@ -168,31 +175,33 @@ async function ensureUpstreamRemote({ repoDir, upstreamUrl }) {
 async function interactiveWizard({ rootDir, defaults }) {
   return await withRl(async (rl) => {
     const repoSource = await promptSelect(rl, {
-      title: 'Select repo source:',
+      title: `${bold('Repo source')}\n${dim('Where should Happy Stacks clone the component repos from?')}`,
       options: [
-        { label: `forks (default, recommended)`, value: 'forks' },
-        { label: `upstream (slopus/*)`, value: 'upstream' },
+        { label: `${cyan('forks')} (default, recommended)`, value: 'forks' },
+        { label: `${cyan('upstream')} (slopus/*)`, value: 'upstream' },
       ],
       defaultIndex: defaults.repoSource === 'upstream' ? 1 : 0,
     });
 
+    // eslint-disable-next-line no-console
+    console.log(dim('Tip: keep the defaults unless you maintain your own forks.'));
     const forkOwner = await prompt(rl, `GitHub fork owner (default: ${defaults.forkOwner}): `, { defaultValue: defaults.forkOwner });
     const upstreamOwner = await prompt(rl, `GitHub upstream owner (default: ${defaults.upstreamOwner}): `, {
       defaultValue: defaults.upstreamOwner,
     });
 
     const serverMode = await promptSelect(rl, {
-      title: 'Which server components should be set up?',
+      title: `${bold('Server components')}\n${dim('Choose which server repo(s) to clone and install deps for.')}`,
       options: [
-        { label: 'happy-server-light only (default)', value: 'happy-server-light' },
-        { label: 'happy-server only (full server)', value: 'happy-server' },
-        { label: 'both (server-light + full server)', value: 'both' },
+        { label: `${cyan('happy-server-light')} only (default)`, value: 'happy-server-light' },
+        { label: `${cyan('happy-server')} only (full server)`, value: 'happy-server' },
+        { label: `both (${cyan('server-light')} + ${cyan('full server')})`, value: 'both' },
       ],
       defaultIndex: defaults.serverComponentName === 'both' ? 2 : defaults.serverComponentName === 'happy-server' ? 1 : 0,
     });
 
     const allowClone = await promptSelect(rl, {
-      title: 'Clone missing component repos?',
+      title: `${bold('Cloning')}\n${dim('If repos are missing under components/, should we clone them automatically?')}`,
       options: [
         { label: 'yes (default)', value: true },
         { label: 'no', value: false },
@@ -202,8 +211,8 @@ async function interactiveWizard({ rootDir, defaults }) {
 
     const enableAutostart = await promptSelect(rl, {
       title: isSandboxed()
-        ? 'Enable macOS autostart (LaunchAgent)? (NOTE: sandbox mode; this is global OS state)'
-        : 'Enable macOS autostart (LaunchAgent)?',
+        ? `${bold('Autostart (macOS)')}\n${dim('Sandbox mode: this is global OS state; normally disabled in sandbox.')}`
+        : `${bold('Autostart (macOS)')}\n${dim('Install a LaunchAgent so Happy starts at login?')}`,
       options: [
         { label: 'no (default)', value: false },
         { label: 'yes', value: true },
@@ -212,7 +221,7 @@ async function interactiveWizard({ rootDir, defaults }) {
     });
 
     const buildTauri = await promptSelect(rl, {
-      title: 'Build Tauri desktop app as part of setup?',
+      title: `${bold('Desktop app (optional)')}\n${dim('Build the Tauri desktop app as part of setup? (slow; requires extra toolchain)')}`,
       options: [
         { label: 'no (default)', value: false },
         { label: 'yes', value: true },
@@ -221,7 +230,7 @@ async function interactiveWizard({ rootDir, defaults }) {
     });
 
     const configureGit = await promptSelect(rl, {
-      title: 'Configure upstream Git remotes and create mirror branches (slopus/main)?',
+      title: `${bold('Git remotes')}\n${dim('Configure upstream remotes and create/update mirror branches (e.g. slopus/main)?')}`,
       options: [
         { label: 'yes (default)', value: true },
         { label: 'no', value: false },
@@ -344,49 +353,71 @@ async function main() {
         `- use --server=happy-server with --upstream`
     );
   }
-  const serverLightDir = getComponentDir(rootDir, 'happy-server-light');
-  const serverFullDir = getComponentDir(rootDir, 'happy-server');
-  const cliDir = getComponentDir(rootDir, 'happy-cli');
+  // Repo roots (clone locations)
+  const uiRepoDir = getComponentRepoDir(rootDir, 'happy');
+  const serverLightRepoDir = getComponentRepoDir(rootDir, 'happy-server-light');
+
+  // Ensure UI exists first (monorepo anchor in slopus/happy).
+  await ensureComponentPresent({
+    dir: uiRepoDir,
+    label: 'UI',
+    repoUrl: repos.ui,
+    allowClone,
+  });
+
+  // Package dirs (where we run installs/builds). Recompute after cloning UI.
   const uiDir = getComponentDir(rootDir, 'happy');
+  const cliDir = getComponentDir(rootDir, 'happy-cli');
+  const serverFullDir = getComponentDir(rootDir, 'happy-server');
+
+  const cliRepoDir = getComponentRepoDir(rootDir, 'happy-cli');
+  const serverFullRepoDir = getComponentRepoDir(rootDir, 'happy-server');
+  const hasMonorepo = isHappyMonorepoRoot(uiRepoDir);
 
-  // Ensure components exist (embedded layout)
+  // Ensure other components exist.
+  // - server-light stays separate for now.
+  // - full server + cli may be embedded in the monorepo.
   if (serverComponentName === 'both' || serverComponentName === 'happy-server-light') {
-  await ensureComponentPresent({
-      dir: serverLightDir,
-    label: 'SERVER',
+    await ensureComponentPresent({
+      dir: serverLightRepoDir,
+      label: 'SERVER',
       repoUrl: repos.serverLight,
       allowClone,
     });
   }
-  if (serverComponentName === 'both' || serverComponentName === 'happy-server') {
+  if (!hasMonorepo) {
+    if (serverComponentName === 'both' || serverComponentName === 'happy-server') {
+      await ensureComponentPresent({
+        dir: serverFullRepoDir,
+        label: 'SERVER_FULL',
+        repoUrl: repos.serverFull,
+        allowClone,
+      });
+    }
     await ensureComponentPresent({
-      dir: serverFullDir,
-      label: 'SERVER_FULL',
-      repoUrl: repos.serverFull,
-    allowClone,
-  });
+      dir: cliRepoDir,
+      label: 'CLI',
+      repoUrl: repos.cli,
+      allowClone,
+    });
+  } else {
+    if ((serverComponentName === 'both' || serverComponentName === 'happy-server') && !(await pathExists(serverFullDir))) {
+      throw new Error(`[bootstrap] expected monorepo server package at ${serverFullDir} (missing).`);
+    }
+    if (!(await pathExists(cliDir))) {
+      throw new Error(`[bootstrap] expected monorepo cli package at ${cliDir} (missing).`);
+    }
   }
-  await ensureComponentPresent({
-    dir: cliDir,
-    label: 'CLI',
-    repoUrl: repos.cli,
-    allowClone,
-  });
-  await ensureComponentPresent({
-    dir: uiDir,
-    label: 'UI',
-    repoUrl: repos.ui,
-    allowClone,
-  });
 
   // Ensure expected branches are checked out for server flavors (avoids "server-light directory contains full server" mistakes).
   if (serverComponentName === 'both' || serverComponentName === 'happy-server-light') {
-    await ensureGitBranchCheckedOut({ repoDir: serverLightDir, branch: 'happy-server-light', label: 'SERVER' });
+    await ensureGitBranchCheckedOut({ repoDir: serverLightRepoDir, branch: 'happy-server-light', label: 'SERVER' });
   }
   if (serverComponentName === 'both' || serverComponentName === 'happy-server') {
-    // In fork mode, full server is a branch in the fork server repo. In upstream mode, use upstream main.
-    const serverFullBranch = repoSource === 'upstream' ? 'main' : 'happy-server';
-    await ensureGitBranchCheckedOut({ repoDir: serverFullDir, branch: serverFullBranch, label: 'SERVER_FULL' });
+    // In fork mode (split repos), full server is a branch in the fork server repo.
+    // In upstream mode and in monorepo mode, use main.
+    const serverFullBranch = isHappyMonorepoRoot(serverFullRepoDir) ? 'main' : repoSource === 'upstream' ? 'main' : 'happy-server';
+    await ensureGitBranchCheckedOut({ repoDir: serverFullRepoDir, branch: serverFullBranch, label: 'SERVER_FULL' });
   }
 
   const cliDirFinal = cliDir;
@@ -396,7 +427,7 @@ async function main() {
   const skipUiDeps = flags.has('--no-ui-deps') || (process.env.HAPPY_STACKS_INSTALL_NO_UI_DEPS ?? '').trim() === '1';
   const skipCliDeps = flags.has('--no-cli-deps') || (process.env.HAPPY_STACKS_INSTALL_NO_CLI_DEPS ?? '').trim() === '1';
   if (serverComponentName === 'both' || serverComponentName === 'happy-server-light') {
-    await ensureDepsInstalled(serverLightDir, 'happy-server-light');
+    await ensureDepsInstalled(getComponentDir(rootDir, 'happy-server-light'), 'happy-server-light');
   }
   if (serverComponentName === 'both' || serverComponentName === 'happy-server') {
     await ensureDepsInstalled(serverFullDir, 'happy-server');
@@ -442,14 +473,16 @@ async function main() {
   if (wizard?.configureGit) {
     // Ensure upstream remotes exist so `happys wt sync-all` works consistently.
     const upstreamRepos = getRepoUrls({ repoSource: 'upstream' });
-    await ensureUpstreamRemote({ repoDir: uiDir, upstreamUrl: upstreamRepos.ui });
-    await ensureUpstreamRemote({ repoDir: cliDir, upstreamUrl: upstreamRepos.cli });
+    await ensureUpstreamRemote({ repoDir: uiRepoDir, upstreamUrl: upstreamRepos.ui });
+    if (cliRepoDir !== uiRepoDir) {
+      await ensureUpstreamRemote({ repoDir: cliRepoDir, upstreamUrl: upstreamRepos.cli });
+    }
     // server-light and server-full both track upstream happy-server
-    if (await pathExists(serverLightDir)) {
-      await ensureUpstreamRemote({ repoDir: serverLightDir, upstreamUrl: upstreamRepos.serverLight });
+    if (await pathExists(serverLightRepoDir)) {
+      await ensureUpstreamRemote({ repoDir: serverLightRepoDir, upstreamUrl: upstreamRepos.serverLight });
     }
-    if (await pathExists(serverFullDir)) {
-      await ensureUpstreamRemote({ repoDir: serverFullDir, upstreamUrl: upstreamRepos.serverFull });
+    if (serverFullRepoDir !== uiRepoDir && (await pathExists(serverFullRepoDir))) {
+      await ensureUpstreamRemote({ repoDir: serverFullRepoDir, upstreamUrl: upstreamRepos.serverFull });
     }
 
     // Create/update mirror branches like slopus/main for each repo (best-effort).
@@ -466,7 +499,16 @@ async function main() {
       ok: true,
       repoSource,
       serverComponentName,
-      dirs: { serverLightDir, serverFullDir, cliDir: cliDirFinal, uiDir: uiDirFinal },
+      dirs: {
+        uiRepoDir,
+        uiDir: uiDirFinal,
+        cliRepoDir,
+        cliDir: cliDirFinal,
+        serverLightRepoDir,
+        serverLightDir: getComponentDir(rootDir, 'happy-server-light'),
+        serverFullRepoDir,
+        serverFullDir,
+      },
       cloned: allowClone,
       autostart: enableAutostart ? 'enabled' : sandboxed && enableAutostartRaw && !allowGlobal ? 'skipped (sandbox)' : disableAutostart ? 'disabled' : 'unchanged',
       interactive: Boolean(wizard),

package/scripts/migrate.mjs

@@ -1,7 +1,6 @@
 import './utils/env/env.mjs';
 import { copyFile, mkdir, readFile } from 'node:fs/promises';
 import { basename, join } from 'node:path';
-import { createRequire } from 'node:module';
 
 import { parseArgs } from './utils/cli/args.mjs';
 import { printResult, wantsHelp, wantsJson } from './utils/cli/cli.mjs';
@@ -13,6 +12,7 @@ import { ensureHappyServerManagedInfra, applyHappyServerMigrations } from './uti
 import { runCapture } from './utils/proc/proc.mjs';
 import { pickNextFreeTcpPort } from './utils/net/ports.mjs';
 import { getEnvValue } from './utils/env/values.mjs';
+import { importPrismaClientForHappyServerLight, importPrismaClientFromNodeModules } from './utils/server/prisma_import.mjs';
 
 function usage() {
   return [
@@ -54,14 +54,6 @@ async function ensureTargetSecretMatchesSource({ sourceSecretPath, targetSecretP
   }
 }
 
-async function importPrismaClientFrom(dir) {
-  const req = createRequire(import.meta.url);
-  const resolved = req.resolve('@prisma/client', { paths: [dir] });
-  // eslint-disable-next-line import/no-dynamic-require
-  const mod = req(resolved);
-  return mod.PrismaClient;
-}
-
 async function migrateLightToServer({ rootDir, fromStack, toStack, includeFiles, force, json }) {
   const from = resolveStackEnvPath(fromStack);
   const to = resolveStackEnvPath(toStack);
@@ -139,8 +131,8 @@ async function migrateLightToServer({ rootDir, fromStack, toStack, includeFiles,
   await copyFile(fromParsed.path, snapshotPath);
   const snapshotDbUrl = `file:${snapshotPath}`;
 
-  const SourcePrismaClient = await importPrismaClientFrom(lightDir);
-  const TargetPrismaClient = await importPrismaClientFrom(fullDir);
+  const SourcePrismaClient = await importPrismaClientForHappyServerLight({ serverDir: lightDir });
+  const TargetPrismaClient = await importPrismaClientFromNodeModules({ dir: fullDir });
 
   const sourceDb = new SourcePrismaClient({ datasources: { db: { url: snapshotDbUrl } } });
   const targetDb = new TargetPrismaClient({ datasources: { db: { url: infra.env.DATABASE_URL } } });
@@ -289,4 +281,3 @@ main().catch((err) => {
   console.error(err);
   process.exit(1);
 });
-