@happier-dev/stack 0.1.0-preview.5.1

package/scripts/swiftbar_render_monorepo_wt_actions.integration.test.mjs

@@ -0,0 +1,116 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { spawn } from 'node:child_process';
+import { mkdtemp, mkdir, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+function run(cmd, args, { cwd, env } = {}) {
+  return new Promise((resolve, reject) => {
+    const proc = spawn(cmd, args, { cwd, env, stdio: ['ignore', 'pipe', 'pipe'] });
+    let stdout = '';
+    let stderr = '';
+    proc.stdout.on('data', (d) => (stdout += String(d)));
+    proc.stderr.on('data', (d) => (stderr += String(d)));
+    proc.on('error', reject);
+    proc.on('exit', (code, signal) => resolve({ code: code ?? (signal ? 1 : 0), signal: signal ?? null, stdout, stderr }));
+  });
+}
+
+async function git(cwd, args) {
+  const res = await run('git', args, { cwd });
+  assert.equal(res.code, 0, `git ${args.join(' ')} failed\nstdout:\n${res.stdout}\nstderr:\n${res.stderr}`);
+  return res.stdout.trim();
+}
+
+function findMenuLine(stdout, marker) {
+  return String(stdout ?? '')
+    .split('\n')
+    .find((line) => line.includes(marker));
+}
+
+test('swiftbar: monorepo stacks use repo-scoped worktree actions (no component args)', async (t) => {
+  const scriptsDir = dirname(fileURLToPath(import.meta.url));
+  const rootDir = dirname(scriptsDir);
+  const tmp = await mkdtemp(join(tmpdir(), 'happy-stacks-swiftbar-mono-wt-'));
+  t.after(async () => {
+    await rm(tmp, { recursive: true, force: true }).catch(() => {});
+  });
+
+  const workspaceDir = join(tmp, 'workspace');
+  const monorepoRoot = join(workspaceDir, 'main');
+  const appPkg = join(monorepoRoot, 'apps', 'ui');
+  const cliPkg = join(monorepoRoot, 'apps', 'cli');
+  const serverPkg = join(monorepoRoot, 'apps', 'server');
+  await mkdir(appPkg, { recursive: true });
+  await mkdir(cliPkg, { recursive: true });
+  await mkdir(serverPkg, { recursive: true });
+  await writeFile(join(appPkg, 'README.md'), 'app\n', 'utf-8');
+  await writeFile(join(cliPkg, 'README.md'), 'cli\n', 'utf-8');
+  await writeFile(join(serverPkg, 'README.md'), 'server\n', 'utf-8');
+
+  await git(monorepoRoot, ['init']);
+  await git(monorepoRoot, ['add', '.']);
+  await git(monorepoRoot, ['-c', 'user.name=test', '-c', 'user.email=test@example.com', 'commit', '-m', 'init']);
+
+  const wtPath = join(workspaceDir, 'pr', 'foo');
+  await mkdir(join(workspaceDir, 'pr'), { recursive: true });
+  await git(monorepoRoot, ['worktree', 'add', '-b', 'pr/foo', wtPath, 'HEAD']);
+
+  const stackDir = join(tmp, 'stack');
+  await mkdir(stackDir, { recursive: true });
+  const envFile = join(stackDir, 'env');
+  await writeFile(
+    envFile,
+    [
+      `HAPPIER_STACK_REPO_DIR=${monorepoRoot}`,
+      '',
+    ].join('\n'),
+    'utf-8'
+  );
+
+  const bashScript = [
+    `set -euo pipefail`,
+    `export HAPPIER_STACK_SWIFTBAR_GIT_MODE=live`,
+    `export HAPPIER_STACK_WORKSPACE_DIR="${workspaceDir}"`,
+    `export HAPPIER_STACK_CLI_ROOT_DIR="${rootDir}"`,
+    `export hstack_BIN="/bin/echo"`,
+    `export hstack_TERM="/bin/echo"`,
+    `export hstack_ROOT_DIR="${rootDir}"`,
+    `source "${rootDir}/extras/swiftbar/lib/utils.sh"`,
+    `source "${rootDir}/extras/swiftbar/lib/icons.sh"`,
+    `source "${rootDir}/extras/swiftbar/lib/git.sh"`,
+    `source "${rootDir}/extras/swiftbar/lib/render.sh"`,
+    `render_component_repo "" "happier-cli" "stack" "exp1" "${envFile}" "${monorepoRoot}"`,
+  ].join('\n');
+
+  const res = await run('bash', ['-lc', bashScript], { cwd: rootDir, env: process.env });
+  assert.equal(res.code, 0, `expected bash exit 0, got ${res.code}\nstdout:\n${res.stdout}\nstderr:\n${res.stderr}`);
+
+  const statusLine = findMenuLine(res.stdout, 'Status (active) |');
+  assert.ok(statusLine, `expected status action line\n${res.stdout}`);
+  assert.ok(statusLine.includes('param1=stack'), statusLine);
+  assert.ok(statusLine.includes('param2=wt'), statusLine);
+  assert.ok(statusLine.includes('param3=exp1'), statusLine);
+  assert.ok(statusLine.includes('param5=status'), statusLine);
+  assert.ok(statusLine.includes('param6=active'), statusLine);
+
+  assert.ok(
+    !/param5=(status|sync|update)\s+param\d+=happier-(ui|cli|server|server-light)\b/.test(res.stdout),
+    `expected no component identifiers passed to wt actions\n${res.stdout}`
+  );
+
+  const useInteractiveLine = findMenuLine(res.stdout, 'Use worktree in stack (interactive) |');
+  assert.ok(useInteractiveLine, `expected stack-scoped interactive wt selector\n${res.stdout}`);
+  assert.ok(useInteractiveLine.includes('param1=stack'), useInteractiveLine);
+  assert.ok(useInteractiveLine.includes('param2=wt'), useInteractiveLine);
+  assert.ok(useInteractiveLine.includes('param3=exp1'), useInteractiveLine);
+  assert.ok(useInteractiveLine.includes('param5=use'), useInteractiveLine);
+  assert.ok(useInteractiveLine.includes('param6=--interactive'), useInteractiveLine);
+
+  assert.ok(
+    !/PR worktree \(prompt\).*param\d+=happier-(ui|cli|server|server-light)\b/.test(res.stdout),
+    `expected PR worktree helper to not pass component identifiers\n${res.stdout}`
+  );
+});

package/scripts/swiftbar_utils_cmd.test.mjs

@@ -0,0 +1,92 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { spawn } from 'node:child_process';
+import { mkdtemp, mkdir, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+function run(cmd, args, { cwd, env } = {}) {
+  return new Promise((resolve, reject) => {
+    const proc = spawn(cmd, args, { cwd, env, stdio: ['ignore', 'pipe', 'pipe'] });
+    let stdout = '';
+    let stderr = '';
+    proc.stdout.on('data', (d) => (stdout += String(d)));
+    proc.stderr.on('data', (d) => (stderr += String(d)));
+    proc.on('error', reject);
+    proc.on('exit', (code, signal) => resolve({ code: code ?? (signal ? 1 : 0), signal: signal ?? null, stdout, stderr }));
+  });
+}
+
+test('swiftbar utils: sums process metrics (cpu + mem)', async () => {
+  const scriptsDir = dirname(fileURLToPath(import.meta.url));
+  const rootDir = dirname(scriptsDir);
+  const bashScript = [
+    `set -euo pipefail`,
+    `source "${rootDir}/extras/swiftbar/lib/utils.sh"`,
+    `out="$(swiftbar_sum_metrics_cpu_mem "1.5|100|00:01" "2.25|50|00:02" "" "-")"`,
+    `echo "$out"`,
+  ].join('\n');
+  const res = await run('bash', ['-lc', bashScript], { cwd: rootDir, env: process.env });
+  assert.equal(
+    res.code,
+    0,
+    `expected bash exit 0, got ${res.code}\nstdout:\n${res.stdout}\nstderr:\n${res.stderr}`
+  );
+  assert.equal(res.stdout.trim(), '3.8|150', `expected cpu|mem sum, got: ${res.stdout.trim()}`);
+});
+
+test('swiftbar utils: derives worktree spec from path', async () => {
+  const scriptsDir = dirname(fileURLToPath(import.meta.url));
+  const rootDir = dirname(scriptsDir);
+  const bashScript = [
+    `set -euo pipefail`,
+    `export HAPPIER_STACK_WORKSPACE_DIR="/x"`,
+    `source "${rootDir}/extras/swiftbar/lib/utils.sh"`,
+    `echo "$(swiftbar_worktree_spec_from_path "/x/main" "happier")"`,
+    `echo "$(swiftbar_worktree_spec_from_path "/x/pr/foo" "happier")"`,
+    `v="$(swiftbar_worktree_spec_from_path "/x/other/place" "happier")"`,
+    `printf '%s\\n' "$v"`,
+  ].join('\n');
+  const res = await run('bash', ['-lc', bashScript], { cwd: rootDir, env: process.env });
+  assert.equal(res.code, 0, `expected bash exit 0, got ${res.code}\nstdout:\n${res.stdout}\nstderr:\n${res.stderr}`);
+  assert.equal(res.stdout, 'main\npr/foo\n\n', `unexpected output:\n${res.stdout}`);
+});
+
+test('swiftbar utils: finds git root by walking up from nested package dir', async (t) => {
+  const scriptsDir = dirname(fileURLToPath(import.meta.url));
+  const rootDir = dirname(scriptsDir);
+  const tmp = await mkdtemp(join(tmpdir(), 'happier-stack-swiftbar-utils-'));
+  t.after(async () => {
+    await rm(tmp, { recursive: true, force: true }).catch(() => {});
+  });
+  const repoRoot = join(tmp, 'repo');
+  const pkgDir = join(repoRoot, 'apps', 'ui');
+  await mkdir(join(repoRoot, '.git'), { recursive: true });
+  await mkdir(pkgDir, { recursive: true });
+
+  const bashScript = [
+    `set -euo pipefail`,
+    `source "${rootDir}/extras/swiftbar/lib/utils.sh"`,
+    `echo "$(swiftbar_find_git_root_upwards "${pkgDir}")"`,
+  ].join('\n');
+  const res = await run('bash', ['-lc', bashScript], { cwd: rootDir, env: process.env });
+  assert.equal(res.code, 0, `expected bash exit 0, got ${res.code}\nstdout:\n${res.stdout}\nstderr:\n${res.stderr}`);
+  assert.equal(res.stdout.trim(), repoRoot);
+});
+
+test('swiftbar utils: derives repo key from component dir path', async () => {
+  const scriptsDir = dirname(fileURLToPath(import.meta.url));
+  const rootDir = dirname(scriptsDir);
+  const bashScript = [
+    `set -euo pipefail`,
+    `export HAPPIER_STACK_WORKSPACE_DIR="/x"`,
+    `source "${rootDir}/extras/swiftbar/lib/utils.sh"`,
+    `echo "$(swiftbar_repo_key_from_path "/x/main/apps/ui")"`,
+    `echo "$(swiftbar_repo_key_from_path "/x/pr/foo/apps/ui")"`,
+    `echo "$(swiftbar_repo_key_from_path "/x/other/place")"`,
+  ].join('\n');
+  const res = await run('bash', ['-lc', bashScript], { cwd: rootDir, env: process.env });
+  assert.equal(res.code, 0, `expected bash exit 0, got ${res.code}\nstdout:\n${res.stdout}\nstderr:\n${res.stderr}`);
+  assert.equal(res.stdout, 'happier\nhappier\n\n');
+});

package/scripts/swiftbar_wt_pr_backcompat.test.mjs

@@ -0,0 +1,162 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { mkdtemp, mkdir, readFile, rm, writeFile, chmod, copyFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { spawn } from 'node:child_process';
+
+function run(cmd, args, { cwd, env } = {}) {
+  return new Promise((resolve, reject) => {
+    const proc = spawn(cmd, args, { cwd, env, stdio: ['ignore', 'pipe', 'pipe'] });
+    let stdout = '';
+    let stderr = '';
+    proc.stdout.on('data', (d) => (stdout += String(d)));
+    proc.stderr.on('data', (d) => (stderr += String(d)));
+    proc.on('error', reject);
+    proc.on('exit', (code, signal) => resolve({ code: code ?? (signal ? 1 : 0), signal: signal ?? null, stdout, stderr }));
+  });
+}
+
+test('swiftbar wt-pr falls back to legacy component form when modern invocation fails', async () => {
+  const scriptsDir = dirname(fileURLToPath(import.meta.url));
+  const rootDir = dirname(scriptsDir);
+  const sourceScript = join(rootDir, 'extras', 'swiftbar', 'wt-pr.sh');
+
+  const tmp = await mkdtemp(join(tmpdir(), 'hstack-swiftbar-wt-pr-'));
+  try {
+    const scriptDir = join(tmp, 'swiftbar');
+    const binDir = join(tmp, 'bin');
+    const logPath = join(tmp, 'hstack.log');
+    await mkdir(scriptDir, { recursive: true });
+    await mkdir(binDir, { recursive: true });
+
+    const scriptPath = join(scriptDir, 'wt-pr.sh');
+    await copyFile(sourceScript, scriptPath);
+    await chmod(scriptPath, 0o755);
+
+    const hstackWrapper = join(scriptDir, 'hstack.sh');
+    await writeFile(
+      hstackWrapper,
+      [
+        '#!/bin/sh',
+        'set -eu',
+        'printf "%s\\n" "$*" >> "${HSTACK_LOG_PATH:?}"',
+        '# Fail modern signature (no component arg), succeed legacy signature with component.',
+        'if [ "$1" = "wt" ] && [ "$2" = "pr" ] && [ "${3:-}" != "happier-ui" ]; then',
+        '  exit 1',
+        'fi',
+        'exit 0',
+        '',
+      ].join('\n'),
+      'utf-8'
+    );
+    await chmod(hstackWrapper, 0o755);
+
+    const osascriptPath = join(binDir, 'osascript');
+    await writeFile(
+      osascriptPath,
+      [
+        '#!/bin/sh',
+        'set -eu',
+        'script="$(cat)"',
+        'case "$script" in',
+        '  *"PR URL or number:"*) echo "123" ;;',
+        '  *"Remote to fetch PR from:"*) echo "upstream" ;;',
+        '  *"Choose component:"*) echo "happier-ui" ;;',
+        '  *) echo "" ;;',
+        'esac',
+        '',
+      ].join('\n'),
+      'utf-8'
+    );
+    await chmod(osascriptPath, 0o755);
+
+    const res = await run(scriptPath, [], {
+      cwd: scriptDir,
+      env: {
+        ...process.env,
+        PATH: `${binDir}:${process.env.PATH ?? ''}`,
+        HSTACK_LOG_PATH: logPath,
+      },
+    });
+
+    assert.equal(res.code, 0, `expected exit 0\nstdout:\n${res.stdout}\nstderr:\n${res.stderr}`);
+    const calls = await readFile(logPath, 'utf-8');
+    assert.match(calls, /^wt pr 123 --remote=upstream --use/m);
+    assert.match(calls, /^wt pr happier-ui 123 --remote=upstream --use/m);
+    assert.match(res.stderr, /legacy component/i);
+  } finally {
+    await rm(tmp, { recursive: true, force: true });
+  }
+});
+
+test('swiftbar wt-pr treats legacy component prompt cancel as a no-op exit 0', async () => {
+  const scriptsDir = dirname(fileURLToPath(import.meta.url));
+  const rootDir = dirname(scriptsDir);
+  const sourceScript = join(rootDir, 'extras', 'swiftbar', 'wt-pr.sh');
+
+  const tmp = await mkdtemp(join(tmpdir(), 'hstack-swiftbar-wt-pr-cancel-'));
+  try {
+    const scriptDir = join(tmp, 'swiftbar');
+    const binDir = join(tmp, 'bin');
+    const logPath = join(tmp, 'hstack.log');
+    await mkdir(scriptDir, { recursive: true });
+    await mkdir(binDir, { recursive: true });
+
+    const scriptPath = join(scriptDir, 'wt-pr.sh');
+    await copyFile(sourceScript, scriptPath);
+    await chmod(scriptPath, 0o755);
+
+    const hstackWrapper = join(scriptDir, 'hstack.sh');
+    await writeFile(
+      hstackWrapper,
+      [
+        '#!/bin/sh',
+        'set -eu',
+        'printf "%s\\n" "$*" >> "${HSTACK_LOG_PATH:?}"',
+        'exit 1',
+        '',
+      ].join('\n'),
+      'utf-8'
+    );
+    await chmod(hstackWrapper, 0o755);
+
+    const osascriptPath = join(binDir, 'osascript');
+    await writeFile(
+      osascriptPath,
+      [
+        '#!/bin/sh',
+        'set -eu',
+        'script="$(cat)"',
+        'case "$script" in',
+        '  *"PR URL or number:"*) echo "123" ;;',
+        '  *"Remote to fetch PR from:"*) echo "upstream" ;;',
+        '  *"Choose component:"*) echo "" ;;',
+        '  *) echo "" ;;',
+        'esac',
+        '',
+      ].join('\n'),
+      'utf-8'
+    );
+    await chmod(osascriptPath, 0o755);
+
+    const res = await run(scriptPath, [], {
+      cwd: scriptDir,
+      env: {
+        ...process.env,
+        PATH: `${binDir}:${process.env.PATH ?? ''}`,
+        HSTACK_LOG_PATH: logPath,
+      },
+    });
+
+    assert.equal(res.code, 0, `expected cancellation exit 0\nstdout:\n${res.stdout}\nstderr:\n${res.stderr}`);
+    assert.doesNotMatch(
+      res.stderr,
+      /failed to create PR worktree/i,
+      `did not expect hard failure message on cancellation\nstderr:\n${res.stderr}`,
+    );
+  } finally {
+    await rm(tmp, { recursive: true, force: true });
+  }
+});

package/scripts/systemd_unit_info.test.mjs

@@ -0,0 +1,24 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+
+import * as paths from './utils/paths/paths.mjs';
+
+test('getSystemdUnitInfo returns user-mode unit path and args by default', () => {
+  assert.equal(typeof paths.getSystemdUnitInfo, 'function');
+  const info = paths.getSystemdUnitInfo();
+  assert.equal(typeof info.unitName, 'string');
+  assert.equal(typeof info.unitPath, 'string');
+  assert.ok(info.unitName.endsWith('.service'));
+  assert.ok(info.unitPath.includes('/.config/systemd/user/'));
+  assert.deepEqual(info.systemctlArgsPrefix, ['--user']);
+  assert.deepEqual(info.journalctlArgsPrefix, ['--user']);
+});
+
+test('getSystemdUnitInfo returns system-mode unit path and args', () => {
+  assert.equal(typeof paths.getSystemdUnitInfo, 'function');
+  const info = paths.getSystemdUnitInfo({ mode: 'system' });
+  assert.ok(info.unitName.endsWith('.service'));
+  assert.ok(info.unitPath.startsWith('/etc/systemd/system/'));
+  assert.deepEqual(info.systemctlArgsPrefix, []);
+  assert.deepEqual(info.journalctlArgsPrefix, []);
+});