@moneysiren/app 0.1.0-alpha.11 → 0.1.0-alpha.12

package/README.md

@@ -12,19 +12,19 @@ msiren start
 msiren hud
 ```
 
-The package installs both commands:
+The package creates both global command shims during postinstall:
 
 - `moneysiren`
 - `msiren`
 
-If npm reports `EEXIST` for `moneysiren` or `msiren`, an older global MoneySiren install left command shims behind. Remove the old global packages and reinstall:
+If npm reports `EEXIST` for `moneysiren` or `msiren`, an older alpha app package may still be installed. Remove the old global packages and reinstall:
 
 ```powershell
 npm uninstall -g @moneysiren/cli @moneysiren/app
 npm install -g @moneysiren/app@alpha --force
 ```
 
-The app package also removes stale MoneySiren-owned command shims during global install when npm exposes the global prefix.
+Current app packages do not use npm's `bin` field for these aliases, so stale MoneySiren-owned command shims can be replaced during postinstall without tripping npm's bin conflict check.
 
 ## What It Installs
 

package/dist/apps/cli/src/release-installer.d.ts

@@ -1,6 +1,6 @@
 import type { InstallSurface } from "./install-profile.js";
 export declare const DEFAULT_RELEASE_REPOSITORY = "ztwz11/moneysiren";
-export declare const DEFAULT_RELEASE_TAG = "v0.1.0-alpha.11";
+export declare const DEFAULT_RELEASE_TAG = "v0.1.0-alpha.12";
 export interface ReleaseInstallOptions {
     env?: Record<string, string | undefined>;
     fetchImpl: typeof fetch;

package/dist/apps/cli/src/release-installer.js

@@ -7,7 +7,7 @@ import { promisify } from "node:util";
 const execFileAsync = promisify(execFile);
 export const DEFAULT_RELEASE_REPOSITORY = "ztwz11/moneysiren";
 // Keep the source-free installer pinned to the latest published desktop/web release tag.
-export const DEFAULT_RELEASE_TAG = "v0.1.0-alpha.11";
+export const DEFAULT_RELEASE_TAG = "v0.1.0-alpha.12";
 const RELEASE_REPOSITORY_ENV_KEY = "MONEYSIREN_RELEASE_REPOSITORY";
 const RELEASE_TAG_ENV_KEY = "MONEYSIREN_RELEASE_TAG";
 const RELEASE_INSTALL_DIR_ENV_KEY = "MONEYSIREN_RELEASE_INSTALL_DIR";

package/dist/apps/cli/src/version.d.ts

@@ -1,2 +1,2 @@
-export declare const CLI_VERSION = "0.1.0-alpha.11";
+export declare const CLI_VERSION = "0.1.0-alpha.12";
 //# sourceMappingURL=version.d.ts.map

package/dist/apps/cli/src/version.js

@@ -1,2 +1,2 @@
-export const CLI_VERSION = "0.1.0-alpha.11";
+export const CLI_VERSION = "0.1.0-alpha.12";
 //# sourceMappingURL=version.js.map

package/dist/packages/local-api/src/server.js

@@ -3,7 +3,7 @@ import { parseNotificationPreferences, readNotificationDigest, readNotificationP
 import { assertLoopbackHost, isLoopbackHost, removeRuntimeLock, writeRuntimeLock, } from "../../runtime/src/index.js";
 const DEFAULT_HOST = "127.0.0.1";
 const DEFAULT_PORT = 47831;
-const DEFAULT_VERSION = "0.1.0-alpha.11";
+const DEFAULT_VERSION = "0.1.0-alpha.12";
 export async function startLocalApiServer(options = {}) {
     const host = options.host ?? DEFAULT_HOST;
     const requestedPort = options.port ?? DEFAULT_PORT;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moneysiren/app",
-  "version": "0.1.0-alpha.11",
+  "version": "0.1.0-alpha.12",
   "description": "One-command installer for the MoneySiren CLI, local web dashboard, and HUD.",
   "private": false,
   "license": "MIT",
@@ -9,10 +9,6 @@
   "engines": {
     "node": ">=20.11.0"
   },
-  "bin": {
-    "moneysiren": "dist/apps/cli/src/index.js",
-    "msiren": "dist/apps/cli/src/index.js"
-  },
   "dependencies": {
     "@aws-sdk/client-cost-explorer": "^3.1061.0"
   },
@@ -21,7 +17,6 @@
     "dist/apps/cli/src/**/*.d.ts",
     "dist/packages/**/*.js",
     "dist/packages/**/*.d.ts",
-    "scripts/preinstall.mjs",
     "scripts/postinstall.mjs",
     "README.md",
     "LICENSE"
@@ -32,11 +27,10 @@
   "scripts": {
     "build": "node ../../tools/scripts/build-app-package.mjs",
     "prepack": "node ../../tools/scripts/build-app-package.mjs",
-    "preinstall": "node scripts/preinstall.mjs",
     "postinstall": "node scripts/postinstall.mjs",
     "pack:dry-run": "npm pack --dry-run",
-    "test": "node --check scripts/preinstall.mjs && node --check scripts/postinstall.mjs",
-    "typecheck": "node --check scripts/preinstall.mjs && node --check scripts/postinstall.mjs",
-    "lint": "node --check scripts/preinstall.mjs && node --check scripts/postinstall.mjs"
+    "test": "node --check scripts/postinstall.mjs",
+    "typecheck": "node --check scripts/postinstall.mjs",
+    "lint": "node --check scripts/postinstall.mjs"
   }
 }

package/scripts/postinstall.mjs

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
 
-import { existsSync } from "node:fs";
-import { dirname, resolve } from "node:path";
+import { chmodSync, existsSync, mkdirSync, readFileSync, realpathSync, writeFileSync } from "node:fs";
+import { basename, dirname, resolve } from "node:path";
 import { spawnSync } from "node:child_process";
 import { fileURLToPath } from "node:url";
 
 const scriptDir = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(scriptDir, "..");
 const cliEntry = resolve(packageRoot, "dist", "apps", "cli", "src", "index.js");
+const isGlobal = isGlobalInstall();
 
 if (isTruthy(process.env.MONEYSIREN_SKIP_APP_POSTINSTALL)) {
   console.log("MoneySiren app asset installation skipped by MONEYSIREN_SKIP_APP_POSTINSTALL.");
@@ -20,6 +21,10 @@ if (!existsSync(cliEntry)) {
   process.exit(0);
 }
 
+if (isGlobal || isTruthy(process.env.MONEYSIREN_APP_INSTALL_GLOBAL_SHIMS)) {
+  installGlobalCommandShims(cliEntry);
+}
+
 if (!shouldInstallReleaseAssets()) {
   console.log("MoneySiren app package installed.");
   console.log("Run `msiren install --all` to download the local web dashboard and HUD artifacts.");
@@ -41,20 +46,199 @@ const result = spawnSync(process.execPath, [cliEntry, "install", "--all"], {
 });
 
 if (result.error !== undefined) {
-  console.error(`MoneySiren app asset installation failed: ${result.error.message}`);
-  console.error("Retry with `msiren install --all` after npm finishes.");
-  process.exit(1);
+  handleAssetInstallFailure(`MoneySiren app asset installation failed: ${result.error.message}`);
 }
 
 if (result.status !== 0) {
-  console.error("MoneySiren app asset installation failed.");
-  console.error("Retry with `msiren install --all` after npm finishes.");
-  process.exit(result.status ?? 1);
+  handleAssetInstallFailure("MoneySiren app asset installation failed.");
+}
+
+function installGlobalCommandShims(entrypoint) {
+  const binDirs = getGlobalBinDirs();
+  const installed = [];
+
+  for (const binDir of binDirs) {
+    try {
+      mkdirSync(binDir, {
+        recursive: true,
+      });
+
+      for (const command of ["moneysiren", "msiren"]) {
+        installed.push(...writeCommandShim(binDir, command, entrypoint));
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      console.warn(`MoneySiren app command shim setup skipped for ${binDir}: ${message}`);
+    }
+  }
+
+  if (installed.length > 0) {
+    console.log(`MoneySiren command shim(s) ready: ${Array.from(new Set(installed)).join(", ")}`);
+  }
+}
+
+function getGlobalBinDirs() {
+  const candidates = [process.env.npm_config_prefix ?? dirname(process.execPath)];
+  const dirs = [];
+
+  for (const candidate of candidates) {
+    if (!candidate) {
+      continue;
+    }
+
+    addBinDir(dirs, candidate);
+
+    try {
+      addBinDir(dirs, realpathSync(candidate));
+    } catch {
+      // Best effort only. The original candidate is still useful.
+    }
+  }
+
+  return dirs;
+}
+
+function addBinDir(dirs, candidate) {
+  const binDir = process.platform === "win32"
+    ? resolve(candidate)
+    : basename(candidate) === "bin"
+      ? resolve(candidate)
+      : resolve(candidate, "bin");
+  const normalized = binDir.toLowerCase();
+
+  if (!dirs.some((dir) => dir.toLowerCase() === normalized)) {
+    dirs.push(binDir);
+  }
+}
+
+function writeCommandShim(binDir, command, entrypoint) {
+  if (process.platform === "win32") {
+    return [
+      writeShimFile(resolve(binDir, command), createPosixShim(entrypoint), true),
+      writeShimFile(resolve(binDir, `${command}.cmd`), createCmdShim(entrypoint), false),
+      writeShimFile(resolve(binDir, `${command}.ps1`), createPowerShellShim(entrypoint), false),
+    ].filter(Boolean);
+  }
+
+  return [
+    writeShimFile(resolve(binDir, command), createPosixShim(entrypoint), true),
+  ].filter(Boolean);
+}
+
+function writeShimFile(filePath, content, executable) {
+  if (existsSync(filePath) && !isMoneySirenShim(filePath)) {
+    console.warn(`MoneySiren app command shim not replaced because it is not MoneySiren-owned: ${filePath}`);
+    return null;
+  }
+
+  writeFileSync(filePath, content, "utf8");
+
+  if (executable) {
+    try {
+      chmodSync(filePath, 0o755);
+    } catch {
+      // Windows may ignore POSIX executable bits.
+    }
+  }
+
+  return filePath;
+}
+
+function handleAssetInstallFailure(message) {
+  console.warn(message);
+  console.warn("MoneySiren commands were installed. Retry release asset installation with `msiren install --all` after npm finishes.");
+
+  if (isTruthy(process.env.MONEYSIREN_APP_STRICT_POSTINSTALL)) {
+    process.exit(1);
+  }
+
+  process.exit(0);
+}
+
+function isMoneySirenShim(filePath) {
+  try {
+    const source = readFileSync(filePath, "utf8");
+
+    return /@moneysiren[\\/]app|@moneysiren[\\/]cli|moneysiren-app|moneysiren-cli|MoneySiren app command shim/i.test(source);
+  } catch {
+    return false;
+  }
+}
+
+function createPosixShim(entrypoint) {
+  return [
+    "#!/bin/sh",
+    "basedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")",
+    "",
+    "case `uname` in",
+    "    *CYGWIN*|*MINGW*|*MSYS*)",
+    "        if command -v cygpath > /dev/null 2>&1; then",
+    "            basedir=`cygpath -w \"$basedir\"`",
+    "        fi",
+    "    ;;",
+    "esac",
+    "",
+    "if [ -x \"$basedir/node\" ]; then",
+    `  exec "$basedir/node" ${shellQuote(toPosixPath(entrypoint))} "$@"`,
+    "else",
+    `  exec node ${shellQuote(toPosixPath(entrypoint))} "$@"`,
+    "fi",
+    "",
+  ].join("\n");
+}
+
+function createCmdShim(entrypoint) {
+  return [
+    "@ECHO off",
+    "SETLOCAL",
+    "IF EXIST \"%~dp0\\node.exe\" (",
+    "  SET \"_prog=%~dp0\\node.exe\"",
+    ") ELSE (",
+    "  SET \"_prog=node\"",
+    "  SET PATHEXT=%PATHEXT:;.JS;=;%",
+    ")",
+    `"%_prog%" "${entrypoint}" %*`,
+    "",
+  ].join("\r\n");
+}
+
+function createPowerShellShim(entrypoint) {
+  const escapedEntrypoint = entrypoint.replace(/'/g, "''");
+
+  return [
+    "#!/usr/bin/env pwsh",
+    "$basedir = Split-Path $MyInvocation.MyCommand.Definition -Parent",
+    "$exe = \"\"",
+    "if ($PSVersionTable.PSVersion -lt \"6.0\" -or $IsWindows) {",
+    "  $exe = \".exe\"",
+    "}",
+    "$node = if (Test-Path \"$basedir/node$exe\") { \"$basedir/node$exe\" } else { \"node\" }",
+    `$entry = '${escapedEntrypoint}'`,
+    "if ($MyInvocation.ExpectingInput) {",
+    "  $input | & $node $entry $args",
+    "} else {",
+    "  & $node $entry $args",
+    "}",
+    "exit $LASTEXITCODE",
+    "",
+  ].join("\n");
+}
+
+function toPosixPath(value) {
+  return value.replace(/\\/g, "/");
+}
+
+function shellQuote(value) {
+  return `'${value.replace(/'/g, "'\\''")}'`;
 }
 
 function shouldInstallReleaseAssets() {
   return isTruthy(process.env.MONEYSIREN_APP_INSTALL_ALL) ||
-    process.env.npm_config_global === "true" ||
+    isGlobal;
+}
+
+function isGlobalInstall() {
+  return process.env.npm_config_global === "true" ||
     process.env.npm_config_location === "global";
 }
 

package/scripts/preinstall.mjs

@@ -1,87 +0,0 @@
-#!/usr/bin/env node
-
-import { existsSync, lstatSync, readFileSync, readlinkSync, rmSync } from "node:fs";
-import { join, resolve } from "node:path";
-
-if (isTruthy(process.env.MONEYSIREN_SKIP_APP_PREINSTALL)) {
-  process.exit(0);
-}
-
-if (!isGlobalInstall()) {
-  process.exit(0);
-}
-
-const prefix = process.env.npm_config_prefix;
-
-if (!prefix) {
-  console.warn("MoneySiren app preinstall skipped: npm global prefix was not provided.");
-  process.exit(0);
-}
-
-const binDir = process.platform === "win32" ? prefix : join(prefix, "bin");
-const shimNames = process.platform === "win32"
-  ? ["moneysiren", "moneysiren.cmd", "moneysiren.ps1", "msiren", "msiren.cmd", "msiren.ps1"]
-  : ["moneysiren", "msiren"];
-const removed = [];
-
-for (const shimName of shimNames) {
-  const shimPath = resolve(binDir, shimName);
-
-  if (!isInside(resolve(binDir), shimPath) || !existsSync(shimPath)) {
-    continue;
-  }
-
-  if (!isMoneySirenShim(shimPath)) {
-    continue;
-  }
-
-  try {
-    rmSync(shimPath, {
-      force: true,
-    });
-    removed.push(shimName);
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    console.warn(`MoneySiren app preinstall could not remove stale global command ${shimName}: ${message}`);
-  }
-}
-
-if (removed.length > 0) {
-  console.log(`MoneySiren app preinstall removed stale global command shim(s): ${removed.join(", ")}`);
-}
-
-function isGlobalInstall() {
-  return process.env.npm_config_global === "true" ||
-    process.env.npm_config_location === "global" ||
-    isTruthy(process.env.MONEYSIREN_APP_GLOBAL_PREINSTALL);
-}
-
-function isMoneySirenShim(filePath) {
-  try {
-    const stat = lstatSync(filePath);
-    const source = stat.isSymbolicLink()
-      ? readlinkSync(filePath)
-      : stat.isFile()
-        ? readFileSync(filePath, "utf8")
-        : "";
-
-    return /@moneysiren[\\/]app|@moneysiren[\\/]cli|moneysiren-app|moneysiren-cli/i.test(source);
-  } catch {
-    return false;
-  }
-}
-
-function isInside(parent, child) {
-  const relative = child.slice(parent.length);
-  return child === parent || (child.startsWith(parent) && /^[/\\]/.test(relative));
-}
-
-function isTruthy(value) {
-  if (value === undefined) {
-    return false;
-  }
-
-  const normalized = value.trim().toLowerCase();
-
-  return normalized.length > 0 && normalized !== "0" && normalized !== "false" && normalized !== "no";
-}