happy-stacks 0.2.0 → 0.4.0

package/scripts/run.mjs

@@ -1,25 +1,29 @@
-import './utils/env.mjs';
+import './utils/env/env.mjs';
 import { parseArgs } from './utils/cli/args.mjs';
-import { pathExists } from './utils/fs.mjs';
-import { killProcessTree, runCapture, spawnProc } from './utils/proc.mjs';
-import { getComponentDir, getDefaultAutostartPaths, getRootDir } from './utils/paths.mjs';
-import { killPortListeners } from './utils/ports.mjs';
-import { getServerComponentName, isHappyServerRunning, waitForServerReady } from './utils/server.mjs';
-import { ensureCliBuilt, ensureDepsInstalled, pmExecBin, pmSpawnScript, requireDir } from './utils/pm.mjs';
+import { pathExists } from './utils/fs/fs.mjs';
+import { killProcessTree, runCapture, spawnProc } from './utils/proc/proc.mjs';
+import { componentDirEnvKey, getComponentDir, getDefaultAutostartPaths, getRootDir } from './utils/paths/paths.mjs';
+import { killPortListeners } from './utils/net/ports.mjs';
+import { getServerComponentName, isHappyServerRunning, waitForServerReady } from './utils/server/server.mjs';
+import { ensureCliBuilt, ensureDepsInstalled, pmExecBin, pmSpawnScript, requireDir } from './utils/proc/pm.mjs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 import { setTimeout as delay } from 'node:timers/promises';
 import { maybeResetTailscaleServe } from './tailscale.mjs';
 import { isDaemonRunning, startLocalDaemonWithAuth, stopLocalDaemon } from './daemon.mjs';
 import { printResult, wantsHelp, wantsJson } from './utils/cli/cli.mjs';
