blun-king-cli 9.1.4 → 9.1.6

package/bin/launcher-runtime.js

@@ -81,13 +81,21 @@ function readPackageVersion() {
   return version;
 }
 
+function shouldDetachProtectedCore(options = {}) {
+  const platform = options.platform || process.platform;
+  const stdinIsTTY = Object.hasOwn(options, 'stdinIsTTY')
+    ? options.stdinIsTTY
+    : process.stdin.isTTY;
+  return platform !== 'win32' || stdinIsTTY !== true;
+}
+
 function spawnProtectedCore(args, env, cwd) {
   const child = spawn(
     process.execPath,
     [path.join(PKG, 'bin', 'core-bootstrap.js'), ...args],
     {
       cwd,
-      detached: true,
+      detached: shouldDetachProtectedCore(),
       env,
       stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
       windowsHide: true,
@@ -290,4 +298,4 @@ async function runLauncher(options = {}) {
   }
 }
 
-module.exports = { resolveLauncherPrivatePaths, runLauncher };
+module.exports = { resolveLauncherPrivatePaths, runLauncher, shouldDetachProtectedCore };

package/bin/update-notice.js

@@ -620,10 +620,19 @@ function createInstallInvocation(version, options = {}) {
   if (platform !== 'win32' && path.basename(installPrefix) === 'lib') {
     installPrefix = path.dirname(installPrefix);
   }
-  let npmConfigPath;
-  if (options.npmConfigPath) {
-    npmConfigPath = fs.realpathSync(path.resolve(options.npmConfigPath));
-    if (!fs.statSync(npmConfigPath).isFile()) throw new Error('INVALID_NPM_CONFIG_PATH');
+  let npmUserConfigPath;
+  let npmGlobalConfigPath;
+  if (options.npmUserConfigPath || options.npmGlobalConfigPath) {
+    if (!options.npmUserConfigPath || !options.npmGlobalConfigPath) {
+      throw new Error('INVALID_NPM_CONFIG_PATHS');
+    }
+    npmUserConfigPath = fs.realpathSync(path.resolve(options.npmUserConfigPath));
+    npmGlobalConfigPath = fs.realpathSync(path.resolve(options.npmGlobalConfigPath));
+    if (!fs.statSync(npmUserConfigPath).isFile()
+      || !fs.statSync(npmGlobalConfigPath).isFile()
+      || npmUserConfigPath === npmGlobalConfigPath) {
+      throw new Error('INVALID_NPM_CONFIG_PATHS');
+    }
   }
   return {
     command: execPath,
@@ -638,16 +647,21 @@ function createInstallInvocation(version, options = {}) {
       '--ignore-scripts=false',
       '--package-lock-only=false',
       `--prefix=${installPrefix}`,
-      ...(npmConfigPath ? [
-        `--userconfig=${npmConfigPath}`,
-        `--globalconfig=${npmConfigPath}`,
+      ...(npmUserConfigPath ? [
+        `--userconfig=${npmUserConfigPath}`,
+        `--globalconfig=${npmGlobalConfigPath}`,
       ] : []),
     ],
     windowsVerbatimArguments: false,
   };
 }
 
-function createInstallEnvironment(sourceEnv, installDirectory, npmConfigPath) {
+function createInstallEnvironment(
+  sourceEnv,
+  installDirectory,
+  npmUserConfigPath,
+  npmGlobalConfigPath,
+) {
   const allowedKeys = new Set([
     'appdata',
     'comspec',
@@ -685,8 +699,8 @@ function createInstallEnvironment(sourceEnv, installDirectory, npmConfigPath) {
   result.npm_config_dry_run = 'false';
   result.npm_config_ignore_scripts = 'false';
   result.npm_config_package_lock_only = 'false';
-  result.npm_config_userconfig = npmConfigPath;
-  result.npm_config_globalconfig = npmConfigPath;
+  result.npm_config_userconfig = npmUserConfigPath;
+  result.npm_config_globalconfig = npmGlobalConfigPath;
   return result;
 }
 
@@ -763,7 +777,8 @@ function preparePinnedInstaller(version, options = {}) {
     let closeSettled = false;
     let selectedAction;
     let installDirectory;
-    let npmConfigPath;
+    let npmUserConfigPath;
+    let npmGlobalConfigPath;
     let disconnectTimer;
     const close = Promise.withResolvers();
     const closePromise = close.promise;
@@ -848,9 +863,15 @@ function preparePinnedInstaller(version, options = {}) {
         resolveInstallTempRoot(options),
         options.blunDir,
       );
-      npmConfigPath = path.join(installDirectory, 'npmrc');
-      writePrivateFile(npmConfigPath, '');
-      invocation = createInstallInvocation(version, { ...options, npmConfigPath });
+      npmUserConfigPath = path.join(installDirectory, 'user-npmrc');
+      npmGlobalConfigPath = path.join(installDirectory, 'global-npmrc');
+      writePrivateFile(npmUserConfigPath, '');
+      writePrivateFile(npmGlobalConfigPath, '');
+      invocation = createInstallInvocation(version, {
+        ...options,
+        npmUserConfigPath,
+        npmGlobalConfigPath,
+      });
       child = forkImpl(path.join(__dirname, 'update-lease.js'), ['--installer-worker'], {
         detached: true,
         execPath: invocation.command,
@@ -858,7 +879,8 @@ function preparePinnedInstaller(version, options = {}) {
         env: createInstallEnvironment(
           options.env || process.env,
           installDirectory,
-          npmConfigPath,
+          npmUserConfigPath,
+          npmGlobalConfigPath,
         ),
         stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
         windowsHide: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blun-king-cli",
-  "version": "9.1.4",
+  "version": "9.1.6",
   "description": "BLUN CLI - your own AI agent with a Telegram channel. Get it done. With BLUN.",
   "license": "MIT",
   "bin": {