pinokiod 7.1.73 → 7.1.75

package/kernel/api/script/index.js

@@ -13,13 +13,13 @@ class Script {
     return null
   }
   currentSessionId(req) {
-    if (req && typeof req.id === "string" && req.id.trim()) {
-      return req.id
-    }
     const parent = this.currentParent(req)
     if (parent && typeof parent.id === "string" && parent.id.trim()) {
       return parent.id
     }
+    if (req && typeof req.id === "string" && req.id.trim()) {
+      return req.id
+    }
     return undefined
   }
   currentCaller(req) {
@@ -192,14 +192,16 @@ class Script {
           input: req.params.params,
           client: this.currentClient(req),
         }
-        if (req.id) {
-          request.id = req.id
-        }
         const caller = this.currentCaller(req)
         if (caller) {
           request.caller = caller
-        } else if (req.parent && req.parent.path) {
-          request.caller = req.parent.path
+        } else {
+          const parent = this.currentParent(req)
+          if (parent && typeof parent.id === "string" && parent.id.trim()) {
+            request.caller = parent.id
+          } else if (req.parent && req.parent.path) {
+            request.caller = req.parent.path
+          }
         }
         const origin = this.currentOrigin(req)
         if (origin) {

package/kernel/api/shell/index.js

@@ -2,15 +2,35 @@ const path = require('path')
 const fs = require('fs')
 const os = require('os')
 class Shell {
-  applyBluefairyDefault(req = {}) {
-    if (!req.params || Object.prototype.hasOwnProperty.call(req.params, "bluefairy")) {
+  async applyBluefairyDefault(req = {}, kernel) {
+    if (!req.params) {
+      return
+    }
+    if (Object.prototype.hasOwnProperty.call(req.params, "bluefairy")) {
+      return
+    }
+    const preferences = kernel && kernel.appPreferences
+    if (
+      !preferences
+      || !kernel
+      || !kernel.api
+      || typeof kernel.api.resolvePath !== "function"
+      || typeof preferences.resolveAppIdFromPath !== "function"
+      || typeof preferences.getPreference !== "function"
+    ) {
+      req.params.bluefairy = "off"
       return
     }
-    if (req.parent && Object.prototype.hasOwnProperty.call(req.parent, "protection_enabled")) {
-      req.params.bluefairy = req.parent.protection_enabled === false ? "off" : "on"
-    } else {
+    const cwd = req.cwd || kernel.homedir
+    const requestedPath = req.params.path || "."
+    const resolvedPath = kernel.api.resolvePath(cwd, requestedPath)
+    const appId = preferences.resolveAppIdFromPath(resolvedPath)
+    if (!appId) {
       req.params.bluefairy = "off"
+      return
     }
+    const preference = await preferences.getPreference(appId)
+    req.params.bluefairy = preference && preference.protection_enabled === true ? "on" : "off"
   }
   async start(req, ondata, kernel) {
     /*
@@ -50,7 +70,9 @@ class Shell {
     if (req.params) {
       req.params.$parent = req.parent
     }
-    this.applyBluefairyDefault(req)
+    if (!Object.prototype.hasOwnProperty.call(req.params, "bluefairy")) {
+      req.params.bluefairy = "off"
+    }
 
 //    // create a persistent session
 //    req.params.persistent = true
@@ -136,10 +158,13 @@ class Shell {
     if (!req.params) {
       req.params = {}
     }
+    if (!req.params.path) {
+      req.params.path = req.cwd
+    }
     if (req.params) {
       req.params.$parent = req.parent
     }
-    this.applyBluefairyDefault(req)
+    await this.applyBluefairyDefault(req, kernel)
     let options = {}
     if (req.cwd) options.cwd = req.cwd
     if (req.parent && req.parent.id) {

package/kernel/bin/bluefairy.js

@@ -4,7 +4,7 @@ const semver = require('semver')
 
 class Bluefairy {
   description = "Installs Bluefairy, a standalone package freshness guard."
-  version = ">=0.0.28"
+  version = ">=0.0.31"
 
   packageName() {
     return "bluefairy"
@@ -37,6 +37,10 @@ class Bluefairy {
     return this.kernel.bin.path("bluefairy")
   }
 
+  packageInstallPath() {
+    return path.resolve(this.moduleRoot(), this.packageName())
+  }
+
   env() {
     return {
       BLUEFAIRY_HOME: this.runtimeHome()
@@ -63,6 +67,20 @@ class Bluefairy {
     ]
   }
 
+  binLauncherArtifacts() {
+    const binDir = this.npmBinDir()
+    if (this.kernel.platform === "win32") {
+      return [
+        path.resolve(binDir, "bluefairy"),
+        path.resolve(binDir, "bluefairy.cmd"),
+        path.resolve(binDir, "bluefairy.ps1"),
+      ]
+    }
+    return [
+      path.resolve(binDir, "bluefairy"),
+    ]
+  }
+
   runtimeArtifacts() {
     const runtimeHome = this.runtimeHome()
     if (this.kernel.platform === "win32") {
@@ -97,18 +115,61 @@ class Bluefairy {
     }
   }
 
-  async install(req, ondata) {
-    const spec = this.packageSpec().replaceAll('"', '\\"')
-    const runtimeHome = this.runtimeHome()
-    if (fs.existsSync(runtimeHome)) {
-      try {
-        await fs.promises.rm(runtimeHome, { recursive: true, force: true })
-        ondata({ raw: `Removed existing Bluefairy runtime: ${runtimeHome}\r\n` })
-      } catch (error) {
-        const message = error && error.message ? error.message : String(error)
-        ondata({ raw: `Warning: failed to remove Bluefairy runtime ${runtimeHome}: ${message}\r\n` })
+  async removePath(target, ondata, label) {
+    if (!fs.existsSync(target)) {
+      return
+    }
+    try {
+      await fs.promises.rm(target, { recursive: true, force: true })
+      ondata({ raw: `Removed ${label}: ${target}\r\n` })
+    } catch (error) {
+      const message = error && error.message ? error.message : String(error)
+      ondata({ raw: `Warning: failed to remove ${label} ${target}: ${message}\r\n` })
+    }
+  }
+
+  async removeRetiredEntries(parentDir, ondata) {
+    let entries
+    try {
+      entries = await fs.promises.readdir(parentDir)
+    } catch (error) {
+      const message = error && error.message ? error.message : String(error)
+      ondata({ raw: `Warning: failed to list ${parentDir}: ${message}\r\n` })
+      return
+    }
+
+    const retiredPrefix = `.${this.packageName()}-`
+    for (const entry of entries) {
+      if (!entry.startsWith(retiredPrefix)) {
+        continue
       }
+      await this.removePath(
+        path.resolve(parentDir, entry),
+        ondata,
+        "stale Bluefairy install temp"
+      )
+    }
+  }
+
+  async cleanupInstallState(ondata) {
+    const cleanupTargets = new Set([
+      this.runtimeHome(),
+      this.packageInstallPath(),
+      ...this.installedArtifacts(),
+      ...this.binLauncherArtifacts(),
+    ])
+
+    for (const target of cleanupTargets) {
+      await this.removePath(target, ondata, "existing Bluefairy install state")
     }
+
+    await this.removeRetiredEntries(this.moduleRoot(), ondata)
+    await this.removeRetiredEntries(this.npmBinDir(), ondata)
+  }
+
+  async install(req, ondata) {
+    const spec = this.packageSpec().replaceAll('"', '\\"')
+    await this.cleanupInstallState(ondata)
     await this.kernel.exec({
       env: this.env(),
       message: `npm install -g "${spec}" --force`,

package/kernel/shell.js

@@ -21,6 +21,51 @@ const AnsiStreamTracker = require('./ansi_stream_tracker')
 const ShellStateSync = require('./shell_state_sync')
 const home = os.homedir()
 
+function normalizeComparablePath(filePath, platform) {
+  const normalized = path.normalize(filePath)
+  return platform === 'win32' ? normalized.toLowerCase() : normalized
+}
+
+function isBluefairyShimPath(filePath, platform) {
+  if (!filePath || typeof filePath !== "string") {
+    return false
+  }
+  const normalized = normalizeComparablePath(filePath.trim(), platform)
+  if (!normalized) {
+    return false
+  }
+  const shimDirName = path.basename(normalized)
+  if (shimDirName !== "shims") {
+    return false
+  }
+  const parentDirName = path.basename(path.dirname(normalized))
+  return parentDirName === "bluefairy" || parentDirName === ".bluefairy"
+}
+
+function stripBluefairyShimPaths(pathValue, platform) {
+  if (!pathValue || typeof pathValue !== "string") {
+    return pathValue
+  }
+  return pathValue
+    .split(path.delimiter)
+    .filter((entry) => entry && !isBluefairyShimPath(entry, platform))
+    .join(path.delimiter)
+}
+
+const CONDA_ACTIVATION_STATE_PATTERN = /^(?:_CE_(?:M|CONDA)|CONDA_(?:EXE|PYTHON_EXE|PREFIX(?:_\d+)?|DEFAULT_ENV|PROMPT_MODIFIER|SHLVL|PS1_BACKUP))$/
+
+function isCondaActivationStateKey(key) {
+  return typeof key === "string" && CONDA_ACTIVATION_STATE_PATTERN.test(key)
+}
+
+function stripInheritedCondaActivationState(env) {
+  for (const key of Object.keys(env)) {
+    if (isCondaActivationStateKey(key)) {
+      delete env[key]
+    }
+  }
+}
+
 // xterm.js currently ignores DECSYNCTERM (CSI ? 2026 h/l) and renders it as text on Windows.
 // filterDecsync() removes these sequences so they do not pollute the terminal output.
 class Shell {
@@ -91,6 +136,12 @@ class Shell {
   }
   async init_env(params) {
     this.env = Object.assign({}, process.env)
+    for (const key of Object.keys(this.env)) {
+      if (key.toUpperCase().startsWith("BLUEFAIRY_")) {
+        delete this.env[key]
+      }
+    }
+    stripInheritedCondaActivationState(this.env)
     // If the user has set PYTHONPATH, unset it.
     if (this.env.PYTHONPATH) {
       delete this.env.PYTHONPATH
@@ -166,6 +217,7 @@ class Shell {
       let app_env = await Environment.get(api_path, this.kernel)
       this.env = Object.assign(this.env, app_env)
     }
+    stripInheritedCondaActivationState(this.env)
     let PATH_KEY = Object.keys(this.env).find((key) => key.toLowerCase() === "path") || "PATH";
     if (!this.env[PATH_KEY]) {
       // fall back to whichever casing exists so we don't end up writing to an undefined key
@@ -232,6 +284,9 @@ class Shell {
       }
     }
 
+    stripInheritedCondaActivationState(this.env)
+    this.env[PATH_KEY] = stripBluefairyShimPaths(this.env[PATH_KEY], this.platform)
+
     for(let key in this.env) {
       if (!/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key) && key !== "ProgramFiles(x86)") {
         delete this.env[key]

package/kernel/shells.js

@@ -301,6 +301,7 @@ class Shells {
     let liveEventBuffer = ""
     let liveEventOffset = 0
     let liveEventAnsiCarry = ""
+    let liveEventHandlersClosed = false
 
     // Keep cross-chunk event matching, but normalize terminal styling away first.
     // Preserve line boundaries so later shell banners cannot fuse onto prior matches.
@@ -428,7 +429,7 @@ class Shells {
           liveEventOffset += normalizedChunk.length
         }
         const liveEventBufferStart = Math.max(0, liveEventOffset - liveEventBuffer.length)
-        if (params.on && Array.isArray(params.on)) {
+        if (!liveEventHandlersClosed && params.on && Array.isArray(params.on)) {
           for(let i=0; i<params.on.length; i++) {
             let handler = params.on[i]
             if (handler.once && onceHandlers.has(i)) {
@@ -476,11 +477,18 @@ class Shells {
                     }
                     const lastMatch = rendered_event[rendered_event.length - 1]
                     handlerLastMatchEnd.set(i, liveEventBufferStart + lastMatch.index + lastMatch[0].length)
-                    stream.matches = rendered_event
-                    m = rendered_event[0]
-                    matched_index = i
-                    if (typeof handler.trigger === "string" && handler.trigger.trim()) {
-                      const triggerAction = handler.trigger.trim()
+                    const triggerAction = typeof handler.trigger === "string" ? handler.trigger.trim() : ""
+                    const shouldCaptureEvent =
+                      handler.break !== false
+                      || handler.done
+                      || handler.kill
+                      || !!triggerAction
+                    if (shouldCaptureEvent) {
+                      stream.matches = rendered_event
+                      m = rendered_event[0]
+                      matched_index = i
+                    }
+                    if (triggerAction) {
                       queueTriggerAction(triggerAction, rendered_event[0]).catch((e) => {
                         console.log("Trigger error", e)
                         if (ondata) {
@@ -490,9 +498,13 @@ class Shells {
                     }
                     if (handler.kill) {
                       sh.kill()
+                      liveEventHandlersClosed = true
+                      break
                     }
                     if (handler.done) {
                       sh.continue()
+                      liveEventHandlersClosed = true
+                      break
                     }
                   }
                 }

package/package.json

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

package/server/index.js

@@ -213,6 +213,7 @@ class Server {
     })
     this.appRegistry = new AppRegistryService({ kernel: this.kernel })
     this.appPreferences = new AppPreferencesService({ kernel: this.kernel })
+    this.kernel.appPreferences = this.appPreferences
     this.appLogs = new AppLogService({ registry: this.appRegistry })
     this.appSearch = new AppSearchService({
       kernel: this.kernel,
@@ -1251,7 +1252,7 @@ class Server {
           path: 'remote.origin.url'
         })
         if (gitRemote && this.portal) {
-          community_url = `${this.portal}/resolve?url=${encodeURIComponent(gitRemote)}&embed=1&theme=${encodeURIComponent(this.theme)}`
+          community_url = `${this.portal}/resolve?url=${encodeURIComponent(gitRemote)}&embed=1&theme=${encodeURIComponent(this.theme)}&pinokio_checkin_bridge=v1`
         }
       } catch (_) {
         community_url = ""
@@ -6417,8 +6418,6 @@ class Server {
       } else {
         registryOverride = null
       }
-      console.log("[registry/checkin] repo=%s return=%s registryRaw=%s registryOverride=%s", repoUrl || "", returnUrl || "", registryRaw || "", registryOverride || "")
-
       let candidates = []
       if (repoUrl && this.kernel && this.kernel.git) {
         const apiRoot = this.kernel.path('api')
@@ -6538,7 +6537,6 @@ class Server {
 	        if (wantPublish) {
 	          const registry = await this.getRegistryConfig()
 	          const baseUrl = registryOverride || (registry && registry.url ? String(registry.url).replace(/\/$/, '') : null)
-	          console.log("[checkpoints/snapshot] publish=1 registryOverride=%s baseUrl=%s hasToken=%s", registryOverride || "", baseUrl || "", registryToken ? "yes" : "no")
 	          if (!baseUrl || !registryToken) {
 	            await this.kernel.git.setCheckpointSync(created.remoteKey, created.id, { status: "needs_token", at: Date.now() }).catch(() => {})
 	            res.json({ ok: true, created: created || null, publish: { ok: false, code: "missing_token" } })
@@ -12714,12 +12712,14 @@ class Server {
 //      }
 //
       res.render("setup", {
+        mode: req.params.mode,
         wait,
         error,
         current,
         install_required,
         requirements,
         requirements_pending,
+        portal: this.portal,
         logo: this.logo,
         theme: this.theme,
         agent: req.agent,