happy-stacks 0.2.0 → 0.4.0

package/docs/mobile-ios.md

@@ -8,101 +8,166 @@ see the “Using Happy from your phone” section in the main README.
 - Xcode installed
 - CocoaPods installed (`brew install cocoapods`)
 
-## Step 1: Generate iOS native project + Pods (run when needed)
+## Two supported modes
 
-Run this after pulling changes that affect native deps/config, or if `ios/` was deleted:
+- **Shared dev-client app** (recommended for development):
+  - Install *one* “Happy Stacks Dev” app on your phone.
+  - Run any stack with `--mobile`; scan the QR to open that stack inside the dev-client.
+  - Per-stack auth/storage is isolated via `EXPO_PUBLIC_HAPPY_STORAGE_SCOPE` (set automatically in stack mode).
 
-```bash
-happys mobile:prebuild
-```
+- **Per-stack “release” app** (recommended for demos / strict isolation):
+  - Install a separate iOS app per stack (unique bundle id + scheme).
+  - Each stack app is isolated by iOS app container (no token collisions).
+
+## Shared dev-client app (install once)
 
-## Step 2: Install the iOS dev build
+Install the dedicated Happy Stacks dev-client app on your iPhone (USB).
 
-- **iOS Simulator**:
+This command **runs a prebuild** (generates `ios/` + runs CocoaPods) and then installs a Debug build
+without starting Metro:
 
 ```bash
-happys mobile --run-ios --device="iPhone 16 Pro"
+happys mobile-dev-client --install
 ```
 
-- **Real iPhone** (requires code signing in Xcode once):
+If you want to ensure the dev-client is built from a specific stack’s active `happy` worktree
+(e.g. to include upstream changes that aren’t merged into your default checkout yet), run:
 
 ```bash
-happys mobile --run-ios --device="Your iPhone"
+happys stack mobile-dev-client <stack> --install
 ```
 
-Tip: you can omit `--device` to auto-pick the first connected iPhone over USB:
+Optional:
 
 ```bash
-happys mobile --run-ios
+happys mobile-dev-client --install --device="Your iPhone"
+happys mobile-dev-client --install --clean
 ```
 
-To see the exact device names/IDs you can pass:
+Then run any stack with mobile enabled:
 
 ```bash
-happys mobile:devices
+happys stack dev <stack> --mobile
+# or:
+happys dev --mobile
 ```
 
-If you hit a bundle identifier error (e.g. `com.slopus.happy.dev` “not available”), set a unique local bundle id:
+Notes:
+
+- **LAN requirement**: for physical iPhones, Metro must be reachable over LAN.
+  - Happy Stacks defaults to `lan` for mobile, and will print a QR code + deep link.
+  - For simulators you can usually use `localhost` (see `HAPPY_STACKS_MOBILE_HOST` below).
+- **If Expo is already running in web-only mode**: re-run with `--restart` and include `--mobile`.
+
+## Per-stack app install (isolated)
+
+Install an isolated app for a specific stack (unique bundle id + scheme, Release config, no Metro):
 
 ```bash
-HAPPY_STACKS_IOS_BUNDLE_ID="com.yourname.happy.local.dev" happys mobile --run-ios
-# legacy: HAPPY_LOCAL_IOS_BUNDLE_ID="com.yourname.happy.local.dev" happys mobile --run-ios
+happys stack mobile:install <stack> --name="Happy (<stack>)"
+happys stack mobile:install <stack> --name="Happy PR 272" --device="Your iPhone"
 ```
 
-## Release build (runs without Metro)
+The chosen app name is persisted in the stack env so you can re-run installs without re-typing it.
+
+## Native iOS regeneration / “prebuild” (critical)
+
+You’ll need to regenerate the iOS native project + Pods when:
+
+- you pull changes that affect native deps / Expo config
+- `components/happy/ios/` was deleted
+- you hit CocoaPods / deployment-target mismatches after a dependency bump
 
-Build + install a Release configuration (no Metro required at runtime):
+Run:
 
 ```bash
-happys mobile:install
+happys mobile --prebuild
+# (optional) fully regenerate ios/:
+happys mobile --prebuild --clean
 ```
 
-## Step 3: Start Metro (dev client)
+What this does today:
 
