@happier-dev/stack 0.2.0 → 0.2.1-preview.1775586714.26562

package/scripts/utils/server/apply_server_light_env_defaults.test.mjs

@@ -0,0 +1,25 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import { applyServerLightEnvDefaults } from './apply_server_light_env_defaults.mjs';
+
+test('applyServerLightEnvDefaults expands ~/ light-server path overrides against HOME', () => {
+  const serverEnv = {};
+
+  applyServerLightEnvDefaults({
+    baseEnv: {
+      HOME: '/scoped/home',
+      HAPPIER_SERVER_LIGHT_DATA_DIR: '~/server-light',
+      HAPPIER_SERVER_LIGHT_FILES_DIR: '~/server-light/files-override',
+      HAPPIER_SERVER_LIGHT_DB_DIR: '~/server-light/db-override',
+    },
+    serverEnv,
+    baseDir: '/stack/base',
+  });
+
+  assert.deepEqual(serverEnv, {
+    HAPPIER_SERVER_LIGHT_DATA_DIR: '/scoped/home/server-light',
+    HAPPIER_SERVER_LIGHT_FILES_DIR: '/scoped/home/server-light/files-override',
+    HAPPIER_SERVER_LIGHT_DB_DIR: '/scoped/home/server-light/db-override',
+  });
+});

package/scripts/utils/server/urls.mjs

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync } from 'node:fs';
 
-import { getStackName, resolveStackEnvPath } from '../paths/paths.mjs';
+import { getStackName, resolveActiveStackEnvFilePath } from '../paths/paths.mjs';
 import { preferStackLocalhostUrl } from '../paths/localhost_host.mjs';
 import { resolvePublicServerUrl } from '../../tailscale.mjs';
 import { resolveServerPortFromEnv } from './port.mjs';