-import { assertServerComponentDirMatches, assertServerPrismaProviderMatches } from './utils/validate.mjs';
-import { applyHappyServerMigrations, ensureHappyServerManagedInfra } from './utils/happy_server_infra.mjs';
-import { getAccountCountForServerComponent, prepareDaemonAuthSeedIfNeeded } from './utils/stack_startup.mjs';
-import { recordStackRuntimeStart, recordStackRuntimeUpdate } from './utils/stack_runtime_state.mjs';
-import { resolveStackContext } from './utils/stack_context.mjs';
-import { getPublicServerUrlEnvOverride, resolveServerPortFromEnv, resolveServerUrls } from './utils/server_urls.mjs';
-import { resolveLocalhostHost } from './utils/localhost_host.mjs';
-import { openUrlInBrowser } from './utils/browser.mjs';
+import { assertServerComponentDirMatches, assertServerPrismaProviderMatches } from './utils/server/validate.mjs';
+import { applyHappyServerMigrations, ensureHappyServerManagedInfra } from './utils/server/infra/happy_server_infra.mjs';
+import { getAccountCountForServerComponent, prepareDaemonAuthSeedIfNeeded, resolveAutoCopyFromMainEnabled } from './utils/stack/startup.mjs';
+import { recordStackRuntimeStart, recordStackRuntimeUpdate } from './utils/stack/runtime_state.mjs';
+import { resolveStackContext } from './utils/stack/context.mjs';
+import { getPublicServerUrlEnvOverride, resolveServerPortFromEnv, resolveServerUrls } from './utils/server/urls.mjs';
+import { preferStackLocalhostUrl } from './utils/paths/localhost_host.mjs';
+import { openUrlInBrowser } from './utils/ui/browser.mjs';
+import { ensureDevExpoServer } from './utils/dev/expo_dev.mjs';
+import { maybeRunInteractiveStackAuthSetup } from './utils/auth/interactive_stack_auth.mjs';
+import { getInvokedCwd, inferComponentFromCwd } from './utils/cli/cwd_scope.mjs';
+import { daemonStartGate, formatDaemonAuthRequiredError } from './utils/auth/daemon_gate.mjs';
 
 /**
  * Run the local stack in "production-like" mode:
@@ -27,7 +31,7 @@ import { openUrlInBrowser } from './utils/browser.mjs';
  * - happy-cli daemon
  * - serve prebuilt UI via happy-server-light (/)
  *
- * No Expo dev server.
+ * Optional: Expo dev-client Metro for mobile reviewers (`--mobile`).
  */
 
 async function main() {
@@ -37,12 +41,15 @@ async function main() {
   if (wantsHelp(argv, { flags })) {
     printResult({
       json,
-      data: { flags: ['--server=happy-server|happy-server-light', '--no-ui', '--no-daemon', '--restart', '--no-browser'], json: true },
+      data: { flags: ['--server=happy-server|happy-server-light', '--no-ui', '--no-daemon', '--restart', '--no-browser', '--mobile'], json: true },
       text: [
         '[start] usage:',
         '  happys start [--server=happy-server|happy-server-light] [--restart] [--json]',
         '  (legacy in a cloned repo): pnpm start [-- --server=happy-server|happy-server-light] [--json]',
         '  note: --json prints the resolved config (dry-run) and exits.',
+        '',
+        'note:',
+        '  If run from inside a component checkout/worktree, that checkout is used for this run (without requiring `happys wt use`).',
       ].join('\n'),
     });
     return;
@@ -50,6 +57,20 @@ async function main() {
 
   const rootDir = getRootDir(import.meta.url);
 
+  const inferred = inferComponentFromCwd({
+    rootDir,
+    invokedCwd: getInvokedCwd(process.env),
+    components: ['happy', 'happy-cli', 'happy-server-light', 'happy-server'],
+  });
+  if (inferred) {
+    const stacksKey = componentDirEnvKey(inferred.component);
+    const legacyKey = stacksKey.replace(/^HAPPY_STACKS_/, 'HAPPY_LOCAL_');
+    // Stack env should win. Only infer from CWD when the component dir isn't already configured.
+    if (!(process.env[stacksKey] ?? '').toString().trim() && !(process.env[legacyKey] ?? '').toString().trim()) {
+      process.env[stacksKey] = inferred.repoDir;
+    }
+  }
+
   const serverPort = resolveServerPortFromEnv({ defaultPort: 3005 });
 
   // Internal URL used by local processes on this machine.
@@ -67,6 +88,7 @@ async function main() {
   const startDaemon = !flags.has('--no-daemon') && (process.env.HAPPY_LOCAL_DAEMON ?? '1') !== '0';
   const serveUiWanted = !flags.has('--no-ui') && (process.env.HAPPY_LOCAL_SERVE_UI ?? '1') !== '0';
   const serveUi = serveUiWanted;
+  const startMobile = flags.has('--mobile') || flags.has('--with-mobile');
   const noBrowser = flags.has('--no-browser') || (process.env.HAPPY_STACKS_NO_BROWSER ?? process.env.HAPPY_LOCAL_NO_BROWSER ?? '').toString().trim() === '1';
   const uiPrefix = process.env.HAPPY_LOCAL_UI_PREFIX?.trim() ? process.env.HAPPY_LOCAL_UI_PREFIX.trim() : '/';
   const autostart = getDefaultAutostartPaths();
@@ -78,12 +100,16 @@ async function main() {
 
   const serverDir = getComponentDir(rootDir, serverComponentName);
   const cliDir = getComponentDir(rootDir, 'happy-cli');
+  const uiDir = getComponentDir(rootDir, 'happy');
 
   assertServerComponentDirMatches({ rootDir, serverComponentName, serverDir });
   assertServerPrismaProviderMatches({ serverComponentName, serverDir });
 
   await requireDir(serverComponentName, serverDir);
   await requireDir('happy-cli', cliDir);
+  if (startMobile) {
+    await requireDir('happy', uiDir);
+  }
 
   const cliBin = join(cliDir, 'bin', 'happy.mjs');
 
@@ -99,12 +125,14 @@ async function main() {
         mode: 'start',
         serverComponentName,
         serverDir,
+        uiDir,
         cliDir,
         serverPort,
         internalServerUrl,
         publicServerUrl,
         startDaemon,
         serveUi,
+        startMobile,
         uiPrefix,
         uiBuildDir,
         cliHomeDir,
@@ -125,7 +153,7 @@ async function main() {
   let shuttingDown = false;
   const baseEnv = { ...process.env };
   const stackCtx = resolveStackContext({ env: baseEnv, autostart });
-  const { stackMode, runtimeStatePath, stackName, ephemeral } = stackCtx;
+  const { stackMode, runtimeStatePath, stackName, envPath, ephemeral } = stackCtx;
 
   // Ensure happy-cli is install+build ready before starting the daemon.
   const buildCli = (baseEnv.HAPPY_STACKS_CLI_BUILD ?? baseEnv.HAPPY_LOCAL_CLI_BUILD ?? '1').toString().trim() !== '0';
@@ -133,12 +161,18 @@ async function main() {
 
   // Ensure server deps exist before any Prisma/docker work.
   await ensureDepsInstalled(serverDir, serverComponentName);
+  if (startMobile) {
+    await ensureDepsInstalled(uiDir, 'happy');
+  }
 
   // Public URL automation:
   // - Only the main stack should ever auto-enable Tailscale Serve by default.
   // - Non-main stacks default to localhost unless the user explicitly configured a public URL
   //   OR Tailscale Serve is already configured for this stack's internal URL (status matches).
-  const allowEnableTailscale = !stackMode || stackName === 'main';
+  const allowEnableTailscale =
+    !stackMode ||
+    stackName === 'main' ||
+    (baseEnv.HAPPY_STACKS_TAILSCALE_SERVE ?? baseEnv.HAPPY_LOCAL_TAILSCALE_SERVE ?? '0').toString().trim() === '1';
   const resolvedUrls = await resolveServerUrls({ env: baseEnv, serverPort, allowEnable: allowEnableTailscale });
   if (stackMode && stackName !== 'main' && !resolvedUrls.envPublicUrl) {
     const src = String(resolvedUrls.publicServerUrlSource ?? '');
@@ -331,9 +365,8 @@ async function main() {
     // Auto-open UI (interactive only) using the stack-scoped hostname when applicable.
     const isInteractive = Boolean(process.stdin.isTTY && process.stdout.isTTY);
     if (isInteractive && !noBrowser) {
-      const host = resolveLocalhostHost({ stackMode, stackName: autostart.stackName });
       const prefix = uiPrefix.startsWith('/') ? uiPrefix : `/${uiPrefix}`;
-      const openUrl = `http://${host}:${serverPort}${prefix}`;
+      const openUrl = await preferStackLocalhostUrl(`http://localhost:${serverPort}${prefix}`, { stackName: autostart.stackName });
       const res = await openUrlInBrowser(openUrl);
       if (!res.ok) {
         console.warn(`[local] ui: failed to open browser automatically (${res.error}).`);
@@ -343,6 +376,16 @@ async function main() {
 
   // Daemon
   if (startDaemon) {
+    const gate = daemonStartGate({ env: baseEnv, cliHomeDir });
+    if (!gate.ok) {
+      const isInteractive = Boolean(process.stdin.isTTY && process.stdout.isTTY);
+      // In orchestrated auth flows, keep server/UI up and let the orchestrator start daemon post-auth.
+      if (gate.reason === 'auth_flow_missing_credentials') {
+        console.log('[local] auth flow: skipping daemon start until credentials exist');
+      } else if (!isInteractive) {
+        throw new Error(formatDaemonAuthRequiredError({ stackName: autostart.stackName, cliHomeDir }));
+      }
+    } else {
     const isInteractive = Boolean(process.stdin.isTTY && process.stdout.isTTY);
     if (serverComponentName === 'happy-server' && happyServerAccountCount == null) {
       const acct = await getAccountCountForServerComponent({
@@ -355,6 +398,16 @@ async function main() {
     }
     const accountCount =
       serverComponentName === 'happy-server-light' ? serverLightAccountCount : happyServerAccountCount;
+    const autoSeedEnabled = resolveAutoCopyFromMainEnabled({ env: baseEnv, stackName: autostart.stackName, isInteractive });
+    await maybeRunInteractiveStackAuthSetup({
+      rootDir,
+      env: baseEnv,
+      stackName: autostart.stackName,
+      cliHomeDir,
+      accountCount,
+      isInteractive,
+      autoSeedEnabled,
+    });
     await prepareDaemonAuthSeedIfNeeded({
       rootDir,
       env: baseEnv,
@@ -372,6 +425,27 @@ async function main() {
       publicServerUrl,
       isShuttingDown: () => shuttingDown,
       forceRestart: restart,
+        env: baseEnv,
+        stackName: autostart.stackName,
+    });
+    }
+  }
+
+  // Optional: start Expo dev-client Metro for mobile reviewers.
+  if (startMobile) {
+    await ensureDevExpoServer({
+      startUi: false,
+      startMobile: true,
+      uiDir,
+      autostart,
+      baseEnv,
+      apiServerUrl: publicServerUrl,
+      restart,
+      stackMode,
+      runtimeStatePath,
+      stackName,
+      envPath,
+      children,
     });
   }
 

package/scripts/self.mjs

@@ -1,16 +1,18 @@
-import './utils/env.mjs';
+import './utils/env/env.mjs';
 
 import { readFile, writeFile, mkdir } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 
 import { parseArgs } from './utils/cli/args.mjs';
-import { pathExists } from './utils/fs.mjs';
-import { run, runCapture } from './utils/proc.mjs';
-import { expandHome } from './utils/canonical_home.mjs';
-import { getHappyStacksHomeDir, getRootDir } from './utils/paths.mjs';
+import { pathExists } from './utils/fs/fs.mjs';
+import { run, runCapture } from './utils/proc/proc.mjs';
+import { expandHome } from './utils/paths/canonical_home.mjs';
+import { getHappyStacksHomeDir, getRootDir } from './utils/paths/paths.mjs';
 import { printResult, wantsHelp, wantsJson } from './utils/cli/cli.mjs';
-import { getRuntimeDir } from './utils/runtime.mjs';
+import { getRuntimeDir } from './utils/paths/runtime.mjs';
+import { readJsonIfExists } from './utils/fs/json.mjs';
+import { readPackageJsonVersion } from './utils/fs/package_json.mjs';
 
 function cachePaths() {
   const home = getHappyStacksHomeDir();
@@ -21,15 +23,6 @@ function cachePaths() {
   };
 }
 
-async function readJsonSafe(path) {
-  try {
-    const raw = await readFile(path, 'utf-8');
-    return JSON.parse(raw);
-  } catch {
-    return null;
-  }
-}
-
 async function writeJsonSafe(path, obj) {
   try {
     await mkdir(join(path, '..'), { recursive: true });
@@ -43,25 +36,14 @@ async function writeJsonSafe(path, obj) {
   }
 }
 
-async function readPkgVersion(pkgJsonPath) {
-  try {
-    const raw = await readFile(pkgJsonPath, 'utf-8');
-    const pkg = JSON.parse(raw);
-    const v = String(pkg.version ?? '').trim();
-    return v || null;
-  } catch {
-    return null;
-  }
-}
-
 async function getRuntimeInstalledVersion() {
   const runtimeDir = getRuntimeDir();
   const pkgJson = join(runtimeDir, 'node_modules', 'happy-stacks', 'package.json');
-  return await readPkgVersion(pkgJson);
+  return await readPackageJsonVersion(pkgJson);
 }
 
 async function getInvokerVersion({ rootDir }) {
-  return await readPkgVersion(join(rootDir, 'package.json'));
+  return await readPackageJsonVersion(join(rootDir, 'package.json'));
 }
 
 async function fetchLatestVersion() {
@@ -102,7 +84,7 @@ async function cmdStatus({ rootDir, argv }) {
   const runtimeDir = getRuntimeDir();
   const runtimeVersion = await getRuntimeInstalledVersion();
 
-  const cached = await readJsonSafe(updateJson);
+  const cached = await readJsonIfExists(updateJson, { defaultValue: null });
 
   let latest = cached?.latest ?? null;
   let checkedAt = cached?.checkedAt ?? null;

package/scripts/server_flavor.mjs

@@ -1,8 +1,8 @@
-import './utils/env.mjs';
+import './utils/env/env.mjs';
 import { parseArgs } from './utils/cli/args.mjs';
-import { getRootDir } from './utils/paths.mjs';
-import { ensureEnvFileUpdated } from './utils/env_file.mjs';
-import { resolveUserConfigEnvPath } from './utils/config.mjs';
+import { getRootDir } from './utils/paths/paths.mjs';
+import { ensureEnvFileUpdated } from './utils/env/env_file.mjs';
+import { resolveUserConfigEnvPath } from './utils/env/config.mjs';
 import { isTty, promptSelect, withRl } from './utils/cli/wizard.mjs';
 import { printResult, wantsHelp, wantsJson } from './utils/cli/cli.mjs';
 

package/scripts/service.mjs

@@ -1,9 +1,10 @@
-import './utils/env.mjs';
-import { run, runCapture } from './utils/proc.mjs';
-import { getDefaultAutostartPaths, getRootDir, resolveStackEnvPath } from './utils/paths.mjs';
-import { ensureMacAutostartDisabled, ensureMacAutostartEnabled } from './utils/pm.mjs';
-import { getCanonicalHomeDir } from './utils/config.mjs';
-import { isSandboxed, sandboxAllowsGlobalSideEffects } from './utils/sandbox.mjs';
+import './utils/env/env.mjs';
+import { run, runCapture } from './utils/proc/proc.mjs';
+import { getComponentDir, getDefaultAutostartPaths, getRootDir, resolveStackEnvPath } from './utils/paths/paths.mjs';
+import { getInternalServerUrl, getPublicServerUrlEnvOverride } from './utils/server/urls.mjs';
+import { ensureMacAutostartDisabled, ensureMacAutostartEnabled } from './utils/service/autostart_darwin.mjs';
+import { getCanonicalHomeDir } from './utils/env/config.mjs';
+import { isSandboxed, sandboxAllowsGlobalSideEffects } from './utils/env/sandbox.mjs';
 import { spawn } from 'node:child_process';
 import { homedir } from 'node:os';
 import { existsSync } from 'node:fs';
@@ -12,6 +13,7 @@ import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { printResult, wantsHelp, wantsJson } from './utils/cli/cli.mjs';
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { readLastLines } from './utils/fs/tail.mjs';
 
 /**
  * Manage the autostart service installed by `happys bootstrap -- --autostart`.
@@ -35,11 +37,6 @@ function getUid() {
   return Number.isFinite(n) ? n : null;
 }
 
-function getInternalUrl() {
-  const port = process.env.HAPPY_LOCAL_SERVER_PORT?.trim() ? Number(process.env.HAPPY_LOCAL_SERVER_PORT) : 3005;
-  return `http://127.0.0.1:${port}`;
-}
-
 function getAutostartEnv({ rootDir }) {
   // IMPORTANT:
   // LaunchAgents should NOT bake the entire config into the plist, because that would require
@@ -267,18 +264,21 @@ async function startLaunchAgent({ persistent }) {
 
 async function postStartDiagnostics() {
   const rootDir = getRootDir(import.meta.url);
-  const internalUrl = getInternalUrl();
+  const internalUrl = getInternalServerUrl({ env: process.env, defaultPort: 3005 }).internalServerUrl;
 
   const cliHomeDir = process.env.HAPPY_LOCAL_CLI_HOME_DIR?.trim()
     ? process.env.HAPPY_LOCAL_CLI_HOME_DIR.trim().replace(/^~(?=\/)/, homedir())
     : join(getDefaultAutostartPaths().baseDir, 'cli');
 
-  const publicUrl =
-    process.env.HAPPY_LOCAL_SERVER_URL?.trim()
-      ? process.env.HAPPY_LOCAL_SERVER_URL.trim()
-      : internalUrl.replace('127.0.0.1', 'localhost');
+  let port = 3005;
+  try {
+    port = Number(new URL(internalUrl).port || 0) || 3005;
+  } catch {
+    port = 3005;
+  }
+  const { publicServerUrl: publicUrl } = getPublicServerUrlEnvOverride({ env: process.env, serverPort: port });
 
-  const cliDir = join(rootDir, 'components', 'happy-cli');
+  const cliDir = getComponentDir(rootDir, 'happy-cli');
   const cliBin = join(cliDir, 'bin', 'happy.mjs');
 
   const accessKey = join(cliHomeDir, 'access.key');
@@ -286,16 +286,6 @@ async function postStartDiagnostics() {
   const lockFile = join(cliHomeDir, 'daemon.state.json.lock');
   const logsDir = join(cliHomeDir, 'logs');
 
-  const readLastLines = async (path, lines = 60) => {
-    try {
-      const raw = await readFile(path, 'utf-8');
-      const parts = raw.split('\n');
-      return parts.slice(Math.max(0, parts.length - lines)).join('\n');
-    } catch {
-      return null;
-    }
-  };
-
   const latestDaemonLog = async () => {
     try {
       const ls = await runCapture('bash', ['-lc', `ls -1t "${logsDir}"/*-daemon.log 2>/dev/null | head -1 || true`]);
@@ -461,7 +451,7 @@ async function waitForLaunchAgentStopped({ timeoutMs = 8000 } = {}) {
 
 async function showStatus() {
   const { plistPath, stdoutPath, stderrPath, label } = getDefaultAutostartPaths();
-  const internalUrl = getInternalUrl();
+  const internalUrl = getInternalServerUrl({ env: process.env, defaultPort: 3005 }).internalServerUrl;
 
   console.log(`label: ${label}`);
   console.log(`plist: ${plistPath} ${existsSync(plistPath) ? '(present)' : '(missing)'}`);
@@ -550,7 +540,7 @@ async function main() {
       return;
     case 'status':
       if (json) {
-        const internalUrl = getInternalUrl();
+        const internalUrl = getInternalServerUrl({ env: process.env, defaultPort: 3005 }).internalServerUrl;
         let health = null;
         try {
           const res = await fetch(`${internalUrl}/health`, { method: 'GET' });