pinokiod 7.5.34 → 7.5.36

package/kernel/bin/conda.js

@@ -69,76 +69,98 @@ const LEGACY_SSL_CERT_DIR_HOOK_FILES = [
   "zz_pinokio_unset_ssl_cert_dir-win.ps1",
   "zz_pinokio_unset_ssl_cert_dir-win.sh",
 ]
-const WINDOWS_CONDA_ACTIVATE_RELATIVE_PATH = path.join(
-  "Lib",
-  "site-packages",
-  "conda",
-  "shell",
-  "condabin",
-  "_conda_activate.bat"
-)
-const WINDOWS_CONDA_ACTIVATE_PINOKIO_MARKER = ":PINOKIO_APPLY_CONDA_ENV"
-
-function windowsCondaActivateOriginalBlock(eol) {
-  return [
-    "    ) ELSE ENDLOCAL & (",
-    '        FOR /F "tokens=1,* delims==" %%A IN (%%T) DO (',
-    '            :: A, B = "key", "value"',
-    '            IF "%CONDA_DEBUG%" == "1" ECHO DEBUG: "%%A=%%B">&2',
-    '            IF "%%A"=="_CONDA_SCRIPT" (',
-    "                :: Script execution, fast exit if activation scripts fail",
-    '                CALL "%%B" || (',
-    '                    ECHO ERROR: Activation script "%%B" failed with code %ERRORLEVEL%.>&2',
-    '                    CALL :DELETE "%%T"',
-    '                    CALL :DELETE "%__conda_tmp%"',
-    "                    EXIT /B 4",
-    "                )",
-    '            ) ELSE IF "%%B"=="" (',
-    "                :: Unset variable",
-    '                SET "%%A="',
-    "            ) ELSE (",
-    "                :: Set variable",
-    '                SET "%%A=%%B"',
-    "            )",
-    "        )",
-    "        :: Clean up",
-    '        CALL :DELETE "%%T"',
-    '        CALL :DELETE "%__conda_tmp%"',
-    "        EXIT /B 0",
-    "    )",
-  ].join(eol)
-}
-
-function windowsCondaActivatePatchedBlock(eol) {
-  return [
-    '    ) ELSE ENDLOCAL & @CALL :PINOKIO_APPLY_CONDA_ENV "%%T" "%__conda_tmp%" & @GOTO :EOF',
-  ].join(eol)
-}
-
-function windowsCondaActivatePatchRoutines(eol) {
-  return [
-    ":PINOKIO_APPLY_CONDA_ENV",
-    '@FOR /F "tokens=1,* delims==" %%A IN (%~1) DO (',
-    '@IF "%CONDA_DEBUG%" == "1" ECHO DEBUG: "%%A=%%B">&2',
-    '@IF "%%A"=="_CONDA_SCRIPT" (',
-    '@CALL "%%B" || (',
-    '@ECHO ERROR: Activation script "%%B" failed with code %ERRORLEVEL%.>&2',
-    '@CALL :DELETE "%~1"',
-    '@CALL :DELETE "%~2"',
-    "@EXIT /B 4",
-    ")",
-    ') ELSE IF "%%B"=="" (',
-    '@SET "%%A="',
-    ") ELSE (",
-    '@SET "%%A=%%B"',
-    ")",
-    ")",
-    '@CALL :DELETE "%~1"',
-    '@CALL :DELETE "%~2"',
-    "@EXIT /B 0",
-    "",
-  ].join(eol)
-}
+const WINDOWS_CONDA_ACTIVATE_RELATIVE_PATHS = [
+  path.join("condabin", "_conda_activate.bat"),
+  path.join("Lib", "site-packages", "conda", "shell", "condabin", "_conda_activate.bat"),
+]
+const WINDOWS_CONDA_ACTIVATE_BAT = [
+  ":: Copyright (C) 2012 Anaconda, Inc",
+  ":: SPDX-License-Identifier: BSD-3-Clause",
+  ":: Helper routine for activation, deactivation, and reactivation.",
+  "@ECHO OFF",
+  "SETLOCAL",
+  "",
+  ":: Generate a unique temporary filename using a GUID to support parallel workflows",
+  ":: (e.g., `start /b conda run ...`). %RANDOM% is insufficient because processes",
+  ":: started simultaneously get identical time-based seeds, producing collisions.",
+  ":: See: https://devblogs.microsoft.com/oldnewthing/20100617-00/?p=13673",
+  "FOR /F \"delims=\" %%G IN ('powershell -NoProfile -Command \"[guid]::NewGuid()\"') DO SET \"__conda_guid=%%G\"",
+  "SET \"__conda_tmp=%TEMP%\\__conda_tmp_%__conda_guid%.txt\"",
+  "",
+  ":: Run conda command and get its output",
+  ":: WARNING: This cannot be simplified into a FOR /F parsing loop because of the way",
+  ":: MSDOS associates the outer quotes for usebackq. E.g., the following:",
+  "::   `\"%CONDA_EXE%\" shell.cmd.exe activate \"name\"`",
+  ":: Which results in the following gibberish being run:",
+  "::   %CONDA_EXE%\" shell.cmd.exe activate \"environment",
+  ":: Producing an error like:",
+  "::   The filename, directory name, or volume label syntax is incorrect.",
+  ":: Instead we run the command and store the output for subsequent processing.",
+  "\"%CONDA_EXE%\" %_CE_M% %_CE_CONDA% shell.cmd.exe %* > \"%__conda_tmp%\"",
+  "IF NOT EXIST \"%__conda_tmp%\" (",
+  "    ECHO ERROR: Failed to create temp file for 'conda %*'.>&2",
+  "    ECHO.>&2",
+  "    ECHO This is likely a TEMP directory issue>&2",
+  "    ECHO ^(permissions, disk space, or invalid path^).>&2",
+  "    ECHO.>&2",
+  "    ECHO Ensure TEMP or TMP environment variables point to a writable location.>&2",
+  "    ECHO See: https://docs.conda.io/projects/conda/en/stable/user-guide/troubleshooting.html#temp-file-errors>&2",
+  "    ENDLOCAL & EXIT /B 1",
+  ") ELSE IF %ERRORLEVEL% NEQ 0 (",
+  "    ECHO ERROR: 'conda %*' exited with code %ERRORLEVEL%.>&2",
+  "    CALL :DELETE \"%__conda_tmp%\"",
+  "    ENDLOCAL & EXIT /B 2",
+  ")",
+  "",
+  ":: Check if conda produced output",
+  "FOR /F \"delims=\" %%T IN (%__conda_tmp%) DO (",
+  "    :: T = \"%TEMP%\\<uuid>.env\"",
+  "    IF NOT EXIST \"%%T\" (",
+  "        ECHO ERROR: Activation file missing for 'conda %*'.>&2",
+  "        CALL :DELETE \"%__conda_tmp%\"",
+  "        ENDLOCAL & EXIT /B 3",
+  "    ) ELSE ENDLOCAL & @CALL :PINOKIO_APPLY_CONDA_ENV \"%%T\" \"%__conda_tmp%\" & @GOTO :EOF",
+  ")",
+  "",
+  ":: If we get here, the FOR loop never ran which means no output",
+  "ECHO ERROR: No output from 'conda %*'.>&2",
+  "CALL :DELETE \"%__conda_tmp%\"",
+  "ENDLOCAL & EXIT /B 5",
+  "",
+  ":PINOKIO_APPLY_CONDA_ENV",
+  "@ECHO OFF",
+  "@FOR /F \"tokens=1,* delims==\" %%A IN (%~1) DO (",
+  "@IF \"%CONDA_DEBUG%\" == \"1\" ECHO DEBUG: \"%%A=%%B\">&2",
+  "@IF \"%%A\"==\"_CONDA_SCRIPT\" (",
+  "@CALL \"%%B\" || (",
+  "@ECHO ERROR: Activation script \"%%B\" failed with code %ERRORLEVEL%.>&2",
+  "@CALL :DELETE \"%~1\"",
+  "@CALL :DELETE \"%~2\"",
+  "@ECHO ON",
+  "@EXIT /B 4",
+  ")",
+  ") ELSE IF \"%%B\"==\"\" (",
+  "@SET \"%%A=\"",
+  ") ELSE (",
+  "@SET \"%%A=%%B\"",
+  ")",
+  ")",
+  "@CALL :DELETE \"%~1\"",
+  "@CALL :DELETE \"%~2\"",
+  "@ECHO ON",
+  "@EXIT /B 0",
+  "",
+  ":: Routine to delete a temp file if CONDA_DEBUG is not set",
+  ":: usage: call :DELETE \"path/to/file\"",
+  ":DELETE",
+  "IF \"%CONDA_DEBUG%\" == \"1\" (",
+  "    ECHO DEBUG: Retaining temporary file \"%~1\".>&2",
+  ") ELSE IF EXIST \"%~1\" (",
+  "    DEL /F /Q \"%~1\" 2>NUL",
+  ")",
+  "GOTO :EOF",
+  "",
+].join("\r\n")
 
 class Conda {
   description = "Pinokio uses Conda to install various useful programs in an isolated manner."
@@ -231,41 +253,15 @@ class Conda {
       }
     }
   }
