pinokiod 3.181.0 → 3.182.0

package/kernel/util.js

@@ -664,7 +664,18 @@ function push(params) {
     if (HTTP_URL_REGEX.test(trimmed)) {
       clientSoundUrl = trimmed
     } else {
-      console.warn(`Ignoring notification sound (expected http/https URL): ${trimmed}`)
+      let normalised = trimmed.startsWith('/') ? trimmed : `/${trimmed}`
+      let decoded = normalised
+      try {
+        decoded = decodeURIComponent(normalised)
+      } catch (_) {
+        // Ignore decode errors; fall back to original string
+      }
+      if (decoded.startsWith('/sound/') && !decoded.includes('..')) {
+        clientSoundUrl = normalised
+      } else {
+        console.warn(`Ignoring notification sound (expected http/https URL or /sound asset): ${trimmed}`)
+      }
     }
   }
 
@@ -700,13 +711,15 @@ function push(params) {
   const clientImage = resolvePublicAssetUrl(notifyParams.contentImage) || resolvePublicAssetUrl(notifyParams.image)
   const deviceId = (typeof notifyParams.device_id === 'string' && notifyParams.device_id.trim()) ? notifyParams.device_id.trim() : null
   const audience = (typeof notifyParams.audience === 'string' && notifyParams.audience.trim()) ? notifyParams.audience.trim() : null
+  const clientEventSound = requestedSound === false ? false : (clientSoundUrl || null)
+
   const eventPayload = {
     id: randomUUID(),
     title: notifyParams.title,
     subtitle: notifyParams.subtitle || null,
     message: notifyParams.message || '',
     image: clientImage,
-    sound: clientSoundUrl || null,
+    sound: clientEventSound,
     timestamp: Date.now(),
     platform,
     device_id: deviceId,

package/package.json

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

package/server/index.js

@@ -38,6 +38,7 @@ const ini = require('ini')
 const ejs = require('ejs');
 
 const DEFAULT_PORT = 42000
+const NOTIFICATION_SOUND_EXTENSIONS = new Set(['.aac', '.flac', '.m4a', '.mp3', '.ogg', '.wav', '.webm'])
 
 const ex = fn => (req, res, next) => {
   Promise.resolve(fn(req, res, next)).catch(next);
@@ -3444,8 +3445,8 @@ class Server {
       }
       terminal = {
         icon: "fa-solid fa-terminal",
-        title: "User Terminal",
-        subtitle: "Open the terminal in the browser",
+        title: "Shell",
+        subtitle: "Open an interactive terminal in the browser",
         menu: terminals
       }
     } else {
@@ -3912,6 +3913,46 @@ class Server {
       getTheme: () => this.theme,
       exists: (target) => this.exists(target),
     });
+
+    this.app.get('/pinokio/notification-sounds', ex(async (req, res) => {
+      const soundRoot = path.resolve(__dirname, 'public', 'sound');
+      let entries = [];
+      try {
+        const dirEntries = await fs.promises.readdir(soundRoot, { withFileTypes: true });
+        entries = dirEntries
+          .filter((entry) => entry.isFile())
+          .map((entry) => entry.name)
+          .filter((name) => NOTIFICATION_SOUND_EXTENSIONS.has(path.extname(name).toLowerCase()))
+          .sort((a, b) => a.localeCompare(b, undefined, { sensitivity: 'base' }));
+      } catch (error) {
+        if (error && error.code === 'ENOENT') {
+          return res.json({ sounds: [] });
+        }
+        return res.status(500).json({
+          error: 'Failed to enumerate notification sounds',
+          details: error && error.message ? error.message : String(error || ''),
+        });
+      }
+
+      const normalizeLabel = (filename) => {
+        const withoutExt = filename.replace(/\.[^.]+$/, '');
+        return withoutExt
+          .replace(/[-_]+/g, ' ')
+          .replace(/\b\w/g, (char) => char.toUpperCase());
+      };
+
+      const sounds = entries.map((filename) => {
+        const encoded = filename.split('/').map(encodeURIComponent).join('/');
+        return {
+          id: filename,
+          label: normalizeLabel(filename),
+          url: `/sound/${encoded}`,
+          filename,
+        };
+      });
+
+      res.json({ sounds });
+    }));
     /*
     this.app.get("/asset/*", ex((req, res) => {
       let pathComponents = req.params[0].split("/")
@@ -3982,7 +4023,7 @@ class Server {
         list,
       })
     }))
-    this.app.get("/terminals", ex(async (req, res) => {
+    this.app.get("/agents", ex(async (req, res) => {
       if (!this.kernel.plugin.config) {
         try {
           await this.kernel.plugin.init()
@@ -4059,7 +4100,7 @@ class Server {
       let peer_qr = null
       try { peer_qr = await QRCode.toDataURL(peer_url) } catch (_) {}
       const list = this.getPeers()
-      res.render("terminals", {
+      res.render("agents", {
         current_host: this.kernel.peer.host,
         peer_url,
         peer_qr,
@@ -4072,8 +4113,25 @@ class Server {
         list,
       })
     }))
+    this.app.get("/api/plugin/menu", ex(async (req, res) => {
+      try {
+        if (!this.kernel.plugin.config) {
+          await this.kernel.plugin.init()
+        }
+        const pluginMenu = this.kernel.plugin && this.kernel.plugin.config && Array.isArray(this.kernel.plugin.config.menu)
+          ? this.kernel.plugin.config.menu
+          : []
+        res.json({ menu: pluginMenu })
+      } catch (error) {
+        console.warn('Failed to load plugin menu for create launcher modal', error)
+        res.json({ menu: [] })
+      }
+    }))
     this.app.get("/plugins", (req, res) => {
-      res.redirect(301, "/terminals")
+      res.redirect(301, "/agents")
+    })
+    this.app.get("/terminals", (req, res) => {
+      res.redirect(301, "/agents")
     })
     this.app.get("/screenshots", ex(async (req, res) => {
       const peer_url = `http://${this.kernel.peer.host}:${DEFAULT_PORT}`
@@ -6491,6 +6549,40 @@ class Server {
       let exec_menus = []
       let shell_menus = []
       let href_menus = []
+      const normalizeForSort = (value) => {
+        if (typeof value !== 'string') {
+          return ''
+        }
+        return value.trim().toLocaleLowerCase()
+      }
+      const compareMenuItems = (a = {}, b = {}) => {
+        const titleDiff = normalizeForSort(a.title).localeCompare(normalizeForSort(b.title))
+        if (titleDiff !== 0) {
+          return titleDiff
+        }
+        const subtitleDiff = normalizeForSort(a.subtitle).localeCompare(normalizeForSort(b.subtitle))
+        if (subtitleDiff !== 0) {
+          return subtitleDiff
+        }
+        return normalizeForSort(a.href || a.link).localeCompare(normalizeForSort(b.href || b.link))
+      }
+      const sortMenuEntries = (menuArray) => {
+        if (!Array.isArray(menuArray) || menuArray.length < 2) {
+          return
+        }
+        menuArray.sort(compareMenuItems)
+      }
+      const sortNestedMenus = (menuArray) => {
+        if (!Array.isArray(menuArray)) {
+          return
+        }
+        sortMenuEntries(menuArray)
+        for (const entry of menuArray) {
+          if (entry && Array.isArray(entry.menu)) {
+            sortNestedMenus(entry.menu)
+          }
+        }
+      }
       if (plugin_menu.length > 0) {
         for(let item of plugin_menu) {
           // if shell.run method exists
@@ -6518,30 +6610,37 @@ class Server {
             href_menus.push(item)
           }
         }
-        exec_menus.sort((a, b) => { return a > b })
-        shell_menus.sort((a, b) => { return a > b })
-        href_menus.sort((a, b) => { return a > b })
+        sortNestedMenus(exec_menus)
+        sortNestedMenus(shell_menus)
+        sortNestedMenus(href_menus)
       }
 
 //      let terminal = await this.terminals(filepath)
 //      let online_terminal = await this.getPluginGlobal(req, terminal, filepath)
 //      console.log("online_terminal", online_terminal)
       terminal.menus = href_menus
+      sortNestedMenus(terminal.menu)
+      sortNestedMenus(terminal.menus)
       let dynamic = [
         terminal,
         {
           icon: "fa-solid fa-robot",
-          title: "AI Terminal",
-          subtitle: "Let AI work on this app",
+          title: "Terminal Agents",
+          subtitle: "Start a session in Pinokio",
           menu: shell_menus
         },
         {
           icon: "fa-solid fa-arrow-up-right-from-square",
-          title: "External apps",
-          subtitle: "Open this project in 3rd party apps",
+          title: "IDE Agents",
+          subtitle: "Open the project in external IDEs",
           menu: exec_menus
         },
       ]
+      for (const item of dynamic) {
+        if (item && Array.isArray(item.menu)) {
+          sortNestedMenus(item.menu)
+        }
+      }
 
       let spec = ""
       try {