happy-stacks 0.2.0 → 0.4.0

package/scripts/utils/stack/stacks.mjs

@@ -0,0 +1,45 @@
+import { readdir } from 'node:fs/promises';
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+
+import { getLegacyStorageRoot, getStacksStorageRoot } from '../paths/paths.mjs';
+import { isSandboxed, sandboxAllowsGlobalSideEffects } from '../env/sandbox.mjs';
+import { resolveStackEnvPath } from '../paths/paths.mjs';
+
+export async function listAllStackNames() {
+  const names = new Set(['main']);
+  const allowLegacy = !isSandboxed() || sandboxAllowsGlobalSideEffects();
+  const roots = [
+    // New layout: ~/.happy/stacks/<name>/env
+    getStacksStorageRoot(),
+    // Legacy layout: ~/.happy/local/stacks/<name>/env
+    ...(allowLegacy ? [join(getLegacyStorageRoot(), 'stacks')] : []),
+  ];
+
+  for (const root of roots) {
+    let entries = [];
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      entries = await readdir(root, { withFileTypes: true });
+    } catch {
+      entries = [];
+    }
+    for (const ent of entries) {
+      if (!ent.isDirectory()) continue;
+      const name = ent.name;
+      if (!name || name.startsWith('.')) continue;
+      const envPath = join(root, name, 'env');
+      if (existsSync(envPath)) {
+        names.add(name);
+      }
+    }
+  }
+
+  return Array.from(names).sort();
+}
+
+export function stackExistsSync(stackName) {
+  const name = String(stackName ?? '').trim() || 'main';
+  if (name === 'main') return true;
+  return existsSync(resolveStackEnvPath(name).envPath);
+}

package/scripts/utils/{stack_startup.mjs → stack/startup.mjs}