-  async ensureWindowsCondaActivateEchoPatch() {
+  async ensureWindowsCondaActivateBat() {
     if (this.kernel.platform !== "win32" || !(await this.hasCondaMeta())) {
       return
     }
-    const activatePath = this.kernel.bin.path(CONDA_ROOT_DIR, WINDOWS_CONDA_ACTIVATE_RELATIVE_PATH)
-    let content
-    try {
-      content = await fs.promises.readFile(activatePath, "utf8")
-    } catch (error) {
-      if (error && error.code === "ENOENT") {
-        return
-      }
-      throw error
-    }
-    if (content.includes(WINDOWS_CONDA_ACTIVATE_PINOKIO_MARKER)) {
-      return
-    }
-    const eol = content.includes("\r\n") ? "\r\n" : "\n"
-    const originalBlock = windowsCondaActivateOriginalBlock(eol)
-    if (!content.includes(originalBlock)) {
-      console.warn("Could not patch Conda CMD activation echo leak; unexpected _conda_activate.bat")
-      return
-    }
-    const routineAnchor = `${eol}:: Routine to delete a temp file if CONDA_DEBUG is not set`
-    if (!content.includes(routineAnchor)) {
-      console.warn("Could not patch Conda CMD activation echo leak; missing _conda_activate.bat routine anchor")
-      return
+    for (const relativePath of WINDOWS_CONDA_ACTIVATE_RELATIVE_PATHS) {
+      const activatePath = this.kernel.bin.path(CONDA_ROOT_DIR, relativePath)
+      await fs.promises.mkdir(path.dirname(activatePath), { recursive: true })
+      await fs.promises.writeFile(activatePath, WINDOWS_CONDA_ACTIVATE_BAT)
     }
-    const patched = content
-      .replace(originalBlock, windowsCondaActivatePatchedBlock(eol))
-      .replace(
-        routineAnchor,
-        `${eol}${windowsCondaActivatePatchRoutines(eol)}:: Routine to delete a temp file if CONDA_DEBUG is not set`
-      )
-    await fs.promises.writeFile(activatePath, patched)
   }
   async init() {
     if (this.kernel.homedir) {
@@ -289,7 +285,7 @@ report_errors: false`)
         await this.ensureCompatibilityAlias()
       }
       await this.ensureWindowsOpenSslHooks()
-      await this.ensureWindowsCondaActivateEchoPatch()
+      await this.ensureWindowsCondaActivateBat()
     }
   }
   async check() {
@@ -438,7 +434,7 @@ report_errors: false`)
       )
     }
     await this.ensureWindowsOpenSslHooks()
-    await this.ensureWindowsCondaActivateEchoPatch()
+    await this.ensureWindowsCondaActivateBat()
     await this.ensureCompatibilityAlias()
     ondata({ raw: `Install finished\r\n` })
     await this.kernel.bin.rm(installer, ondata)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "7.5.34",
+  "version": "7.5.36",
   "description": "",
   "main": "index.js",
   "scripts": {

package/test/conda-bin.test.js

@@ -125,56 +125,22 @@ const EXPECTED_WINDOWS_OPENSSL_HOOKS = {
   ].join('\n'),
 }
 
-const WINDOWS_CONDA_ACTIVATE_PATH = path.join(
-  'bin',
-  'miniforge',
-  'Lib',
-  'site-packages',
-  'conda',
-  'shell',
-  'condabin',
-  '_conda_activate.bat'
-)
-const WINDOWS_CONDA_ACTIVATE_ORIGINAL_BLOCK = [
+const WINDOWS_CONDA_ACTIVATE_PATHS = [
+  path.join('bin', 'miniforge', 'condabin', '_conda_activate.bat'),
+  path.join(
+    'bin',
+    'miniforge',
+    'Lib',
+    'site-packages',
+    'conda',
+    'shell',
+    'condabin',
+    '_conda_activate.bat'
+  ),
+]
+const WINDOWS_CONDA_ACTIVATE_LEAK_BLOCK = [
   '    ) ELSE ENDLOCAL & (',
   '        FOR /F "tokens=1,* delims==" %%A IN (%%T) DO (',
-  '            :: A, B = "key", "value"',
-  '            IF "%CONDA_DEBUG%" == "1" ECHO DEBUG: "%%A=%%B">&2',
-  '            IF "%%A"=="_CONDA_SCRIPT" (',
-  '                :: Script execution, fast exit if activation scripts fail',
-  '                CALL "%%B" || (',
-  '                    ECHO ERROR: Activation script "%%B" failed with code %ERRORLEVEL%.>&2',
-  '                    CALL :DELETE "%%T"',
-  '                    CALL :DELETE "%__conda_tmp%"',
-  '                    EXIT /B 4',
-  '                )',
-  '            ) ELSE IF "%%B"=="" (',
-  '                :: Unset variable',
-  '                SET "%%A="',
-  '            ) ELSE (',
-  '                :: Set variable',
-  '                SET "%%A=%%B"',
-  '            )',
-  '        )',
-  '        :: Clean up',
-  '        CALL :DELETE "%%T"',
-  '        CALL :DELETE "%__conda_tmp%"',
-  '        EXIT /B 0',
-  '    )',
-].join('\r\n')
-const WINDOWS_CONDA_ACTIVATE_SCRIPT = [
-  '@ECHO OFF',
-  'SETLOCAL',
-  'FOR /F "delims=" %%T IN (%__conda_tmp%) DO (',
-  '    IF NOT EXIST "%%T" (',
-  '        ENDLOCAL & EXIT /B 3',
-  WINDOWS_CONDA_ACTIVATE_ORIGINAL_BLOCK,
-  ')',
-  '',
-  ':: Routine to delete a temp file if CONDA_DEBUG is not set',
-  ':DELETE',
-  'GOTO :EOF',
-  '',
 ].join('\r\n')
 
 async function seedWindowsOpenSslHooks(root, condaRootName) {
@@ -195,11 +161,13 @@ async function seedWindowsOpenSslHooks(root, condaRootName) {
   }
 }
 
-async function seedWindowsCondaActivateScript(root, content = WINDOWS_CONDA_ACTIVATE_SCRIPT) {
-  const activatePath = path.join(root, WINDOWS_CONDA_ACTIVATE_PATH)
-  await fs.mkdir(path.dirname(activatePath), { recursive: true })
-  await fs.writeFile(activatePath, content)
-  return activatePath
+async function seedWindowsCondaActivateScripts(root, content = 'corrupted helper\r\n') {
+  const activatePaths = WINDOWS_CONDA_ACTIVATE_PATHS.map((activatePath) => path.join(root, activatePath))
+  for (const activatePath of activatePaths) {
+    await fs.mkdir(path.dirname(activatePath), { recursive: true })
+    await fs.writeFile(activatePath, content)
+  }
+  return activatePaths
 }
 
 async function assertWindowsOpenSslHooksPatched(root, condaRootName) {
@@ -262,49 +230,22 @@ test('Conda init patches Windows OpenSSL hooks for legacy Miniconda roots', asyn
   await assertWindowsOpenSslHooksPatched(root, 'miniconda')
 })
 
-test('Conda init patches Windows CMD activation echo leak idempotently', async () => {
-  const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-conda-cmd-activate-patch-'))
-  await fs.mkdir(path.join(root, 'bin', 'miniforge', 'conda-meta'), { recursive: true })
-  const activatePath = await seedWindowsCondaActivateScript(root)
-  const conda = createConda(createKernel(root))
-
-  await conda.init()
-  const patched = await fs.readFile(activatePath, 'utf8')
-  await conda.init()
-
-  assert.equal(await fs.readFile(activatePath, 'utf8'), patched)
-  assert.equal(patched.includes(WINDOWS_CONDA_ACTIVATE_ORIGINAL_BLOCK), false)
-  assert.match(patched, /ENDLOCAL & @CALL :PINOKIO_APPLY_CONDA_ENV "%%T" "%__conda_tmp%" & @GOTO :EOF/)
-  assert.match(patched, /:PINOKIO_APPLY_CONDA_ENV/)
-  assert.match(patched, /@CALL "%%B" \|\| \(/)
-  assert.match(patched, /:: Routine to delete a temp file if CONDA_DEBUG is not set/)
-})
-
-test('Conda init leaves unexpected Windows CMD activation script unchanged', async () => {
-  const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-conda-cmd-activate-unexpected-'))
+test('Conda init replaces Windows CMD activation helper files', async () => {
+  const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-conda-cmd-activate-replace-'))
   await fs.mkdir(path.join(root, 'bin', 'miniforge', 'conda-meta'), { recursive: true })
-  const unexpected = '@ECHO OFF\r\nREM unexpected upstream script\r\n'
-  const activatePath = await seedWindowsCondaActivateScript(root, unexpected)
+  const activatePaths = await seedWindowsCondaActivateScripts(root)
   const conda = createConda(createKernel(root))
 
   await conda.init()
-
-  assert.equal(await fs.readFile(activatePath, 'utf8'), unexpected)
-})
-
-test('Conda init leaves Windows CMD activation script unchanged when patch anchor is missing', async () => {
-  const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-conda-cmd-activate-missing-anchor-'))
-  await fs.mkdir(path.join(root, 'bin', 'miniforge', 'conda-meta'), { recursive: true })
-  const missingAnchor = WINDOWS_CONDA_ACTIVATE_SCRIPT.replace(
-    '\r\n:: Routine to delete a temp file if CONDA_DEBUG is not set',
-    '\r\n:: unexpected routine header'
-  )
-  const activatePath = await seedWindowsCondaActivateScript(root, missingAnchor)
-  const conda = createConda(createKernel(root))
-
   await conda.init()
 
-  assert.equal(await fs.readFile(activatePath, 'utf8'), missingAnchor)
+  const contents = await Promise.all(activatePaths.map((activatePath) => fs.readFile(activatePath, 'utf8')))
+  assert.equal(contents[0], contents[1])
+  assert.equal(contents[0].includes(WINDOWS_CONDA_ACTIVATE_LEAK_BLOCK), false)
+  assert.match(contents[0], /ENDLOCAL & @CALL :PINOKIO_APPLY_CONDA_ENV "%%T" "%__conda_tmp%" & @GOTO :EOF/)
+  assert.match(contents[0], /:PINOKIO_APPLY_CONDA_ENV\r\n@ECHO OFF/)
+  assert.match(contents[0], /@CALL "%%B" \|\| \(/)
+  assert.match(contents[0], /@ECHO ON\r\n@EXIT \/B 0/)
 })
 
 test('Conda pins Python 3.10.20 consistently across platforms', async () => {
@@ -349,7 +290,6 @@ test('Conda install keeps the Windows Python 3.10.20 SSL-fixed build pin', async
   const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-conda-python-pin-win32-'))
   const kernel = createKernel(root, 'win32')
   const calls = []
-  let activatePath
 
   kernel.bin.mods = []
   kernel.bin.download = async () => {}
@@ -360,7 +300,6 @@ test('Conda install keeps the Windows Python 3.10.20 SSL-fixed build pin', async
       const miniforge = path.join(root, 'bin', 'miniforge')
       await fs.mkdir(path.join(miniforge, 'conda-meta'), { recursive: true })
       await fs.writeFile(path.join(miniforge, 'python.exe'), 'fake python\n')
-      activatePath = await seedWindowsCondaActivateScript(root)
     }
   }
 
@@ -373,7 +312,9 @@ test('Conda install keeps the Windows Python 3.10.20 SSL-fixed build pin', async
     condaInstall.message[1],
     'conda install -y --override-channels -c conda-forge "python=3.10.20=*_1_cpython" "conda-libmamba-solver>=25.4.0"'
   )
-  assert.match(await fs.readFile(activatePath, 'utf8'), /:PINOKIO_APPLY_CONDA_ENV/)
+  for (const activatePath of WINDOWS_CONDA_ACTIVATE_PATHS.map((activatePath) => path.join(root, activatePath))) {
+    assert.match(await fs.readFile(activatePath, 'utf8'), /:PINOKIO_APPLY_CONDA_ENV/)
+  }
 })
 
 test('Conda install replaces legacy miniconda with a compatibility alias to miniforge', async () => {