happy-stacks 0.2.0 → 0.3.0

package/scripts/worktrees.mjs

@@ -1,18 +1,22 @@
-import './utils/env.mjs';
+import './utils/env/env.mjs';
 import { mkdir, readFile, readdir, rm, symlink, writeFile } from 'node:fs/promises';
 import { dirname, isAbsolute, join, resolve } from 'node:path';
 import { parseArgs } from './utils/cli/args.mjs';
-import { pathExists } from './utils/fs.mjs';
-import { run, runCapture } from './utils/proc.mjs';
-import { componentDirEnvKey, getComponentDir, getComponentsDir, getHappyStacksHomeDir, getRootDir, getWorkspaceDir } from './utils/paths.mjs';
-import { inferRemoteNameForOwner, parseGithubOwner } from './utils/worktrees.mjs';
+import { pathExists } from './utils/fs/fs.mjs';
+import { run, runCapture } from './utils/proc/proc.mjs';
+import { commandExists, resolveCommandPath } from './utils/proc/commands.mjs';
+import { componentDirEnvKey, getComponentDir, getComponentsDir, getHappyStacksHomeDir, getRootDir, getWorkspaceDir } from './utils/paths/paths.mjs';
+import { inferRemoteNameForOwner, parseGithubOwner } from './utils/git/worktrees.mjs';
+import { getWorktreesRoot } from './utils/git/worktrees.mjs';
+import { parseGithubPullRequest, sanitizeSlugPart } from './utils/git/refs.mjs';
+import { readTextIfExists } from './utils/fs/ops.mjs';
 import { isTty, prompt, promptSelect, withRl } from './utils/cli/wizard.mjs';
 import { printResult, wantsHelp, wantsJson } from './utils/cli/cli.mjs';
-import { ensureEnvLocalUpdated } from './utils/env_local.mjs';
-import { ensureEnvFileUpdated } from './utils/env_file.mjs';
+import { ensureEnvLocalUpdated } from './utils/env/env_local.mjs';
+import { ensureEnvFileUpdated } from './utils/env/env_file.mjs';
 import { existsSync } from 'node:fs';