@@ -9,8 +9,7 @@ import { normalizeUrlNoTrailingSlash } from '../net/url.mjs';
 function stackEnvExplicitlySetsPublicUrl({ env, stackName }) {
   try {
     const envPath =
-      (env.HAPPIER_STACK_ENV_FILE ?? '').toString().trim() ||
-      resolveStackEnvPath(stackName).envPath;
+      resolveActiveStackEnvFilePath(stackName, env);
     if (!envPath || !existsSync(envPath)) return false;
     const raw = readFileSync(envPath, 'utf-8');
     return /^HAPPIER_PUBLIC_SERVER_URL=/m.test(raw) || /^HAPPIER_STACK_SERVER_URL=/m.test(raw);
@@ -22,8 +21,7 @@ function stackEnvExplicitlySetsPublicUrl({ env, stackName }) {
 function stackEnvExplicitlySetsWebappUrl({ env, stackName }) {
   try {
     const envPath =
-      (env.HAPPIER_STACK_ENV_FILE ?? '').toString().trim() ||
-      resolveStackEnvPath(stackName).envPath;
+      resolveActiveStackEnvFilePath(stackName, env);
     if (!envPath || !existsSync(envPath)) return false;
     const raw = readFileSync(envPath, 'utf-8');
     return /^HAPPIER_WEBAPP_URL=/m.test(raw);

package/scripts/utils/server/urls.test.mjs

@@ -1,6 +1,6 @@
 import test from 'node:test';
 import assert from 'node:assert/strict';
-import { mkdtemp, writeFile } from 'node:fs/promises';
+import { mkdir, mkdtemp, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { tmpdir } from 'node:os';
 
@@ -49,3 +49,24 @@ test('getPublicServerUrlEnvOverride falls back to HAPPIER_STACK_SERVER_URL when
   assert.equal(out.envPublicUrl, 'https://stack-share.example.test');
   assert.equal(out.publicServerUrl, 'https://stack-share.example.test');
 });
+
+test('getPublicServerUrlEnvOverride expands ~/ explicit env file overrides against HOME', async () => {
+  const dir = await mkdtemp(join(tmpdir(), 'hstack-server-urls-'));
+  const homeDir = join(dir, 'home');
+  const envPath = join(homeDir, '.happier', 'stacks', 'dev', 'env');
+  await mkdir(join(homeDir, '.happier', 'stacks', 'dev'), { recursive: true });
+  await writeFile(envPath, 'HAPPIER_STACK_SERVER_URL=https://stack-share.example.test\n', 'utf-8');
+
+  const out = getPublicServerUrlEnvOverride({
+    env: {
+      HOME: homeDir,
+      HAPPIER_STACK_STACK: 'dev',
+      HAPPIER_STACK_ENV_FILE: '~/.happier/stacks/dev/env',
+      HAPPIER_STACK_SERVER_URL: 'https://stack-share.example.test',
+    },
+    serverPort: 3005,
+  });
+
+  assert.equal(out.envPublicUrl, 'https://stack-share.example.test');
+  assert.equal(out.publicServerUrl, 'https://stack-share.example.test');
+});

package/scripts/utils/service/stack_autostart_resolution.mjs

@@ -1,13 +1,18 @@
 import { basename, join } from 'node:path';
+import { expandHome } from '../paths/canonical_home.mjs';
 
 export function resolveAutostartEnvFilePath({
   mode,
   explicitEnvFilePath,
   defaultMainEnvFilePath,
   systemUserHomeDir,
+  homeDir,
 } = {}) {
   const explicit = String(explicitEnvFilePath ?? '').trim();
-  if (explicit) return explicit;
+  if (explicit) {
+    const scopedHomeDir = String(homeDir ?? '').trim();
+    return scopedHomeDir ? expandHome(explicit, { HOME: scopedHomeDir, USERPROFILE: scopedHomeDir }) : explicit;
+  }
 
   const m = String(mode ?? '').trim().toLowerCase() === 'system' ? 'system' : 'user';
   const home = String(systemUserHomeDir ?? '').trim();
@@ -74,4 +79,3 @@ export function resolveAutostartLogPaths({
     stderrPath: String(defaultStderrPath ?? '').trim(),
   };
 }
-

package/scripts/utils/service/stack_autostart_resolution.test.mjs

@@ -19,6 +19,19 @@ test('resolveAutostartEnvFilePath prefers explicit HAPPIER_STACK_ENV_FILE overri
   );
 });
 
+test('resolveAutostartEnvFilePath expands ~/ explicit overrides against the provided home dir', () => {
+  assert.equal(
+    resolveAutostartEnvFilePath({
+      mode: 'user',
+      explicitEnvFilePath: '~/.happier/stacks/main/env',
+      defaultMainEnvFilePath: '/root/.happier/stacks/main/env',
+      systemUserHomeDir: '',
+      homeDir: '/scoped/home',
+    }),
+    '/scoped/home/.happier/stacks/main/env'
+  );
+});
+
 test('resolveAutostartEnvFilePath uses system user home when installing a system service', () => {
   assert.equal(
     resolveAutostartEnvFilePath({
@@ -114,4 +127,3 @@ test('resolveAutostartLogPaths uses system user home for system mode when storag
   assert.equal(res.stdoutPath, '/home/happier/.happier/stacks/main/logs/happier-stack.out.log');
   assert.equal(res.stderrPath, '/home/happier/.happier/stacks/main/logs/happier-stack.err.log');
 });
-

package/scripts/utils/stack/context.mjs

@@ -1,4 +1,4 @@
-import { getStackName, resolveStackEnvPath } from '../paths/paths.mjs';
+import { getStackName, resolveActiveStackEnvFilePath } from '../paths/paths.mjs';
 import { getStackRuntimeStatePath } from './runtime_state.mjs';
 
 export function resolveStackContext({ env = process.env, autostart = null } = {}) {
@@ -6,8 +6,7 @@ export function resolveStackContext({ env = process.env, autostart = null } = {}
   const stackName = explicitStack || (autostart?.stackName ?? '') || getStackName(env);
   const stackMode = Boolean(explicitStack);
 
-  const envPath =
-    (env.HAPPIER_STACK_ENV_FILE ?? '').toString().trim() || resolveStackEnvPath(stackName, env).envPath;
+  const envPath = resolveActiveStackEnvFilePath(stackName, env);
 
   const runtimeStatePath =
     (env.HAPPIER_STACK_RUNTIME_STATE_PATH ?? '').toString().trim() || getStackRuntimeStatePath(stackName);

package/scripts/utils/stack/context.test.mjs

@@ -0,0 +1,18 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+
+import { resolveStackContext } from './context.mjs';
+
+test('resolveStackContext expands ~/ explicit env file overrides against HOME', () => {
+  const out = resolveStackContext({
+    env: {
+      HOME: '/scoped/home',
+      HAPPIER_STACK_STACK: 'dev',
+      HAPPIER_STACK_ENV_FILE: '~/.happier/stacks/dev/env',
+    },
+  });
+
+  assert.equal(out.stackMode, true);
+  assert.equal(out.stackName, 'dev');
+  assert.equal(out.envPath, '/scoped/home/.happier/stacks/dev/env');
+});

package/scripts/utils/stack/dirs.mjs

@@ -4,23 +4,23 @@ import { expandHome } from '../paths/canonical_home.mjs';
 import { getDefaultAutostartPaths } from '../paths/paths.mjs';
 
 export function getCliHomeDirFromEnvOrDefault({ stackBaseDir, env }) {
-  const fromEnv = (env?.HAPPIER_STACK_CLI_HOME_DIR ?? '').trim();
+  const fromEnv = expandHome((env?.HAPPIER_STACK_CLI_HOME_DIR ?? '').trim(), env);
   return fromEnv || join(stackBaseDir, 'cli');
 }
 
 export function getServerLightDataDirFromEnvOrDefault({ stackBaseDir, env }) {
-  const fromEnv = (env?.HAPPIER_SERVER_LIGHT_DATA_DIR ?? '').trim();
+  const fromEnv = expandHome((env?.HAPPIER_SERVER_LIGHT_DATA_DIR ?? '').trim(), env);
   return fromEnv || join(stackBaseDir, 'server-light');
 }
 
 export function resolveCliHomeDir(env = process.env) {
   const fromExplicit = (env.HAPPIER_HOME_DIR ?? '').trim();
   if (fromExplicit) {
-    return expandHome(fromExplicit);
+    return expandHome(fromExplicit, env);
   }
   const fromStacks = (env.HAPPIER_STACK_CLI_HOME_DIR ?? '').trim();
   if (fromStacks) {
-    return expandHome(fromStacks);
+    return expandHome(fromStacks, env);
   }
   return join(getDefaultAutostartPaths().baseDir, 'cli');
 }

package/scripts/utils/stack/dirs.test.mjs

@@ -0,0 +1,33 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+
+import {
+  getCliHomeDirFromEnvOrDefault,
+  getServerLightDataDirFromEnvOrDefault,
+} from './dirs.mjs';
+
+test('getCliHomeDirFromEnvOrDefault expands ~/ overrides against HOME', () => {
+  assert.equal(
+    getCliHomeDirFromEnvOrDefault({
+      stackBaseDir: '/stack/base',
+      env: {
+        HOME: '/scoped/home',
+        HAPPIER_STACK_CLI_HOME_DIR: '~/cli-home',
+      },
+    }),
+    '/scoped/home/cli-home',
+  );
+});
+
+test('getServerLightDataDirFromEnvOrDefault expands ~/ overrides against HOME', () => {
+  assert.equal(
+    getServerLightDataDirFromEnvOrDefault({
+      stackBaseDir: '/stack/base',
+      env: {
+        HOME: '/scoped/home',
+        HAPPIER_SERVER_LIGHT_DATA_DIR: '~/server-light',
+      },
+    }),
+    '/scoped/home/server-light',
+  );
+});

package/scripts/utils/stack/stop.mjs

@@ -2,7 +2,7 @@ import { existsSync } from 'node:fs';
 import { readdir, readFile } from 'node:fs/promises';
 import { join } from 'node:path';
 
-import { getComponentDir } from '../paths/paths.mjs';
+import { getComponentDir, resolveExplicitStackEnvFilePath } from '../paths/paths.mjs';
 import { isPidAlive, killPid, readPidState } from '../expo/expo.mjs';
 import { stopLocalDaemon } from '../../daemon.mjs';
 import { stopHappyServerManagedInfra } from '../server/infra/happy_server_infra.mjs';
@@ -170,7 +170,7 @@ export async function stopStackWithEnv({
   const cliHomeDir = (env.HAPPIER_STACK_CLI_HOME_DIR ?? join(baseDir, 'cli')).toString();
   const cliDir = getComponentDir(rootDir, 'happier-cli', env);
   const cliBin = join(cliDir, 'bin', 'happier.mjs');
-  const envPath = (env.HAPPIER_STACK_ENV_FILE ?? '').toString();
+  const envPath = resolveExplicitStackEnvFilePath(env);
   const selfPgid = await getProcessGroupId(process.pid);
 
   // Preferred: stop stack-started processes (by PID) recorded in stack.runtime.json.

package/scripts/where.mjs

@@ -4,8 +4,18 @@ import { existsSync } from 'node:fs';
 import { join } from 'node:path';
 
 import { parseArgs } from './utils/cli/args.mjs';
-import { expandHome } from './utils/paths/canonical_home.mjs';
-import { getComponentDir, getDevRepoDir, getHappyStacksHomeDir, getRepoDir, getRootDir, getStackLabel, getStackName, getWorkspaceDir, resolveStackEnvPath } from './utils/paths/paths.mjs';
+import {
+  getComponentDir,
+  getDevRepoDir,
+  getHappyStacksHomeDir,
+  getRepoDir,
+  getRootDir,
+  getStackLabel,
+  getStackName,
+  getWorkspaceDir,
+  resolveExplicitStackEnvFilePath,
+  resolveStackEnvPath,
+} from './utils/paths/paths.mjs';
 import { printResult, wantsHelp, wantsJson } from './utils/cli/cli.mjs';
 import { getRuntimeDir } from './utils/paths/runtime.mjs';
 import { getCanonicalHomeDir, getCanonicalHomeEnvPath } from './utils/env/config.mjs';
@@ -52,8 +62,9 @@ async function main() {
   const stackName = getStackName();
   const stackLabel = getStackLabel(stackName);
   const resolvedMainEnv = resolveStackEnvPath('main');
-  const resolvedActiveEnv = process.env.HAPPIER_STACK_ENV_FILE?.trim()
-    ? { envPath: expandHome(process.env.HAPPIER_STACK_ENV_FILE.trim()) }
+  const explicitEnvPath = resolveExplicitStackEnvFilePath(process.env);
+  const resolvedActiveEnv = explicitEnvPath
+    ? { envPath: explicitEnvPath }
     : null;
 
   const { homeEnv, homeLocal } = getHomeEnvPaths();

package/scripts/worktrees.mjs

@@ -13,6 +13,7 @@ import {
   getRootDir,
   getRepoDir,
   getWorkspaceDir,
+  resolveExplicitStackEnvFilePath,
   resolveStackEnvPath,
 } from './utils/paths/paths.mjs';
 import {
@@ -615,7 +616,7 @@ async function cmdUse({ rootDir, args, flags }) {
   }
 
   const workspaceDir = getWorkspaceDir(rootDir);
-  const envPath = process.env.HAPPIER_STACK_ENV_FILE?.trim() ? process.env.HAPPIER_STACK_ENV_FILE.trim() : null;
+  const envPath = resolveExplicitStackEnvFilePath(process.env) || null;
 
   if (spec === 'default' || spec === 'main') {
     const repoDir = getDefaultRepoDir(rootDir);