@@ -1,5 +1,6 @@
-import { runCapture } from './proc.mjs';
-import { ensureDepsInstalled, pmExecBin } from './pm.mjs';
+import { runCapture } from '../proc/proc.mjs';
+import { ensureDepsInstalled, pmExecBin } from '../proc/pm.mjs';
+import { isSandboxed, sandboxAllowsGlobalSideEffects } from '../env/sandbox.mjs';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 
@@ -47,6 +48,12 @@ async function probeAccountCount({ serverDir, env }) {
 }
 
 export function resolveAutoCopyFromMainEnabled({ env, stackName, isInteractive }) {
+  // Sandboxes should be isolated by default.
+  // Auto auth seeding can copy credentials/account rows from another stack (global state),
+  // which breaks isolation and can confuse guided auth flows (setup-pr/review-pr).
+  if (isSandboxed() && !sandboxAllowsGlobalSideEffects()) {
+    return false;
+  }
   const raw = (env.HAPPY_STACKS_AUTO_AUTH_SEED ?? env.HAPPY_LOCAL_AUTO_AUTH_SEED ?? '').toString().trim();
   if (raw) return raw !== '0';
 

package/scripts/utils/{stack_stop.mjs → stack/stop.mjs}

@@ -2,19 +2,13 @@ import { existsSync } from 'node:fs';
 import { readdir, readFile } from 'node:fs/promises';
 import { join } from 'node:path';
 
-import { getComponentDir } from './paths.mjs';
-import { isPidAlive, readPidState } from './expo.mjs';
-import { stopLocalDaemon } from '../daemon.mjs';
-import { stopHappyServerManagedInfra } from './happy_server_infra.mjs';
-import { deleteStackRuntimeStateFile, getStackRuntimeStatePath, readStackRuntimeStateFile } from './stack_runtime_state.mjs';
-import { killPidOwnedByStack, killProcessGroupOwnedByStack, listPidsWithEnvNeedle } from './ownership.mjs';
-
-function parseIntOrNull(raw) {
-  const s = String(raw ?? '').trim();
-  if (!s) return null;
-  const n = Number(s);
-  return Number.isFinite(n) && n > 0 ? n : null;
-}
+import { getComponentDir } from '../paths/paths.mjs';
+import { isPidAlive, readPidState } from '../expo/expo.mjs';
+import { stopLocalDaemon } from '../../daemon.mjs';
+import { stopHappyServerManagedInfra } from '../server/infra/happy_server_infra.mjs';
+import { deleteStackRuntimeStateFile, getStackRuntimeStatePath, readStackRuntimeStateFile } from './runtime_state.mjs';
+import { killPidOwnedByStack, killProcessGroupOwnedByStack, listPidsWithEnvNeedle } from '../proc/ownership.mjs';
+import { coercePort } from '../server/port.mjs';
 
 function resolveServerComponentFromStackEnv(env) {
   const v =
@@ -132,6 +126,7 @@ export async function stopStackWithEnv({ rootDir, stackName, baseDir, env, json,
     daemonSessionsStopped: null,
     daemonStopped: false,
     killedPorts: [],
+    expoDev: [],
     uiDev: [],
     mobile: [],
     infra: null,
@@ -139,10 +134,16 @@ export async function stopStackWithEnv({ rootDir, stackName, baseDir, env, json,
   };
 
   const serverComponent = resolveServerComponentFromStackEnv(env);
-  const port = parseIntOrNull(env.HAPPY_STACKS_SERVER_PORT ?? env.HAPPY_LOCAL_SERVER_PORT);
-  const backendPort = parseIntOrNull(env.HAPPY_STACKS_HAPPY_SERVER_BACKEND_PORT ?? env.HAPPY_LOCAL_HAPPY_SERVER_BACKEND_PORT);
+  const port = coercePort(env.HAPPY_STACKS_SERVER_PORT ?? env.HAPPY_LOCAL_SERVER_PORT);
+  const backendPort = coercePort(env.HAPPY_STACKS_HAPPY_SERVER_BACKEND_PORT ?? env.HAPPY_LOCAL_HAPPY_SERVER_BACKEND_PORT);
   const cliHomeDir = (env.HAPPY_STACKS_CLI_HOME_DIR ?? env.HAPPY_LOCAL_CLI_HOME_DIR ?? join(baseDir, 'cli')).toString();
-  const cliBin = join(getComponentDir(rootDir, 'happy-cli'), 'bin', 'happy.mjs');
+  // IMPORTANT:
+  // When stopping a stack, always prefer the stack's pinned happy-cli checkout/worktree.
+  // Otherwise, PR stacks can accidentally run the base checkout's CLI bin, which may not be built
+  // (we intentionally skip building base checkouts in some sandbox PR flows).
+  const pinnedCliDir = (env.HAPPY_STACKS_COMPONENT_DIR_HAPPY_CLI ?? env.HAPPY_LOCAL_COMPONENT_DIR_HAPPY_CLI ?? '').toString().trim();
+  const cliDir = pinnedCliDir || getComponentDir(rootDir, 'happy-cli');
+  const cliBin = join(cliDir, 'bin', 'happy.mjs');
   const envPath = (env.HAPPY_STACKS_ENV_FILE ?? env.HAPPY_LOCAL_ENV_FILE ?? '').toString();
 
   // Preferred: stop stack-started processes (by PID) recorded in stack.runtime.json.
@@ -200,12 +201,16 @@ export async function stopStackWithEnv({ rootDir, stackName, baseDir, env, json,
   }
 
   try {
-    actions.uiDev = await stopExpoStateDir({ stackName, baseDir, kind: 'ui-dev', stateFileName: 'ui.state.json', envPath, json });
+    actions.expoDev = await stopExpoStateDir({ stackName, baseDir, kind: 'expo-dev', stateFileName: 'expo.state.json', envPath, json });
   } catch (e) {
-    actions.errors.push({ step: 'expo-ui', error: e instanceof Error ? e.message : String(e) });
+    actions.errors.push({ step: 'expo-dev', error: e instanceof Error ? e.message : String(e) });
   }
   try {
-    actions.mobile = await stopExpoStateDir({ stackName, baseDir, kind: 'mobile', stateFileName: 'expo.state.json', envPath, json });
+    // Legacy cleanups (best-effort): older runs used separate state dirs.
+    actions.uiDev = await stopExpoStateDir({ stackName, baseDir, kind: 'ui-dev', stateFileName: 'ui.state.json', envPath, json });
+    const killedDev = await stopExpoStateDir({ stackName, baseDir, kind: 'mobile-dev', stateFileName: 'mobile.state.json', envPath, json });
+    const killedLegacy = await stopExpoStateDir({ stackName, baseDir, kind: 'mobile', stateFileName: 'expo.state.json', envPath, json });
+    actions.mobile = [...killedDev, ...killedLegacy];
   } catch (e) {
     actions.errors.push({ step: 'expo-mobile', error: e instanceof Error ? e.message : String(e) });
   }

package/scripts/utils/stack_context.mjs

@@ -1,14 +1,14 @@
-import { getStackName, resolveStackEnvPath } from './paths.mjs';
+import { getStackName, resolveStackEnvPath } from './paths/paths.mjs';
 import { getStackRuntimeStatePath } from './stack_runtime_state.mjs';
 
 export function resolveStackContext({ env = process.env, autostart = null } = {}) {
   const explicitStack = (env.HAPPY_STACKS_STACK ?? env.HAPPY_LOCAL_STACK ?? '').toString().trim();
-  const stackName = explicitStack || (autostart?.stackName ?? '') || getStackName();
+  const stackName = explicitStack || (autostart?.stackName ?? '') || getStackName(env);
   const stackMode = Boolean(explicitStack);
 
   const envPath =
     (env.HAPPY_STACKS_ENV_FILE ?? env.HAPPY_LOCAL_ENV_FILE ?? '').toString().trim() ||
-    resolveStackEnvPath(stackName).envPath;
+    resolveStackEnvPath(stackName, env).envPath;
 
   const runtimeStatePath =
     (env.HAPPY_STACKS_RUNTIME_STATE_PATH ?? env.HAPPY_LOCAL_RUNTIME_STATE_PATH ?? '').toString().trim() ||

package/scripts/utils/stack_runtime_state.mjs

@@ -2,7 +2,7 @@ import { existsSync } from 'node:fs';
 import { mkdir, readFile, rename, unlink, writeFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 
-import { resolveStackEnvPath } from './paths.mjs';
+import { resolveStackEnvPath } from './paths/paths.mjs';
 
 export function getStackRuntimeStatePath(stackName) {
   const { baseDir } = resolveStackEnvPath(stackName);

package/scripts/utils/stacks.mjs

@@ -2,8 +2,8 @@ import { readdir } from 'node:fs/promises';
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 
-import { getLegacyStorageRoot, getStacksStorageRoot } from './paths.mjs';
-import { isSandboxed, sandboxAllowsGlobalSideEffects } from './sandbox.mjs';
+import { getLegacyStorageRoot, getStacksStorageRoot } from './paths/paths.mjs';
+import { isSandboxed, sandboxAllowsGlobalSideEffects } from './env/sandbox.mjs';
 
 export async function listAllStackNames() {
   const names = new Set(['main']);

package/scripts/utils/{browser.mjs → ui/browser.mjs}

@@ -1,4 +1,4 @@
-import { runCapture } from './proc.mjs';
+import { runCapture } from '../proc/proc.mjs';
 
 export async function openUrlInBrowser(url, { timeoutMs = 5_000 } = {}) {
   const u = String(url ?? '').trim();

package/scripts/utils/ui/qr.mjs

@@ -0,0 +1,17 @@
+import qrcodeTerminal from 'qrcode-terminal';
+
+export async function renderQrAscii(text, { small = true } = {}) {
+  const qrText = String(text ?? '');
+  if (!qrText) return { ok: false, lines: [], error: 'empty QR payload' };
+  try {
+    const out = await new Promise((resolvePromise) => {
+      qrcodeTerminal.generate(qrText, { small: Boolean(small) }, (qr) => resolvePromise(String(qr ?? '')));
+    });
+    // Important: keep whitespace; scanners rely on quiet-zone padding.
+    const lines = String(out ?? '').replace(/\r/g, '').split('\n');
+    return { ok: true, lines, error: null };
+  } catch (e) {
+    return { ok: false, lines: [], error: e instanceof Error ? e.message : String(e) };
+  }
+}
+

package/scripts/utils/ui/text.mjs

@@ -0,0 +1,16 @@
+export function stripAnsi(s) {
+  // eslint-disable-next-line no-control-regex
+  return String(s ?? '').replace(/\x1b\[[0-9;]*[A-Za-z]/g, '');
+}
+
+export function padRight(s, n) {
+  const str = String(s ?? '');
+  if (str.length >= n) return str.slice(0, n);
+  return str + ' '.repeat(n - str.length);
+}
+
+export function parsePrefixedLabel(line) {
+  const m = String(line ?? '').match(/^\[([^\]]+)\]\s*/);
+  return m ? m[1] : null;
+}
+

package/scripts/utils/validate.mjs

@@ -1,6 +1,6 @@
 import { readFileSync } from 'node:fs';
 import { join, resolve, sep } from 'node:path';
-import { getComponentsDir } from './paths.mjs';
+import { getComponentsDir } from './paths/paths.mjs';
 
 function isInside(path, dir) {
   const p = resolve(path);

package/scripts/where.mjs

@@ -1,15 +1,15 @@
-import './utils/env.mjs';
+import './utils/env/env.mjs';
 
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 
 import { parseArgs } from './utils/cli/args.mjs';
-import { expandHome } from './utils/canonical_home.mjs';
-import { getComponentsDir, getComponentDir, getHappyStacksHomeDir, getRootDir, getStackLabel, getStackName, getWorkspaceDir, resolveStackEnvPath } from './utils/paths.mjs';
+import { expandHome } from './utils/paths/canonical_home.mjs';
+import { getComponentsDir, getComponentDir, getHappyStacksHomeDir, getRootDir, getStackLabel, getStackName, getWorkspaceDir, resolveStackEnvPath } from './utils/paths/paths.mjs';
 import { printResult, wantsHelp, wantsJson } from './utils/cli/cli.mjs';
-import { getRuntimeDir } from './utils/runtime.mjs';
-import { getCanonicalHomeDir, getCanonicalHomeEnvPath } from './utils/config.mjs';
-import { getSandboxDir } from './utils/sandbox.mjs';
+import { getRuntimeDir } from './utils/paths/runtime.mjs';
+import { getCanonicalHomeDir, getCanonicalHomeEnvPath } from './utils/env/config.mjs';
+import { getSandboxDir } from './utils/env/sandbox.mjs';
 
 function getHomeEnvPaths() {
   const homeDir = getHappyStacksHomeDir();