-- **iOS Simulator**:
+- runs `expo prebuild --no-install` (so we can patch before CocoaPods runs)
+- patches `ios/Podfile.properties.json` to:
+  - set `ios.deploymentTarget` to `16.0`
+  - set `ios.buildReactNativeFromSource` to `true`
+- patches the generated Xcode project deployment target (where applicable)
+- runs `pod install`
+
+Notes:
+
+- **You usually don’t need to run this manually** because both:
+  - `happys mobile-dev-client --install`
+  - `happys stack mobile:install <stack>`
+  already include `--prebuild`.
+- Legacy alias: `happys mobile:prebuild` exists (hidden), but prefer `happys mobile --prebuild`.
+
+## Manual `happys mobile` usage (advanced)
+
+If you want to work on the embedded Expo app directly (outside `happys dev --mobile`), `happys mobile` supports:
 
 ```bash
-happys mobile --host=localhost
+# Start Metro (keeps running):
+happys mobile --host=lan
+
+# Build + install on iOS (and exit). If you omit --device, it will try to auto-pick a connected iPhone over USB:
+happys mobile --prebuild --run-ios --device="Your iPhone"
+happys mobile --prebuild --run-ios --configuration=Release --no-metro
 ```
 
-- **Real iPhone** (same Wi‑Fi as your Mac):
+## Notes / troubleshooting
+
+- **QR opens the wrong app**:
+  - The dev-client QR uses the `HAPPY_STACKS_DEV_CLIENT_SCHEME` (default: `happystacks-dev`).
+  - Per-stack installs use a different per-stack scheme, so they should not intercept dev-client QR scans.
+
+- **List connected devices** (for `--device=`):
 
 ```bash
-happys mobile --host=lan
+happys mobile:devices
 ```
 
-Open the dev build and tap Reload. Scanning the QR should open the dev build (not the App Store app).
+- **Code signing weirdness on a real iPhone**:
+  - Happy Stacks will try to “un-pin” signing fields in the generated `.pbxproj` so Expo/Xcode can reconfigure signing
+    (this avoids failures where automatic signing is disabled because `DEVELOPMENT_TEAM`/profiles were pinned).
+  - If you want to manage signing manually, pass `--no-signing-fix` to `happys mobile ...` / `happys stack mobile <stack> ...`.
 
 ## Bake the default server URL into the app (optional)
 
 If you want the built app to default to your happy-stacks server URL, set this **when building**:
 
 ```bash
-HAPPY_STACKS_SERVER_URL="https://<your-machine>.<tailnet>.ts.net" happys mobile:install
+HAPPY_STACKS_SERVER_URL="https://<your-machine>.<tailnet>.ts.net" happys mobile-dev-client --install
 ```
 
-Note: changing `HAPPY_STACKS_SERVER_URL` requires rebuilding/reinstalling the Release app (`happys mobile:install`).
+Note: changing `HAPPY_STACKS_SERVER_URL` requires rebuilding/reinstalling the app you care about.
 
-You can also set a custom bundle id (recommended for real devices):
+Important:
 
-```bash
-HAPPY_STACKS_IOS_BUNDLE_ID="com.yourname.happy.local.dev" HAPPY_STACKS_SERVER_URL="https://<your-machine>.<tailnet>.ts.net" happys mobile:install
-```
+- For **non-main stacks**, `HAPPY_STACKS_SERVER_URL` is only respected if it’s set **in that stack’s env file**
+  (safety: we ignore “global” URLs for non-main stacks to avoid accidentally repointing other stacks).
+
+## Customizing the app identity (optional / advanced)
+
+Happy Stacks uses these identities:
 
-## Customizing the app identity (optional)
+- **Dev-client**: defaults to `Happy Stacks Dev` + bundle id `com.happystacks.dev.<user>`
+- **Per-stack release**: defaults to `Happy (<stack>)` + bundle id `com.happystacks.stack.<user>.<stack>`
+
+If you want to build/install *manually* (instead of `mobile-dev-client` / `stack mobile:install`), you can override:
 
 - **Bundle identifier (recommended for real iPhones)**:
