dsh-mnemon-source-memory-spaces 0.5.11 → 0.5.12

package/lib/index.js

@@ -1,4 +1,4 @@
-import { findMnemonCommand, isMnemonExecutable, mnemonNpmLauncher, nodeLauncherEnvironment } from "./native-cli.js";
+import { findMnemonCommand, isMnemonExecutable, resolveMnemonInvocation } from "./native-cli.js";
 import { CATEGORIES as CATEGORIES$1, EDGE_TYPES, INTENTS as INTENTS$1, MNEMON_EMBEDDING_PROTOCOLS, SOURCES as SOURCES$1 } from "./contracts.js";
 import { a as MemoryProviderCatalog, i as EMPTY_MEMORY_PROVIDER_CATALOG, n as PrivateMemorySpaceProviderHost, r as MemoryProviderAdapterRegistry, t as createMemorySpaceProviderPlugin } from "./plugin-DlsNeZbQ.js";
 import { t as runProcess } from "./process-BvrgxPNP.js";
@@ -2387,11 +2387,10 @@ function createRunner(config, processRunner = runProcess) {
 		};
 		let result;
 		try {
-			const command = currentCommand();
-			const launcher = mnemonNpmLauncher(command);
-			result = await processRunner(launcher === void 0 ? command : process.execPath, launcher === void 0 ? argv : [launcher, ...argv], launcher === void 0 ? processOptions : {
+			const invocation = resolveMnemonInvocation(currentCommand(), argv, environment);
+			result = await processRunner(invocation.command, invocation.args, {
 				...processOptions,
-				env: nodeLauncherEnvironment(processOptions.env)
+				...invocation.env === void 0 ? {} : { env: invocation.env }
 			});
 		} catch (error) {
 			throw new MnemonCliError(`${error instanceof Error ? error.message : String(error)}. ${process.platform === "win32" ? "Install the official Mnemon Windows release, ensure mnemon.exe is on PATH or under %LOCALAPPDATA%\\Programs\\mnemon, or set MNEMON_CLI_PATH or mnemon.cliPath to its absolute path." : "Install Mnemon and ensure \"mnemon\" is on PATH, or set MNEMON_CLI_PATH or mnemon.cliPath."}`);

package/lib/native-cli.d.ts

@@ -2,6 +2,12 @@
 /** Execute JavaScript with the Host binary even when it is Electron's GUI executable. */
 declare function nodeLauncherEnvironment(environment?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
 declare function mnemonNpmLauncher(command: string): string | undefined;
+/** Keep CLI subprocesses under our windowsHide, timeout and cancellation policy. */
+declare function resolveMnemonInvocation(command: string, args: readonly string[], env?: NodeJS.ProcessEnv): {
+  command: string;
+  args: string[];
+  env?: NodeJS.ProcessEnv;
+};
 interface CommandDiscoveryOptions {
   platform?: NodeJS.Platform;
   env?: NodeJS.ProcessEnv;
@@ -14,4 +20,4 @@ declare function findMnemonCommand(config: {
   cliPath?: string | undefined;
 }, options?: CommandDiscoveryOptions): string | undefined;
 //#endregion
-export { CommandDiscoveryOptions, findMnemonCommand, isMnemonExecutable, mnemonNpmLauncher, nodeLauncherEnvironment };
+export { CommandDiscoveryOptions, findMnemonCommand, isMnemonExecutable, mnemonNpmLauncher, nodeLauncherEnvironment, resolveMnemonInvocation };

package/lib/native-cli.js

@@ -1,3 +1,4 @@
+import { createRequire } from "node:module";
 import { accessSync, constants, existsSync, readFileSync, realpathSync, statSync } from "node:fs";
 import { homedir } from "node:os";
 import { dirname, join, posix, win32 } from "node:path";
@@ -38,6 +39,42 @@ function mnemonNpmLauncher(command) {
 		} catch {}
 	}
 }
+/** Resolve only the platform package pinned by the recognized official launcher. */
+function npmNativeBinary(launcher) {
+	const pkg = manifest(join(dirname(dirname(launcher)), "package.json"));
+	const target = `${process.platform}-${process.arch}`;
+	const alias = `${MNEMON_NPM_PACKAGE}-${target}`;
+	const version = typeof pkg?.version === "string" ? `${pkg.version}-${target}` : void 0;
+	if (version === void 0 || pkg?.optionalDependencies?.[alias] !== `npm:${MNEMON_NPM_PACKAGE}@${version}`) return void 0;
+	try {
+		const packagePath = createRequire(launcher).resolve.paths(alias)?.map((path) => join(path, alias, "package.json")).find(existsSync);
+		if (packagePath === void 0) return void 0;
+		const native = manifest(packagePath);
+		if (native?.name !== MNEMON_NPM_PACKAGE || native.version !== version) return void 0;
+		const binary = join(dirname(packagePath), "bin", process.platform === "win32" ? "mnemon.exe" : "mnemon");
+		return isMnemonExecutable(binary) ? binary : void 0;
+	} catch {
+		return;
+	}
+}
+/** Keep CLI subprocesses under our windowsHide, timeout and cancellation policy. */
+function resolveMnemonInvocation(command, args, env) {
+	const launcher = mnemonNpmLauncher(command);
+	if (launcher !== void 0) {
+		const binary = args.length === 1 && args[0] === "update" ? void 0 : npmNativeBinary(launcher);
+		if (binary === void 0) return {
+			command: process.execPath,
+			args: [launcher, ...args],
+			env: nodeLauncherEnvironment(env)
+		};
+		command = binary;
+	}
+	return {
+		command,
+		args: [...args],
+		...env === void 0 ? {} : { env }
+	};
+}
 const UNIX_COMMON_CLI_PATHS = [
 	"~/.local/bin/mnemon",
 	"/opt/homebrew/bin/mnemon",
@@ -112,4 +149,4 @@ function findMnemonCommand(config, options = {}) {
 	for (const path of commonCliPaths(platform, env, home)) if (isExecutable(path)) return path;
 }
 //#endregion
-export { findMnemonCommand, isMnemonExecutable, mnemonNpmLauncher, nodeLauncherEnvironment };
+export { findMnemonCommand, isMnemonExecutable, mnemonNpmLauncher, nodeLauncherEnvironment, resolveMnemonInvocation };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mnemon-source-memory-spaces",
-  "version": "0.5.11",
+  "version": "0.5.12",
   "description": "Memory Spaces Source and its private Provider SDK.",
   "license": "MIT",
   "type": "module",
@@ -65,7 +65,7 @@
     "@types/node": "^22.0.0",
     "@types/react": "^18.3.0",
     "@types/react-dom": "^18.3.0",
-    "dsh-mnemon": "^0.5.17",
+    "dsh-mnemon": "^0.5.18",
     "dsh-mnemon-provider-byterover": "^0.5.5",
     "dsh-mnemon-provider-hindsight": "^0.5.5",
     "dsh-mnemon-provider-holographic": "^0.5.5",