pinokiod 7.5.6 → 7.5.8

package/kernel/api/shell/index.js

@@ -1,6 +1,7 @@
 const path = require('path')
 const fs = require('fs')
 const os = require('os')
+const CondaRuntimeGuard = require('../../shell_conda_runtime_guard')
 class Shell {
   async applyBluefairyDefault(req = {}, kernel) {
     if (!req.params) {
@@ -179,9 +180,13 @@ class Shell {
       req.params.rows = req.client.rows
       req.params.cols = req.client.cols
     }
-    let response = await kernel.shell.run(req.params, options, async (stream) => {
+    Object.defineProperty(req.params, CondaRuntimeGuard.SHELL_RUN_GUARD, {
+      configurable: true,
+      value: true,
+    })
+    let response = await kernel.shell.run(req.params, options, async (stream, type) => {
 //      process.stdout.write(stream.raw)
-      ondata(stream)
+      ondata(stream, type)
     })
     return response
   }

package/kernel/bin/node.js

@@ -2,12 +2,18 @@ const fs = require('fs')
 const fetch = require('cross-fetch')
 const { rimraf } = require('rimraf')
 const decompress = require('decompress');
-const NODE_VERSION = "22.21.1"
+const NODE_VERSION = "24.18.0"
+const PNPM_VERSION = "11.9.0"
+
+const normalizeVersion = (version) => {
+  const match = String(version || "").match(/^\d+\.\d+\.\d+/)
+  return match ? match[0] : null
+}
 
 class Node {
   description = "Installs Node.js and pnpm in the Pinokio environment."
   cmd() {
-    return `nodejs=${NODE_VERSION} pnpm`
+    return `nodejs=${NODE_VERSION} pnpm=${PNPM_VERSION}`
   }
   async install(req, ondata) {
     await this.kernel.bin.exec({
@@ -18,13 +24,12 @@ class Node {
     }, ondata)
   }
   async installed() {
-    if (this.kernel.bin.installed.conda && this.kernel.bin.installed.conda_versions) {
-      let version = this.kernel.bin.installed.conda_versions.nodejs
-      if (version !== NODE_VERSION) {
-        return false
-      }
+    if (!this.kernel.bin.installed.conda.has("nodejs") || !this.kernel.bin.installed.conda.has("pnpm")) {
+      return false
     }
-    return this.kernel.bin.installed.conda.has("nodejs") && this.kernel.bin.installed.conda.has("pnpm")
+
+    const versions = this.kernel.bin.installed.conda_versions || {}
+    return normalizeVersion(versions.nodejs) === NODE_VERSION && normalizeVersion(versions.pnpm) === PNPM_VERSION
   }
   env() {
     return {

package/kernel/shell.js

@@ -22,6 +22,7 @@ const AnsiStreamTracker = require('./ansi_stream_tracker')
 const ShellStateSync = require('./shell_state_sync')
 const ShellRunTemplate = require('./api/shell_run_template')
 const { PYTHON_INSTALL_SPEC } = require('./bin/conda-pins')
+const CondaRuntimeGuard = require('./shell_conda_runtime_guard')
 const home = os.homedir()
 
 function normalizeComparablePath(filePath, platform) {
@@ -192,7 +193,6 @@ class Shell {
     }
 
     this.env.CONDA_SHORTCUTS = 0
-    this.env.CONDA_CONSOLE = 'json'
 
 //    this.env.TCELL_MINIMIZE=1
     this.env.CMAKE_OBJECT_PATH_MAX = 1024
@@ -1350,6 +1350,25 @@ class Shell {
       venv_activation = []
     }
 
+    const managedBasePrefix = this.kernel.bin && typeof this.kernel.bin.path === "function"
+      ? this.kernel.bin.path("miniforge")
+      : this.kernel.path("bin/miniforge")
+    const flowSessionKey = [this.id, this.start_time].filter(Boolean).join(':')
+    if (params[CondaRuntimeGuard.SHELL_RUN_GUARD]) {
+      CondaRuntimeGuard.applyCondaRuntimeGuard(params, {
+        cwd: params.path,
+        managedBasePrefix,
+        ondata: (stream, type) => {
+          if (this.ondata) {
+            this.ondata(stream, type)
+          }
+        },
+        platform: this.platform,
+        sessionKey: flowSessionKey || this.group || (params.$parent && (params.$parent.id || params.$parent.path)) || params.id || params.path,
+        shellName: this.shell,
+      })
+    }
+
     // 3. construct params.message
     let activation = conda_activation.concat(venv_activation)
     if (this.kernel.bin && typeof this.kernel.bin.activationCommands === "function") {