@xyrlan/mnemo 0.13.2 → 0.13.4

package/lib/bootstrap.js

@@ -2,6 +2,7 @@
 
 const { execSync, spawnSync } = require("node:child_process");
 const { probeOnPath } = require("./detect");
+const { resolveMnemoBinary } = require("./runMnemo");
 
 
 const PIN_SPEC = "mnemo-claude>=0.13,<0.14";
@@ -27,8 +28,13 @@ function buildUpgradeCmd(installer) {
 }
 
 
-function isAlreadyInstalled(probeFn = probeOnPath) {
-  return probeFn("mnemo");
+// Detect a real mnemo install. We can NOT trust `command -v mnemo` here:
+// when running under `npx @xyrlan/mnemo`, npm injects the wrapper itself
+// onto PATH, so `command -v mnemo` resolves to us. resolveMnemoBinary
+// filters npx temp dirs so it only matches a real Python install.
+function isAlreadyInstalled(resolverFn = resolveMnemoBinary) {
+  const selfBinDir = process.argv[1] ? require("node:path").dirname(process.argv[1]) : null;
+  return Boolean(resolverFn({ selfBinDir }));
 }
 
 
@@ -39,12 +45,10 @@ function runShell(cmd, { quiet = false } = {}) {
 
 
 function verifyOnPath() {
-  try {
-    execSync("mnemo --version", { stdio: "ignore" });
-    return true;
-  } catch (_e) {
-    return false;
-  }
+  const { resolveMnemoBinary } = require("./runMnemo");
+  const path = require("node:path");
+  const selfBinDir = process.argv[1] ? path.dirname(process.argv[1]) : null;
+  return Boolean(resolveMnemoBinary({ selfBinDir }));
 }
 
 

package/lib/runMnemo.js

@@ -1,6 +1,8 @@
 "use strict";
 
 const { spawnSync } = require("node:child_process");
+const fs = require("node:fs");
+const path = require("node:path");
 
 
 function buildInitArgs({ scope, vaultRoot, quiet, yes = true }) {
@@ -22,10 +24,39 @@ function buildUninstallArgs({ scope, quiet, yes = true }) {
 }
 
 
-function runMnemo(args, { quiet = false } = {}) {
-  const result = spawnSync("mnemo", args, { stdio: quiet ? "ignore" : "inherit" });
+// Resolve the real Python `mnemo` entry point, skipping the npx-injected
+// wrapper bin so spawnSync doesn't recurse into us.
+function resolveMnemoBinary({ env = process.env, platform = process.platform, selfBinDir } = {}) {
+  const exeName = platform === "win32" ? "mnemo.exe" : "mnemo";
+  const sep = platform === "win32" ? ";" : ":";
+  const rawPath = (env.PATH || env.Path || "").split(sep);
+  const skip = new Set();
+  if (selfBinDir) skip.add(path.resolve(selfBinDir));
+  return rawPath
+    .filter((dir) => dir && !skip.has(path.resolve(dir)) && !/[\\/]_npx[\\/]/.test(dir))
+    .map((dir) => path.join(dir, exeName))
+    .find((candidate) => {
+      try { return fs.statSync(candidate).isFile(); }
+      catch (_e) { return false; }
+    }) || null;
+}
+
+
+// Decide what to spawn. If we have a resolved real binary, run it directly.
+// Otherwise fall back to `python3 -m mnemo` so we never recurse into the
+// npx-injected wrapper that may still be on PATH.
+function buildSpawnPlan(bin, args) {
+  if (bin) return { cmd: bin, args };
+  return { cmd: "python3", args: ["-m", "mnemo", ...args] };
+}
+
+
+function runMnemo(args, { quiet = false, selfBinDir } = {}) {
+  const bin = resolveMnemoBinary({ selfBinDir: selfBinDir || (process.argv[1] && path.dirname(process.argv[1])) });
+  const plan = buildSpawnPlan(bin, args);
+  const result = spawnSync(plan.cmd, plan.args, { stdio: quiet ? "ignore" : "inherit" });
   return result.status === null ? 1 : result.status;
 }
 
 
-module.exports = { buildInitArgs, buildUninstallArgs, runMnemo };
+module.exports = { buildInitArgs, buildUninstallArgs, runMnemo, resolveMnemoBinary, buildSpawnPlan };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyrlan/mnemo",
-  "version": "0.13.2",
+  "version": "0.13.4",
   "description": "One-command installer for mnemo (the Obsidian that populates itself).",
   "bin": {
     "mnemo": "bin/mnemo.js"