-import { getHomeEnvLocalPath, getHomeEnvPath, resolveUserConfigEnvPath } from './utils/config.mjs';
-import { detectServerComponentDirMismatch } from './utils/validate.mjs';
+import { getHomeEnvLocalPath, getHomeEnvPath, resolveUserConfigEnvPath } from './utils/env/config.mjs';
+import { detectServerComponentDirMismatch } from './utils/server/validate.mjs';
 
 function getActiveStackName() {
   return (process.env.HAPPY_STACKS_STACK ?? process.env.HAPPY_LOCAL_STACK ?? '').trim() || 'main';
@@ -22,10 +26,6 @@ function isMainStack() {
   return getActiveStackName() === 'main';
 }
 
-function getWorktreesRoot(rootDir) {
-  return join(getComponentsDir(rootDir), '.worktrees');
-}
-
 function resolveComponentWorktreeDir({ rootDir, component, spec }) {
   const worktreesRoot = getWorktreesRoot(rootDir);
   const raw = (spec ?? '').trim();
@@ -51,32 +51,6 @@ function resolveComponentWorktreeDir({ rootDir, component, spec }) {
   return join(worktreesRoot, component, ...raw.split('/'));
 }
 
-function parseGithubPullRequest(input) {
-  const raw = (input ?? '').trim();
-  if (!raw) return null;
-  if (/^\d+$/.test(raw)) {
-    return { number: Number(raw), owner: null, repo: null };
-  }
-  // https://github.com/<owner>/<repo>/pull/<num>
-  const m = raw.match(/github\.com\/(?<owner>[^/]+)\/(?<repo>[^/]+)\/pull\/(?<num>\d+)/);
-  if (!m?.groups?.num) return null;
-  return {
-    number: Number(m.groups.num),
-    owner: m.groups.owner ?? null,
-    repo: m.groups.repo ?? null,
-  };
-}
-
-function sanitizeSlugPart(s) {
-  return (s ?? '')
-    .toString()
-    .trim()
-    .toLowerCase()
-    .replace(/[^a-z0-9._/-]+/g, '-')
-    .replace(/-+/g, '-')
-    .replace(/^-+|-+$/g, '');
-}
-
 async function isWorktreeClean(dir) {
   const dirty = (await git(dir, ['status', '--porcelain'])).trim();
   return !dirty;
@@ -469,13 +443,13 @@ async function cmdMigrate({ rootDir }) {
   // If the persisted config pins any component dir to a legacy location, attempt to rewrite it.
   const envUpdates = [];
 
-  // Keep in sync with scripts/utils/env_local.mjs selection logic.
+  // Keep in sync with scripts/utils/env/env_local.mjs selection logic.
   const explicitEnv = (process.env.HAPPY_STACKS_ENV_FILE ?? process.env.HAPPY_LOCAL_ENV_FILE ?? '').trim();
   const hasHomeConfig = existsSync(getHomeEnvPath()) || existsSync(getHomeEnvLocalPath());
   const envPath = explicitEnv ? explicitEnv : hasHomeConfig ? resolveUserConfigEnvPath({ cliRootDir: rootDir }) : join(rootDir, 'env.local');
 
   if (await pathExists(envPath)) {
-    const raw = await readFile(envPath, 'utf-8');
+    const raw = (await readTextIfExists(envPath)) ?? '';
     const rewrite = (v) => {
       if (!v.includes('/components/')) {
         return v;
@@ -1245,15 +1219,6 @@ async function cmdSync({ rootDir, argv }) {
   return { component, remote: remoteName, mirrorBranch, upstreamRef: `${remoteName}/${defaultBranch}` };
 }
 
-async function commandExists(cmd) {
-  try {
-    const out = (await runCapture('sh', ['-lc', `command -v ${cmd} >/dev/null 2>&1 && echo yes || echo no`])).trim();
-    return out === 'yes';
-  } catch {
-    return false;
-  }
-}
-
 async function fileExists(path) {
   try {
     return await pathExists(path);
@@ -1408,14 +1373,15 @@ async function cmdCode({ rootDir, argv }) {
   if (!(await pathExists(dir))) {
     throw new Error(`[wt] target does not exist: ${dir}`);
   }
-  if (!(await commandExists('code'))) {
+  const codePath = await resolveCommandPath('code', { cwd: rootDir, env: process.env });
+  if (!codePath) {
     throw new Error("[wt] VS Code CLI 'code' not found on PATH. In VS Code: Cmd+Shift+P → 'Shell Command: Install code command in PATH'.");
   }
   if (json) {
-    return { component, dir, cmd: 'code' };
+    return { component, dir, cmd: 'code', resolvedCmd: codePath };
   }
-  await run('code', [dir], { cwd: rootDir, env: process.env, stdio: 'inherit' });
-  return { component, dir, cmd: 'code' };
+  await run(codePath, [dir], { cwd: rootDir, env: process.env, stdio: 'inherit' });
+  return { component, dir, cmd: 'code', resolvedCmd: codePath };
 }
 
 async function cmdCursor({ rootDir, argv }) {
@@ -1432,14 +1398,20 @@ async function cmdCursor({ rootDir, argv }) {
     throw new Error(`[wt] target does not exist: ${dir}`);
   }
 
-  const hasCursorCli = await commandExists('cursor');
+  const cursorPath = await resolveCommandPath('cursor', { cwd: rootDir, env: process.env });
+  const hasCursorCli = Boolean(cursorPath);
   if (json) {
-    return { component, dir, cmd: hasCursorCli ? 'cursor' : process.platform === 'darwin' ? 'open -a Cursor' : null };
+    return {
+      component,
+      dir,
+      cmd: hasCursorCli ? 'cursor' : process.platform === 'darwin' ? 'open -a Cursor' : null,
+      resolvedCmd: cursorPath || null,
+    };
   }
 
   if (hasCursorCli) {
-    await run('cursor', [dir], { cwd: rootDir, env: process.env, stdio: 'inherit' });
-    return { component, dir, cmd: 'cursor' };
+    await run(cursorPath, [dir], { cwd: rootDir, env: process.env, stdio: 'inherit' });
+    return { component, dir, cmd: 'cursor', resolvedCmd: cursorPath };
   }
 
   if (process.platform === 'darwin') {

package/scripts/utils/server_port.mjs

@@ -1,9 +0,0 @@
-export function resolveServerPortFromEnv({ env = process.env, defaultPort = 3005 } = {}) {
-  const raw =
-    (env.HAPPY_STACKS_SERVER_PORT ?? '').toString().trim() ||
-    (env.HAPPY_LOCAL_SERVER_PORT ?? '').toString().trim() ||
-    '';
-  const n = raw ? Number(raw) : Number(defaultPort);
-  return Number.isFinite(n) && n > 0 ? n : Number(defaultPort);
-}
-

package/scripts/utils/server_urls.mjs

@@ -1,54 +0,0 @@
-import { existsSync, readFileSync } from 'node:fs';
-
-import { getStackName, resolveStackEnvPath } from './paths.mjs';
-import { resolvePublicServerUrl } from '../tailscale.mjs';
-import { resolveServerPortFromEnv } from './server_port.mjs';
-
-function stackEnvExplicitlySetsPublicUrl({ env, stackName }) {
-  try {
-    const envPath =
-      (env.HAPPY_STACKS_ENV_FILE ?? env.HAPPY_LOCAL_ENV_FILE ?? '').toString().trim() ||
-      resolveStackEnvPath(stackName).envPath;
-    if (!envPath || !existsSync(envPath)) return false;
-    const raw = readFileSync(envPath, 'utf-8');
-    return /^(HAPPY_STACKS_SERVER_URL|HAPPY_LOCAL_SERVER_URL)=/m.test(raw);
-  } catch {
-    return false;
-  }
-}
-
-export function getPublicServerUrlEnvOverride({ env = process.env, serverPort } = {}) {
-  const defaultPublicUrl = `http://localhost:${serverPort}`;
-  const stackName = (env.HAPPY_STACKS_STACK ?? env.HAPPY_LOCAL_STACK ?? '').toString().trim() || getStackName();
-
-  let envPublicUrl =
-    (env.HAPPY_STACKS_SERVER_URL ?? env.HAPPY_LOCAL_SERVER_URL ?? '').toString().trim() || '';
-
-  // Safety: for non-main stacks, ignore a global SERVER_URL unless it was explicitly set in the stack env file.
-  if (stackName !== 'main' && envPublicUrl && !stackEnvExplicitlySetsPublicUrl({ env, stackName })) {
-    envPublicUrl = '';
-  }
-
-  return { defaultPublicUrl, envPublicUrl, publicServerUrl: envPublicUrl || defaultPublicUrl };
-}
-
-export async function resolveServerUrls({ env = process.env, serverPort, allowEnable = true } = {}) {
-  const internalServerUrl = `http://127.0.0.1:${serverPort}`;
-  const { defaultPublicUrl, envPublicUrl } = getPublicServerUrlEnvOverride({ env, serverPort });
-  const resolved = await resolvePublicServerUrl({
-    internalServerUrl,
-    defaultPublicUrl,
-    envPublicUrl,
-    allowEnable,
-  });
-  return {
-    internalServerUrl,
-    defaultPublicUrl,
-    envPublicUrl,
-    publicServerUrl: resolved.publicServerUrl,
-    publicServerUrlSource: resolved.source,
-  };
-}
-
-export { resolveServerPortFromEnv };
-