-  - You may *need* this if the default `com.slopus.happy.dev` can’t be registered on your Apple team.
+  - You may need this if the bundle id you’re using isn’t available/owned by your Apple team.
 
 ```bash
-HAPPY_STACKS_IOS_BUNDLE_ID="com.yourname.happy.local.dev" happys mobile --run-ios
-HAPPY_STACKS_IOS_BUNDLE_ID="com.yourname.happy.local.dev" happys mobile:install
+HAPPY_STACKS_IOS_BUNDLE_ID="com.yourname.happy.local.dev" happys mobile --prebuild --run-ios --no-metro
 ```
 
 - **App name (what shows on the home screen)**:
 
 ```bash
-HAPPY_STACKS_IOS_APP_NAME="Happy Local" happys mobile:install
+HAPPY_STACKS_IOS_APP_NAME="Happy Local" happys mobile --prebuild --run-ios --no-metro
 ```
 
 ## Suggested env (recommended)
@@ -110,25 +175,18 @@ HAPPY_STACKS_IOS_APP_NAME="Happy Local" happys mobile:install
 Add these to your main stack env file (`~/.happy/stacks/main/env`) (or `~/.happy-stacks/env.local` for global overrides) so you don’t have to prefix every command:
 
 ```bash
-# Required if you want the Release app to default to your stack server:
-HAPPY_STACKS_SERVER_URL="https://<your-machine>.<tailnet>.ts.net"
+# How the phone reaches Metro:
+# - lan: recommended for real devices
+# - localhost: OK for simulators
+HAPPY_STACKS_MOBILE_HOST="lan"
 
-# Strongly recommended for real devices (needs to be unique + owned by your Apple team):
-HAPPY_STACKS_IOS_BUNDLE_ID="com.yourname.happy.local.dev"
+# (optional) default scheme used in the dev-client QR / deep link
+# (must match your installed dev-client app):
+HAPPY_STACKS_DEV_CLIENT_SCHEME="happystacks-dev"
+
+# Default public server URL for the stack (baked into the Expo app config):
+HAPPY_STACKS_SERVER_URL="https://<your-machine>.<tailnet>.ts.net"
 
 # Optional: home screen name:
 HAPPY_STACKS_IOS_APP_NAME="Happy Local"
 ```
-
-## Personal build on iPhone (EAS internal distribution)
-
-```bash
-cd "$HOME/.happy-stacks/workspace/components/happy"
-eas build --profile development --platform ios
-```
-
-Then keep Metro running from `happy-stacks`:
-
-```bash
-happys mobile --host=lan
-```

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "happy-stacks",
   "type": "module",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "packageManager": "pnpm@10.18.3",
   "bin": {
     "happys": "./bin/happys.mjs",
@@ -55,5 +55,9 @@
     "menubar:install": "node ./scripts/menubar.mjs install",
     "menubar:uninstall": "node ./scripts/menubar.mjs uninstall",
     "menubar:open": "bash -lc 'DIR=\"$(defaults read com.ameba.SwiftBar PluginDirectory 2>/dev/null)\"; if [[ -z \"$DIR\" ]]; then DIR=\"$HOME/Library/Application Support/SwiftBar/Plugins\"; fi; open \"$DIR\"'"
+  },
+  "dependencies": {
+    "qrcode": "^1.5.4",
+    "qrcode-terminal": "^0.12.0"
   }
 }

package/scripts/auth.mjs

@@ -1,170 +1,68 @@
-import './utils/env.mjs';
+import './utils/env/env.mjs';
 import { parseArgs } from './utils/cli/args.mjs';
 import { printResult, wantsHelp, wantsJson } from './utils/cli/cli.mjs';
-import { getComponentDir, getDefaultAutostartPaths, getRootDir, getStackName, resolveStackEnvPath } from './utils/paths.mjs';
-import { listAllStackNames } from './utils/stacks.mjs';
+import { getComponentDir, getDefaultAutostartPaths, getRootDir, getStackName, resolveStackEnvPath } from './utils/paths/paths.mjs';
+import { listAllStackNames } from './utils/stack/stacks.mjs';
 import { resolvePublicServerUrl } from './tailscale.mjs';
