pinokiod 7.5.33 → 7.5.35

package/kernel/bin/conda.js

@@ -69,6 +69,79 @@ 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",
+    "@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",
+    "",
+  ].join(eol)
+}
 
 class Conda {
   description = "Pinokio uses Conda to install various useful programs in an isolated manner."
@@ -161,6 +234,57 @@ class Conda {
       }
     }
   }
+  async ensureWindowsCondaActivateEchoPatch() {
+    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
+    }
+    const eol = content.includes("\r\n") ? "\r\n" : "\n"
+    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
+    }
+    if (content.includes(WINDOWS_CONDA_ACTIVATE_PINOKIO_MARKER)) {
+      if (content.includes(`${WINDOWS_CONDA_ACTIVATE_PINOKIO_MARKER}${eol}@ECHO OFF`)) {
+        return
+      }
+      const routineStart = content.indexOf(WINDOWS_CONDA_ACTIVATE_PINOKIO_MARKER)
+      const routineAnchorIndex = content.indexOf(routineAnchor, routineStart)
+      if (routineAnchorIndex < 0) {
+        console.warn("Could not update Conda CMD activation echo patch; missing _conda_activate.bat routine anchor")
+        return
+      }
+      const patched = [
+        content.slice(0, routineStart),
+        windowsCondaActivatePatchRoutines(eol),
+        content.slice(routineAnchorIndex + eol.length),
+      ].join("")
+      await fs.promises.writeFile(activatePath, patched)
+      return
+    }
+    const originalBlock = windowsCondaActivateOriginalBlock(eol)
+    if (!content.includes(originalBlock)) {
+      console.warn("Could not patch Conda CMD activation echo leak; unexpected _conda_activate.bat")
+      return
+    }
+    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) {
         console.log("condarc init")
@@ -183,6 +307,7 @@ report_errors: false`)
         await this.ensureCompatibilityAlias()
       }
       await this.ensureWindowsOpenSslHooks()
+      await this.ensureWindowsCondaActivateEchoPatch()
     }
   }
   async check() {
@@ -331,6 +456,7 @@ report_errors: false`)
       )
     }
     await this.ensureWindowsOpenSslHooks()
+    await this.ensureWindowsCondaActivateEchoPatch()
     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.33",
+  "version": "7.5.35",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/views/app.ejs

@@ -11040,6 +11040,9 @@ const rerenderMenuSection = (container, html) => {
 	  try {
 	    setLogsNewBadge(window.sessionStorage.getItem(logsNotificationKey) === "1")
 	  } catch (_) {}
+	  if (document.querySelector(".appcanvas") && document.querySelector(".appcanvas").dataset.pageError === "1") {
+	    setLogsNewBadge(true)
+	  }
   const pluginInstallPreflightCache = new Map()
   const normalizePluginPathFromLaunchHref = (rawHref) => {
     if (!rawHref || typeof rawHref !== "string") {
@@ -12348,7 +12351,7 @@ const rerenderMenuSection = (container, html) => {
 	            }
 	            return
 	          }
-	          if (event.data.e === "pinokio:logs-new" || event.data.type === "pinokio:logs-new") {
+	          if (event.data.e === "pinokio:logs-new" || event.data.type === "pinokio:logs-new" || event.data.e === "pinokio:open-logs" || event.data.type === "pinokio:open-logs") {
 	            setLogsNewBadge(true)
 	            return
           }

package/test/conda-bin.test.js

@@ -125,6 +125,58 @@ 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 = [
+  '    ) 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) {
   const condaHookRoot = path.join(root, 'bin', condaRootName, 'etc', 'conda')
   for (const hookRelativePath of Object.keys(EXPECTED_WINDOWS_OPENSSL_HOOKS)) {
@@ -143,6 +195,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 assertWindowsOpenSslHooksPatched(root, condaRootName) {
   const condaHookRoot = path.join(root, 'bin', condaRootName, 'etc', 'conda')
   for (const [hookRelativePath, expectedContent] of Object.entries(EXPECTED_WINDOWS_OPENSSL_HOOKS)) {
@@ -203,6 +262,83 @@ 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\r\n@ECHO OFF/)
+  assert.match(patched, /@CALL "%%B" \|\| \(/)
+  assert.match(patched, /@ECHO ON\r\n@EXIT \/B 0/)
+  assert.match(patched, /:: Routine to delete a temp file if CONDA_DEBUG is not set/)
+})
+
+test('Conda init updates the earlier Windows CMD activation echo patch', async () => {
+  const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-conda-cmd-activate-update-patch-'))
+  await fs.mkdir(path.join(root, 'bin', 'miniforge', 'conda-meta'), { recursive: true })
+  const oldPatch = WINDOWS_CONDA_ACTIVATE_SCRIPT
+    .replace(
+      WINDOWS_CONDA_ACTIVATE_ORIGINAL_BLOCK,
+      '    ) ELSE ENDLOCAL & @CALL :PINOKIO_APPLY_CONDA_ENV "%%T" "%__conda_tmp%" & @GOTO :EOF'
+    )
+    .replace(
+      '\r\n:: Routine to delete a temp file if CONDA_DEBUG is not set',
+      [
+        '\r\n:PINOKIO_APPLY_CONDA_ENV',
+        '@FOR /F "tokens=1,* delims==" %%A IN (%~1) DO (',
+        '@IF "%CONDA_DEBUG%" == "1" ECHO DEBUG: "%%A=%%B">&2',
+        ')',
+        '@CALL :DELETE "%~1"',
+        '@CALL :DELETE "%~2"',
+        '@EXIT /B 0',
+        ':: Routine to delete a temp file if CONDA_DEBUG is not set',
+      ].join('\r\n')
+    )
+  const activatePath = await seedWindowsCondaActivateScript(root, oldPatch)
+  const conda = createConda(createKernel(root))
+
+  await conda.init()
+
+  const patched = await fs.readFile(activatePath, 'utf8')
+  assert.match(patched, /:PINOKIO_APPLY_CONDA_ENV\r\n@ECHO OFF/)
+  assert.match(patched, /@ECHO ON\r\n@EXIT \/B 0/)
+})
+
+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-'))
+  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 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)
+})
+
 test('Conda pins Python 3.10.20 consistently across platforms', async () => {
   assert.equal(PYTHON_INSTALL_SPEC, 'python=3.10.20')
   assert.equal(WINDOWS_PYTHON_SSL_FIX_SPEC, 'python=3.10.20=*_1_cpython')
@@ -245,6 +381,7 @@ 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 () => {}
@@ -255,6 +392,7 @@ 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)
     }
   }
 
@@ -267,6 +405,7 @@ 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/)
 })
 
 test('Conda install replaces legacy miniconda with a compatibility alias to miniforge', async () => {