-import { resolveServerPortFromEnv } from './utils/server_urls.mjs';
+import { getInternalServerUrl, getPublicServerUrlEnvOverride, getWebappUrlEnvOverride } from './utils/server/urls.mjs';
+import { fetchHappyHealth } from './utils/server/server.mjs';
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { homedir } from 'node:os';
 import { spawn } from 'node:child_process';
-import { mkdir, readFile, writeFile } from 'node:fs/promises';
+import { mkdir, writeFile } from 'node:fs/promises';
 import { dirname } from 'node:path';
 
-import { parseDotenv } from './utils/dotenv.mjs';
-import { ensureDepsInstalled, pmExecBin } from './utils/pm.mjs';
-import { applyHappyServerMigrations, ensureHappyServerManagedInfra } from './utils/happy_server_infra.mjs';
-import { clearDevAuthKey, readDevAuthKey, writeDevAuthKey } from './utils/dev_auth_key.mjs';
-import { getExpoStatePaths, isStateProcessRunning } from './utils/expo.mjs';
-import { resolveAuthSeedFromEnv } from './utils/stack_startup.mjs';
-import { printAuthLoginInstructions } from './utils/auth_login_ux.mjs';
-import { copyFileIfMissing, linkFileIfMissing, removeFileOrSymlinkIfExists, writeSecretFileIfMissing } from './utils/auth_files.mjs';
-import { getLegacyHappyBaseDir, isLegacyAuthSourceName } from './utils/auth_sources.mjs';
-import { isSandboxed, sandboxAllowsGlobalSideEffects } from './utils/sandbox.mjs';
-import { resolveHandyMasterSecretFromStack } from './utils/handy_master_secret.mjs';
-
-function getInternalServerUrl() {
-  const n = resolveServerPortFromEnv({ env: process.env, defaultPort: 3005 });
-  return { port: n, url: `http://127.0.0.1:${n}` };
-}
-
-function resolveEnvPublicUrlForStack({ stackName }) {
-  const candidate = (process.env.HAPPY_LOCAL_SERVER_URL ?? process.env.HAPPY_STACKS_SERVER_URL ?? '').trim();
-
-  // For main, allow the user's global/public URL override (commonly a Tailscale Serve URL).
-  if (stackName === 'main') {
-    return candidate;
-  }
-
-  // For non-main stacks, do NOT inherit a global/server URL override from ~/.happy-stacks/env.local
-  // (which often points at main). Only use a public URL override if it is explicitly present in the
-  // stack env file itself.
-  const envPath =
-    (process.env.HAPPY_STACKS_ENV_FILE ?? '').trim() ||
-    (process.env.HAPPY_LOCAL_ENV_FILE ?? '').trim() ||
-    getStackEnvPath(stackName);
-  try {
-    if (!envPath || !existsSync(envPath)) return '';
-    const raw = readFileSync(envPath, 'utf-8');
-    const env = raw ? parseEnvToObject(raw) : {};
-    return (env.HAPPY_LOCAL_SERVER_URL ?? env.HAPPY_STACKS_SERVER_URL ?? '').toString().trim();
-  } catch {
-    return '';
-  }
-}
-
-function expandTilde(p) {
-  return p.replace(/^~(?=\/)/, homedir());
-}
-
-function resolveEnvWebappUrlForStack({ stackName }) {
-  const candidate = (process.env.HAPPY_WEBAPP_URL ?? '').trim();
-
-  // For main, allow the user's global override.
-  if (stackName === 'main') {
-    return candidate;
-  }
-
-  // For non-main stacks, only respect HAPPY_WEBAPP_URL if it is explicitly present in the stack env file.
-  const envPath =
-    (process.env.HAPPY_STACKS_ENV_FILE ?? '').trim() ||
-    (process.env.HAPPY_LOCAL_ENV_FILE ?? '').trim() ||
-    getStackEnvPath(stackName);
-  try {
-    if (!envPath || !existsSync(envPath)) return '';
-    const raw = readFileSync(envPath, 'utf-8');
-    const env = raw ? parseEnvToObject(raw) : {};
-    return (env.HAPPY_WEBAPP_URL ?? '').toString().trim();
-  } catch {
-    return '';
-  }
-}
-
-function sanitizeDnsLabel(raw, { fallback = 'stack' } = {}) {
-  const s = String(raw ?? '')
-    .toLowerCase()
-    .replace(/[^a-z0-9-]+/g, '-')
-    .replace(/-+/g, '-')
-    .replace(/^-+/, '')
-    .replace(/-+$/, '');
-  return s || fallback;
+import { parseEnvToObject } from './utils/env/dotenv.mjs';
+import { ensureDepsInstalled, pmExecBin } from './utils/proc/pm.mjs';
+import { applyHappyServerMigrations, ensureHappyServerManagedInfra } from './utils/server/infra/happy_server_infra.mjs';
+import { clearDevAuthKey, readDevAuthKey, writeDevAuthKey } from './utils/auth/dev_key.mjs';
+import { getExpoStatePaths, isStateProcessRunning } from './utils/expo/expo.mjs';
+import { resolveAuthSeedFromEnv } from './utils/stack/startup.mjs';
+import { printAuthLoginInstructions } from './utils/auth/login_ux.mjs';
+import { copyFileIfMissing, linkFileIfMissing, removeFileOrSymlinkIfExists, writeSecretFileIfMissing } from './utils/auth/files.mjs';
+import { getLegacyHappyBaseDir, isLegacyAuthSourceName } from './utils/auth/sources.mjs';
+import { isSandboxed, sandboxAllowsGlobalSideEffects } from './utils/env/sandbox.mjs';
+import { resolveHandyMasterSecretFromStack } from './utils/auth/handy_master_secret.mjs';
+import { ensureDir, readTextIfExists } from './utils/fs/ops.mjs';
+import { stackExistsSync } from './utils/stack/stacks.mjs';
+import { checkDaemonState } from './daemon.mjs';
+import {
+  getCliHomeDirFromEnvOrDefault,
+  getServerLightDataDirFromEnvOrDefault,
+  resolveCliHomeDir,
+} from './utils/stack/dirs.mjs';
+import { resolveLocalhostHost, preferStackLocalhostUrl } from './utils/paths/localhost_host.mjs';
+
+function getInternalServerUrlCompat() {
+  const { port, internalServerUrl } = getInternalServerUrl({ env: process.env, defaultPort: 3005 });
+  return { port, url: internalServerUrl };
 }
 
 async function resolveWebappUrlFromRunningExpo({ rootDir, stackName }) {
   try {
-    const baseDir = getStackDir(stackName);
+    const baseDir = resolveStackEnvPath(stackName).baseDir;
     const uiDir = getComponentDir(rootDir, 'happy');
     const uiPaths = getExpoStatePaths({
       baseDir,
-      kind: 'ui-dev',
+      kind: 'expo-dev',
       projectDir: uiDir,
-      stateFileName: 'ui.state.json',
+      stateFileName: 'expo.state.json',
     });
     const uiRunning = await isStateProcessRunning(uiPaths.statePath);
     if (!uiRunning.running) return null;
     const port = Number(uiRunning.state?.port);
     if (!Number.isFinite(port) || port <= 0) return null;
-    const host = stackName && stackName !== 'main' ? `happy-${sanitizeDnsLabel(stackName)}.localhost` : 'localhost';
+    const host = resolveLocalhostHost({ stackMode: stackName !== 'main', stackName });
     return `http://${host}:${port}`;
   } catch {
     return null;
   }
 }
 
-async function ensureDir(p) {
-  await mkdir(p, { recursive: true });
-}
-
-async function readTextIfExists(path) {
-  try {
-    if (!existsSync(path)) return null;
-    const raw = await readFile(path, 'utf-8');
-    const t = raw.trim();
-    return t ? t : null;
-  } catch {
-    return null;
-  }
-}
-
-// (auth file copy/link helpers live in scripts/utils/auth_files.mjs)
-
-function parseEnvToObject(raw) {
-  const parsed = parseDotenv(raw);
-  return Object.fromEntries(parsed.entries());
-}
-
-function getStackDir(stackName) {
-  return resolveStackEnvPath(stackName).baseDir;
-}
-
-function getStackEnvPath(stackName) {
-  return resolveStackEnvPath(stackName).envPath;
-}
-
-function stackExistsSync(stackName) {
-  if (stackName === 'main') return true;
-  const envPath = getStackEnvPath(stackName);
-  return existsSync(envPath);
-}
-
-function getCliHomeDirFromEnvOrDefault({ stackBaseDir, env }) {
-  const fromEnv = (env.HAPPY_STACKS_CLI_HOME_DIR ?? env.HAPPY_LOCAL_CLI_HOME_DIR ?? '').trim();
-  return fromEnv || join(stackBaseDir, 'cli');
-}
+// NOTE: common fs helpers live in scripts/utils/fs/ops.mjs
 
-function getServerLightDataDirFromEnvOrDefault({ stackBaseDir, env }) {
-  const fromEnv = (env.HAPPY_SERVER_LIGHT_DATA_DIR ?? '').trim();
-  return fromEnv || join(stackBaseDir, 'server-light');
-}
-
-function resolveCliHomeDir() {
-  const fromEnv = (process.env.HAPPY_LOCAL_CLI_HOME_DIR ?? process.env.HAPPY_STACKS_CLI_HOME_DIR ?? '').trim();
-  if (fromEnv) {
-    return expandTilde(fromEnv);
-  }
-  return join(getDefaultAutostartPaths().baseDir, 'cli');
-}
+// (auth file copy/link helpers live in scripts/utils/auth/files.mjs)
 
 function fileHasContent(path) {
   try {
@@ -175,60 +73,6 @@ function fileHasContent(path) {
   }
 }
 
-function checkDaemonState(cliHomeDir) {
-  const statePath = join(cliHomeDir, 'daemon.state.json');
-  const lockPath = join(cliHomeDir, 'daemon.state.json.lock');
-
-  const alive = (pid) => {
-    try {
-      process.kill(pid, 0);
-      return true;
-    } catch {
-      return false;
-    }
-  };
-
-  if (existsSync(statePath)) {
-    try {
-      const state = JSON.parse(readFileSync(statePath, 'utf-8'));
-      const pid = Number(state?.pid);
-      if (Number.isFinite(pid) && pid > 0) {
-        return alive(pid) ? { status: 'running', pid } : { status: 'stale_state', pid };
-      }
-      return { status: 'bad_state' };
-    } catch {
-      return { status: 'bad_state' };
-    }
-  }
-
-  if (existsSync(lockPath)) {
-    try {
-      const pid = Number(readFileSync(lockPath, 'utf-8').trim());
-      if (Number.isFinite(pid) && pid > 0) {
-        return alive(pid) ? { status: 'starting', pid } : { status: 'stale_lock', pid };
-      }
-    } catch {
-      // ignore
-    }
-  }
-
-  return { status: 'stopped' };
-}
-
-async function fetchHealth(internalServerUrl) {
-  const ctl = new AbortController();
-  const t = setTimeout(() => ctl.abort(), 1500);
-  try {
-    const res = await fetch(`${internalServerUrl}/health`, { method: 'GET', signal: ctl.signal });
-    const body = (await res.text()).trim();
-    return { ok: res.ok, status: res.status, body };
-  } catch {
-    return { ok: false, status: null, body: null };
-  } finally {
-    clearTimeout(t);
-  }
-}
-
 function authLoginSuggestion(stackName) {
   return stackName === 'main' ? 'happys auth login' : `happys stack auth ${stackName} login`;
 }
@@ -678,8 +522,8 @@ async function cmdCopyFrom({ argv, json }) {
     }
   }
 
-  const sourceBaseDir = isLegacySource ? getLegacyHappyBaseDir() : getStackDir(fromStackName);
-  const sourceEnvRaw = isLegacySource ? '' : await readTextIfExists(getStackEnvPath(fromStackName));
+  const sourceBaseDir = isLegacySource ? getLegacyHappyBaseDir() : resolveStackEnvPath(fromStackName).baseDir;
+  const sourceEnvRaw = isLegacySource ? '' : await readTextIfExists(resolveStackEnvPath(fromStackName).envPath);
   const sourceEnv = sourceEnvRaw ? parseEnvToObject(sourceEnvRaw) : {};
   const sourceCli = isLegacySource
     ? join(sourceBaseDir, 'cli')
@@ -735,9 +579,9 @@ async function cmdCopyFrom({ argv, json }) {
       // so we can seed DB accounts reliably.
       const managed = (targetEnv.HAPPY_STACKS_MANAGED_INFRA ?? targetEnv.HAPPY_LOCAL_MANAGED_INFRA ?? '1').toString().trim() !== '0';
       if (targetServerComponent === 'happy-server' && withInfra && managed) {
-        const { port } = getInternalServerUrl();
-        const publicServerUrl = `http://localhost:${port}`;
-        const envPath = getStackEnvPath(stackName);
+        const { port } = getInternalServerUrlCompat();
+        const publicServerUrl = await preferStackLocalhostUrl(`http://localhost:${port}`, { stackName });
+        const envPath = resolveStackEnvPath(stackName).envPath;
         const infra = await ensureHappyServerManagedInfra({
           stackName,
           baseDir: targetBaseDir,
@@ -838,14 +682,14 @@ async function cmdStatus({ json }) {
   const rootDir = getRootDir(import.meta.url);
   const stackName = getStackName();
 
-  const { port, url: internalServerUrl } = getInternalServerUrl();
-  const defaultPublicUrl = `http://localhost:${port}`;
-  const envPublicUrl = resolveEnvPublicUrlForStack({ stackName });
+  const { port, url: internalServerUrl } = getInternalServerUrlCompat();
+  const { defaultPublicUrl, envPublicUrl } = getPublicServerUrlEnvOverride({ env: process.env, serverPort: port, stackName });
   const { publicServerUrl } = await resolvePublicServerUrl({
     internalServerUrl,
     defaultPublicUrl,
     envPublicUrl,
     allowEnable: false,
+    stackName,
   });
 
   const cliHomeDir = resolveCliHomeDir();
@@ -861,7 +705,12 @@ async function cmdStatus({ json }) {
   };
 
   const daemon = checkDaemonState(cliHomeDir);
-  const health = await fetchHealth(internalServerUrl);
+  const healthRaw = await fetchHappyHealth(internalServerUrl);
+  const health = {
+    ok: Boolean(healthRaw.ok),
+    status: healthRaw.status,
+    body: healthRaw.text ? healthRaw.text.trim() : null,
+  };
 
   const out = {
     stackName,
@@ -922,20 +771,21 @@ async function cmdStatus({ json }) {
 async function cmdLogin({ argv, json }) {
   const rootDir = getRootDir(import.meta.url);
   const stackName = getStackName();
-  const { kv } = parseArgs(argv);
+  const { flags, kv } = parseArgs(argv);
 
-  const { port, url: internalServerUrl } = getInternalServerUrl();
-  const defaultPublicUrl = `http://localhost:${port}`;
-  const envPublicUrl = resolveEnvPublicUrlForStack({ stackName });
+  const { port, url: internalServerUrl } = getInternalServerUrlCompat();
+  const { defaultPublicUrl, envPublicUrl } = getPublicServerUrlEnvOverride({ env: process.env, serverPort: port, stackName });
   const { publicServerUrl } = await resolvePublicServerUrl({
     internalServerUrl,
     defaultPublicUrl,
     envPublicUrl,
     allowEnable: false,
+    stackName,
   });
-  const envWebappUrl = resolveEnvWebappUrlForStack({ stackName });
+  const { envWebappUrl } = getWebappUrlEnvOverride({ env: process.env, stackName });
   const expoWebappUrl = await resolveWebappUrlFromRunningExpo({ rootDir, stackName });
-  const webappUrl = envWebappUrl || expoWebappUrl || publicServerUrl;
+  const webappUrlRaw = envWebappUrl || expoWebappUrl || publicServerUrl;
+  const webappUrl = await preferStackLocalhostUrl(webappUrlRaw, { stackName });
   const webappUrlSource = expoWebappUrl ? 'expo' : envWebappUrl ? 'stack env override' : 'server';
 
   const cliHomeDir = resolveCliHomeDir();
@@ -971,7 +821,8 @@ async function cmdLogin({ argv, json }) {
     return;
   }
 
-  if (!json) {
+  const quietUx = flags.has('--quiet') || flags.has('--no-ux');
+  if (!json && !quietUx) {
     printAuthLoginInstructions({
       stackName,
       context,