pinokiod 7.1.32 → 7.1.33

package/kernel/api/index.js

@@ -203,6 +203,69 @@ class Api {
     }
     return meta
   }
+  async listApps() {
+    const apps = []
+    const apiRoot = this.userdir || this.kernel.path("api")
+    let entries
+    try {
+      entries = await fs.promises.readdir(apiRoot, { withFileTypes: true })
+    } catch (enumerationError) {
+      console.warn("Failed to enumerate api apps", enumerationError)
+      return apps
+    }
+
+    for (const entry of entries) {
+      let type
+      try {
+        type = await Util.file_type(apiRoot, entry)
+      } catch (typeError) {
+        console.warn("Failed to inspect api entry", entry.name, typeError)
+        continue
+      }
+      if (!type || !type.directory) {
+        continue
+      }
+
+      const workspacePath = path.resolve(apiRoot, entry.name)
+      let meta
+      try {
+        meta = await this.meta(entry.name)
+      } catch (metaError) {
+        console.warn("Failed to load app metadata", entry.name, metaError)
+        meta = null
+      }
+
+      const launcherPath = meta && meta.path ? meta.path : workspacePath
+      const title = meta && meta.title ? meta.title : entry.name
+      const description = meta && meta.description ? meta.description : ""
+      const icon = meta && meta.icon ? meta.icon : "/pinokio-black.png"
+      apps.push({
+        id: entry.name,
+        name: entry.name,
+        title,
+        description,
+        icon,
+        workspace_path: workspacePath,
+        launcher_path: launcherPath,
+        launcher_root: path.relative(workspacePath, launcherPath),
+        meta: meta || {
+          title,
+          description,
+          icon,
+          path: launcherPath
+        }
+      })
+    }
+
+    apps.sort((a, b) => {
+      const at = (a.title || a.name || "").toLowerCase()
+      const bt = (b.title || b.name || "").toLowerCase()
+      if (at < bt) return -1
+      if (at > bt) return 1
+      return (a.name || "").localeCompare(b.name || "")
+    })
+    return apps
+  }
   get_proxy_url(root, port) {
     if (this.proxies) {
       let proxies = this.proxies[root]
@@ -795,12 +858,13 @@ class Api {
 
     let port = await this.kernel.port()
 
-    let { cwd, script } = await this.resolveScript(request.path)
+    let { cwd: scriptDir, script } = await this.resolveScript(request.path)
     const actionKey = request.action || 'run'
     const steps = (script && Array.isArray(script[actionKey])) ? script[actionKey] : []
     const totalSteps = steps.length
 
-    let name = path.relative(this.kernel.path("api"), cwd)
+    let name = path.relative(this.kernel.path("api"), scriptDir)
+    let cwd = scriptDir
 
     if (request.cwd) {
       cwd = request.cwd
@@ -822,6 +886,7 @@ class Api {
       current: i,
       uri: request.uri,
       cwd,
+      dirname: scriptDir,
       exists: (...args) => {
         return fs.existsSync(path.resolve(cwd, ...args))
       },

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.16"
+  version = ">=0.0.17"
 
   packageName() {
     return "bluefairy"

package/package.json

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

package/server/index.js

@@ -3025,6 +3025,9 @@ class Server {
           const shellPrefix = "shell/" + unix_item_path + "_"
           const matchesShell = (candidate) => {
             if (!candidate) return false
+            if (typeof candidate.group === "string" && candidate.group.includes("?cwd=")) {
+              return false
+            }
             const idMatches = typeof candidate.id === "string" && candidate.id.startsWith(shellPrefix)
             const shellPath = typeof candidate.path === "string" ? path.normalize(candidate.path) : null
             const groupPath = typeof candidate.group === "string" ? path.normalize(candidate.group) : null
@@ -3064,6 +3067,10 @@ class Server {
 
             // not only should include the pattern, but also end with it (otherwise can include similar patterns such as /api/qqqa, /api/qqqaaa, etc.
 
+            if (key.includes("?cwd=")) {
+              continue
+            }
+
             let is_running
             let api_path = this.kernel.path("api")
             if (this.is_subpath(api_path, key)) {
@@ -5012,78 +5019,228 @@ class Server {
     }
     return shellOptions
   }
+  normalizeBundledPluginSpec(value) {
+    if (this.appRegistry && typeof this.appRegistry.normalizeRelativeScriptPath === "function") {
+      return this.appRegistry.normalizeRelativeScriptPath(value)
+    }
+    if (typeof value !== "string") {
+      return ""
+    }
+    const trimmed = value.trim()
+    if (!trimmed) {
+      return ""
+    }
+    const normalized = path.posix.normalize(trimmed.replace(/\\/g, "/"))
+    if (!normalized || normalized === "." || normalized.startsWith("../") || normalized.startsWith("/")) {
+      return ""
+    }
+    return normalized
+  }
+  isValidBundledPluginConfig(pluginConfig) {
+    if (!pluginConfig || !Array.isArray(pluginConfig.run)) {
+      return false
+    }
+    for (const key of Object.keys(pluginConfig)) {
+      if (typeof pluginConfig[key] === "function") {
+        return false
+      }
+    }
+    return true
+  }
+  isPathInsideRootForBundledPlugin(candidatePath, rootPath) {
+    const relative = path.relative(rootPath, candidatePath)
+    return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative))
+  }
+  async getBundledPluginAppDescriptor(appName, metaOverride) {
+    if (typeof appName !== "string" || !appName.trim()) {
+      return null
+    }
+    const workspacePath = this.kernel.path("api", appName)
+    let meta = metaOverride
+    if (!meta) {
+      try {
+        meta = await this.kernel.api.meta(appName)
+      } catch (metaError) {
+        console.warn("Failed to load app metadata for bundled plugins", appName, metaError)
+        meta = null
+      }
+    }
+    const launcherPath = meta && meta.path ? meta.path : workspacePath
+    return {
+      name: appName,
+      title: meta && meta.title ? meta.title : appName,
+      description: meta && meta.description ? meta.description : "",
+      icon: meta && meta.icon ? meta.icon : "/pinokio-black.png",
+      workspacePath,
+      launcherPath,
+      meta: meta || {
+        title: appName,
+        description: "",
+        icon: "/pinokio-black.png",
+        path: launcherPath
+      }
+    }
+  }
+  async getBundledPluginMenuItems(appDescriptor) {
+    if (!appDescriptor || !appDescriptor.meta) {
+      return []
+    }
+    const pluginSpecs = Array.isArray(appDescriptor.meta.plugins) ? appDescriptor.meta.plugins : []
+    if (pluginSpecs.length === 0) {
+      return []
+    }
+
+    const bundledMenu = []
+    for (const pluginSpec of pluginSpecs) {
+      const normalizedSpec = this.normalizeBundledPluginSpec(pluginSpec)
+      if (!normalizedSpec || path.posix.basename(normalizedSpec) !== "pinokio.js") {
+        continue
+      }
+      const pluginAbsolutePath = path.resolve(appDescriptor.launcherPath, normalizedSpec)
+      if (!this.isPathInsideRootForBundledPlugin(pluginAbsolutePath, appDescriptor.launcherPath)) {
+        continue
+      }
+
+      let pluginConfig
+      try {
+        pluginConfig = (await this.kernel.loader.load(pluginAbsolutePath)).resolved
+      } catch (pluginLoadError) {
+        console.warn("Failed to load bundled plugin", pluginAbsolutePath, pluginLoadError)
+        continue
+      }
+      if (!this.isValidBundledPluginConfig(pluginConfig)) {
+        continue
+      }
+
+      const pluginRelativePath = path.relative(appDescriptor.workspacePath, pluginAbsolutePath).split(path.sep).join("/")
+      const menuItem = {
+        ...safeStructuredClone(pluginConfig),
+        href: `/run/api/${appDescriptor.name}/${pluginRelativePath}`,
+        src: `/api/${appDescriptor.name}/${pluginRelativePath}`,
+        ownerApp: {
+          name: appDescriptor.name,
+          title: appDescriptor.title,
+          cwd: appDescriptor.workspacePath
+        },
+        defaultCwd: appDescriptor.workspacePath
+      }
+      if (typeof menuItem.text !== "string" || !menuItem.text.trim()) {
+        if (typeof menuItem.title === "string" && menuItem.title.trim()) {
+          menuItem.text = menuItem.title.trim()
+        } else {
+          menuItem.text = path.posix.basename(path.posix.dirname(normalizedSpec))
+        }
+      }
+      if (typeof pluginConfig.icon === "string" && pluginConfig.icon.trim()) {
+        const iconAbsolutePath = path.resolve(path.dirname(pluginAbsolutePath), pluginConfig.icon)
+        if (this.isPathInsideRootForBundledPlugin(iconAbsolutePath, appDescriptor.workspacePath)) {
+          const iconRelativePath = path.relative(appDescriptor.workspacePath, iconAbsolutePath).split(path.sep).join("/")
+          menuItem.image = `/api/${appDescriptor.name}/${iconRelativePath}?raw=true`
+        }
+      }
+      bundledMenu.push(menuItem)
+    }
+    return bundledMenu
+  }
+  async getBundledPluginMenuForApp(appName) {
+    const appDescriptor = await this.getBundledPluginAppDescriptor(appName)
+    return this.getBundledPluginMenuItems(appDescriptor)
+  }
+  async getBundledPluginMenu() {
+    let apps = []
+    try {
+      apps = await this.kernel.api.listApps()
+    } catch (error) {
+      console.warn("Failed to enumerate apps for bundled plugins", error)
+      return []
+    }
+
+    const bundledMenu = []
+    for (const app of apps) {
+      const appDescriptor = {
+        name: app.name,
+        title: app.title,
+        description: app.description,
+        icon: app.icon,
+        workspacePath: app.workspace_path,
+        launcherPath: app.launcher_path,
+        meta: app.meta
+      }
+      const menuItems = await this.getBundledPluginMenuItems(appDescriptor)
+      bundledMenu.push(...menuItems)
+    }
+    return bundledMenu
+  }
   async getPluginGlobal(req, config, terminal, filepath) {
 //    if (!this.kernel.plugin.config) {
 //      await this.kernel.plugin.init()
 //    }
-    if (config) {
-      
-      let c = safeStructuredClone(config)
-      let menu = safeStructuredClone(terminal.menu)
-      c.menu = c.menu.concat(menu)
-      try {
-        let info = new Info(this.kernel)
-        info.cwd = () => {
-          return filepath
+    let c = safeStructuredClone(config || { menu: [] })
+    if (!Array.isArray(c.menu)) {
+      c.menu = []
+    }
+    try {
+      const bundledMenu = await this.getBundledPluginMenu()
+      let menu = safeStructuredClone(terminal.menu || [])
+      c.menu = c.menu.concat(bundledMenu, menu)
+      let info = new Info(this.kernel)
+      info.cwd = () => {
+        return filepath
+      }
+      let menuItems = c.menu.map((item) => {
+        return {
+          params: {
+            cwd: filepath
+          },
+          ...item
         }
-        let menu = c.menu.map((item) => {
-          return {
-            params: {
-              cwd: filepath
-            },
-            ...item
-          }
-        })
+      })
 //        let menu = await this.kernel.plugin.config.menu(this.kernel, info)
-        let plugin = { menu }
-        let uri = filepath
-        await this.renderMenu(req, uri, filepath, plugin, [])
+      let plugin = { menu: menuItems }
+      let uri = filepath
+      await this.renderMenu(req, uri, filepath, plugin, [])
 
-        function setOnlineIfRunning(obj) {
-          if (Array.isArray(obj)) {
-            for (const item of obj) setOnlineIfRunning(item);
-          } else if (obj && typeof obj === 'object') {
-            if (obj.running === true) obj.online = true;
-            for (const key in obj) setOnlineIfRunning(obj[key]);
-          }
+      function setOnlineIfRunning(obj) {
+        if (Array.isArray(obj)) {
+          for (const item of obj) setOnlineIfRunning(item);
+        } else if (obj && typeof obj === 'object') {
+          if (obj.running === true) obj.online = true;
+          for (const key in obj) setOnlineIfRunning(obj[key]);
         }
+      }
 
-        setOnlineIfRunning(plugin)
+      setOnlineIfRunning(plugin)
 
-        return plugin
-      } catch (e) {
-        console.log("getPlugin ERROR", e)
-        return null
-      }
-    } else {
+      return plugin
+    } catch (e) {
+      console.log("getPlugin ERROR", e)
       return null
     }
   }
   async getPlugin(req, config, name) {
-    if (config) {
-      let c = safeStructuredClone(config)
-      try {
-
-        let filepath = this.kernel.path("api", name)
-        let terminal = await this.terminals(filepath)
-        c.menu = c.menu.concat(terminal.menu)
-        let menu = c.menu.map((item) => {
-          return {
-            params: {
-              cwd: filepath,
-            },
-            ...item
-          }
-        })
-        let plugin = { menu }
-        let uri = this.kernel.path("api")
-        await this.renderMenu(req, uri, name, plugin, [])
-        return plugin
-      } catch (e) {
-        console.log("getPlugin ERROR", e)
-        return null
-      }
-    } else {
+    let c = safeStructuredClone(config || { menu: [] })
+    if (!Array.isArray(c.menu)) {
+      c.menu = []
+    }
+    try {
+      let filepath = this.kernel.path("api", name)
+      let terminal = await this.terminals(filepath)
+      const bundledMenu = await this.getBundledPluginMenu()
+      c.menu = c.menu.concat(bundledMenu, terminal.menu)
+      let menu = c.menu.map((item) => {
+        return {
+          params: {
+            cwd: filepath,
+          },
+          ...item
+        }
+      })
+      let plugin = { menu }
+      let uri = this.kernel.path("api")
+      await this.renderMenu(req, uri, name, plugin, [])
+      return plugin
+    } catch (e) {
+      console.log("getPlugin ERROR", e)
       return null
     }
   }
@@ -6380,6 +6537,7 @@ class Server {
         ? trimmed
         : `${trimmed.replace(/\/+$/, "")}/pinokio.js`
     }
+    const loadBundledPluginMenu = async () => this.getBundledPluginMenu()
     const classifyPluginMenuItem = (pluginItem) => {
       const runs = Array.isArray(pluginItem && pluginItem.run) ? pluginItem.run : []
       const hasExec = runs.some((step) => step && step.method === "exec")
@@ -6427,9 +6585,18 @@ class Server {
         link: pluginItem?.link || "",
         image: pluginItem?.image || null,
         icon: pluginItem?.icon || null,
+        default: pluginItem?.default === true,
         pluginPath: normalizedPluginPath,
         pluginKey: normalizePluginLookupKey(normalizedPluginPath),
         extraParams,
+        defaultCwd: typeof pluginItem?.defaultCwd === "string" ? pluginItem.defaultCwd : "",
+        ownerApp: pluginItem && pluginItem.ownerApp && typeof pluginItem.ownerApp === "object"
+          ? {
+            name: typeof pluginItem.ownerApp.name === "string" ? pluginItem.ownerApp.name : "",
+            title: typeof pluginItem.ownerApp.title === "string" ? pluginItem.ownerApp.title : "",
+            cwd: typeof pluginItem.ownerApp.cwd === "string" ? pluginItem.ownerApp.cwd : "",
+          }
+          : null,
         hasInstall: Array.isArray(pluginItem?.install),
         hasUninstall: Array.isArray(pluginItem?.uninstall),
         hasUpdate: Array.isArray(pluginItem?.update),
@@ -6455,7 +6622,14 @@ class Server {
       } catch (err) {
         console.warn("Failed to initialize plugins", err)
       }
-      return pluginMenu.map((pluginItem, index) => serializePluginMenuItem(pluginItem, index))
+      let bundledPluginMenu = []
+      try {
+        bundledPluginMenu = await loadBundledPluginMenu()
+      } catch (bundledError) {
+        console.warn("Failed to load bundled plugins", bundledError)
+      }
+      const mergedPluginMenu = pluginMenu.concat(bundledPluginMenu)
+      return mergedPluginMenu.map((pluginItem, index) => serializePluginMenuItem(pluginItem, index))
     }
     const buildPluginCategories = (plugins) => {
       const buckets = { ide: [], cli: [] }
@@ -6539,55 +6713,33 @@ class Server {
         managedPrefix,
       }
     }
-    const collectPluginApps = async () => {
+    const collectPluginApps = async (boundAppName = "") => {
       const apps = []
       try {
-        const apipath = this.kernel.path("api")
-        const entries = await fs.promises.readdir(apipath, { withFileTypes: true })
-        for (const entry of entries) {
-          let type
-          try {
-            type = await Util.file_type(apipath, entry)
-          } catch (typeErr) {
-            console.warn("Failed to inspect api entry", entry.name, typeErr)
-            continue
-          }
-          if (!type || !type.directory) {
+        const appList = await this.kernel.api.listApps()
+        for (const app of appList) {
+          if (boundAppName && app.name !== boundAppName) {
             continue
           }
-          try {
-            const meta = await this.kernel.api.meta(entry.name)
-            const absolutePath = meta && meta.path ? meta.path : this.kernel.path("api", entry.name)
-            let displayPath = absolutePath
-            if (this.kernel.homedir && absolutePath.startsWith(this.kernel.homedir)) {
-              const relative = path.relative(this.kernel.homedir, absolutePath)
-              if (!relative || relative === "." || relative === "") {
-                displayPath = "~"
-              } else if (!relative.startsWith("..")) {
-                const normalized = relative.split(path.sep).join("/")
-                displayPath = `~/${normalized}`
-              }
+          const absolutePath = app.workspace_path || this.kernel.path("api", app.name)
+          let displayPath = absolutePath
+          if (this.kernel.homedir && absolutePath.startsWith(this.kernel.homedir)) {
+            const relative = path.relative(this.kernel.homedir, absolutePath)
+            if (!relative || relative === "." || relative === "") {
+              displayPath = "~"
+            } else if (!relative.startsWith("..")) {
+              const normalized = relative.split(path.sep).join("/")
+              displayPath = `~/${normalized}`
             }
-            apps.push({
-              name: entry.name,
-              title: meta && meta.title ? meta.title : entry.name,
-              description: meta && meta.description ? meta.description : "",
-              icon: meta && meta.icon ? meta.icon : "/pinokio-black.png",
-              cwd: absolutePath,
-              displayPath
-            })
-          } catch (metaError) {
-            console.warn("Failed to load app metadata", entry.name, metaError)
-            const fallbackPath = this.kernel.path("api", entry.name)
-            apps.push({
-              name: entry.name,
-              title: entry.name,
-              description: "",
-              icon: "/pinokio-black.png",
-              cwd: fallbackPath,
-              displayPath: fallbackPath
-            })
           }
+          apps.push({
+            name: app.name,
+            title: app.title || app.name,
+            description: app.description || "",
+            icon: app.icon || "/pinokio-black.png",
+            cwd: absolutePath,
+            displayPath
+          })
         }
       } catch (enumerationError) {
         console.warn("Failed to enumerate api apps for plugin modal", enumerationError)
@@ -6901,14 +7053,7 @@ class Server {
     }))
     this.app.get("/api/plugin/menu", ex(async (req, res) => {
       try {
-        if (!this.kernel.plugin.config) {
-          await this.kernel.plugin.init()
-        } else {
-          await this.kernel.plugin.setConfig()
-        }
-        const pluginMenu = this.kernel.plugin && this.kernel.plugin.config && Array.isArray(this.kernel.plugin.config.menu)
-          ? this.kernel.plugin.config.menu
-          : []
+        const pluginMenu = await loadSerializedPlugins()
         res.set("Cache-Control", "no-store")
         res.json({ menu: pluginMenu })
       } catch (error) {
@@ -7650,12 +7795,21 @@ class Server {
       return targetPath
     }
 	    const resolveUniversalLauncherPluginHref = (toolValue) => {
-	      const normalizedTool = typeof toolValue === "string" ? toolValue.trim().replace(/^\/+|\/+$/g, "") : ""
+	      let normalizedTool = typeof toolValue === "string" ? toolValue.trim() : ""
+	      normalizedTool = normalizedTool.replace(/^https?:\/\/[^/]+/i, "")
+	      normalizedTool = normalizedTool.replace(/^\/+|\/+$/g, "")
+	      normalizedTool = normalizedTool.replace(/^run\//, "")
 	      if (!normalizedTool || normalizedTool.includes("..") || !/^[A-Za-z0-9._/-]+$/.test(normalizedTool)) {
 	        const error = new Error("Invalid plugin.")
 	        error.status = 400
 	        throw error
 	      }
+	      if (normalizedTool.startsWith("plugin/") || normalizedTool.startsWith("api/")) {
+	        const scriptPath = normalizedTool.endsWith(".js")
+	          ? normalizedTool
+	          : `${normalizedTool}/pinokio.js`
+	        return `/run/${scriptPath}`
+	      }
 	      return `/run/plugin/${normalizedTool}/pinokio.js`
 	    }
 	    const persistLauncherPromptContext = async (targetPath, options = {}) => {

package/server/lib/app_registry.js

@@ -371,50 +371,18 @@ class AppRegistryService {
   }
 
   async listInfoApps() {
-    const apps = []
     try {
-      const apipath = this.kernel.path('api')
-      const entries = await fs.promises.readdir(apipath, { withFileTypes: true })
-      for (const entry of entries) {
-        let type
-        try {
-          type = await Util.file_type(apipath, entry)
-        } catch (typeErr) {
-          console.warn('Failed to inspect api entry', entry.name, typeErr)
-          continue
-        }
-        if (!type || !type.directory) {
-          continue
-        }
-        try {
-          const meta = await this.kernel.api.meta(entry.name)
-          apps.push({
-            name: entry.name,
-            title: meta && meta.title ? meta.title : entry.name,
-            description: meta && meta.description ? meta.description : '',
-            icon: meta && meta.icon ? meta.icon : '/pinokio-black.png'
-          })
-        } catch (metaError) {
-          console.warn('Failed to load app metadata', entry.name, metaError)
-          apps.push({
-            name: entry.name,
-            title: entry.name,
-            description: '',
-            icon: '/pinokio-black.png'
-          })
-        }
-      }
-    } catch (enumerationError) {
-      console.warn('Failed to enumerate api apps for url dropdown', enumerationError)
-    }
-    apps.sort((a, b) => {
-      const at = (a.title || a.name || '').toLowerCase()
-      const bt = (b.title || b.name || '').toLowerCase()
-      if (at < bt) return -1
-      if (at > bt) return 1
-      return (a.name || '').localeCompare(b.name || '')
-    })
-    return apps
+      const apps = await this.kernel.api.listApps()
+      return apps.map((app) => ({
+        name: app.name,
+        title: app.title,
+        description: app.description,
+        icon: app.icon
+      }))
+    } catch (error) {
+      console.warn('Failed to enumerate api apps for url dropdown', error)
+      return []
+    }
   }
 
   async buildAppStatus(appId, options = {}) {

package/server/public/common.js

@@ -3905,6 +3905,33 @@ document.addEventListener("DOMContentLoaded", () => {
     return '';
   }
 
+  function isPluginLauncherPath(pathname) {
+    return typeof pathname === 'string'
+      && (
+        pathname.startsWith('/run/plugin/')
+        || (pathname.startsWith('/run/api/') && /\/pinokio\.js$/i.test(pathname))
+      );
+  }
+
+  function getPluginToolCategory(plugin) {
+    const explicitCategory = typeof plugin?.category === 'string' ? plugin.category.trim().toLowerCase() : '';
+    if (explicitCategory === 'ide') {
+      return 'IDE';
+    }
+    if (explicitCategory === 'cli') {
+      return 'CLI';
+    }
+    const launchType = typeof plugin?.launch_type === 'string' ? plugin.launch_type.trim().toLowerCase() : '';
+    if (launchType === 'desktop') {
+      return 'IDE';
+    }
+    if (launchType === 'terminal') {
+      return 'CLI';
+    }
+    const runs = Array.isArray(plugin?.run) ? plugin.run : [];
+    return runs.some((step) => step && step.method === 'exec') ? 'IDE' : 'CLI';
+  }
+
   function mapPluginMenuToAskAiTools(menu) {
     if (!Array.isArray(menu)) {
       return [];
@@ -3914,15 +3941,22 @@ document.addEventListener("DOMContentLoaded", () => {
         return null;
       }
       const href = typeof plugin.href === 'string' ? plugin.href.trim() : '';
-      if (!href || !href.startsWith('/run/plugin/')) {
+      if (!href) {
+        return null;
+      }
+      let parsed;
+      try {
+        parsed = new URL(href, window.location.origin);
+      } catch (_) {
+        return null;
+      }
+      if (parsed.origin !== window.location.origin || !isPluginLauncherPath(parsed.pathname)) {
         return null;
       }
       const label = typeof plugin.title === 'string' && plugin.title.trim()
         ? plugin.title.trim()
         : (typeof plugin.text === 'string' && plugin.text.trim() ? plugin.text.trim() : href);
-      const runs = Array.isArray(plugin.run) ? plugin.run : [];
-      const hasExec = runs.some((step) => step && step.method === 'exec');
-      const normalized = href.replace(/^\/run/, '').replace(/^\/+/, '');
+      const normalized = parsed.pathname.replace(/^\/run/, '').replace(/^\/+/, '');
       const parts = normalized.split('/').filter(Boolean);
       let value = '';
       if (parts[0] === 'plugin' && parts.length >= 3) {
@@ -3944,7 +3978,7 @@ document.addEventListener("DOMContentLoaded", () => {
         label,
         href,
         iconSrc: typeof plugin.image === 'string' ? plugin.image : null,
-        category: hasExec ? 'IDE' : 'CLI',
+        category: getPluginToolCategory(plugin),
         isDefault: plugin.default === true
       };
     }).filter(Boolean);
@@ -4017,7 +4051,7 @@ document.addEventListener("DOMContentLoaded", () => {
       if (parsed.origin !== window.location.origin) {
         return fallbackCwd;
       }
-      if (!parsed.pathname.startsWith('/run/plugin/')) {
+      if (!isPluginLauncherPath(parsed.pathname)) {
         return '';
       }
       const launchCwd = normalizeWorkspaceCwdForTerminalsDiscovery(parsed.searchParams.get('cwd') || '');
@@ -4114,7 +4148,7 @@ document.addEventListener("DOMContentLoaded", () => {
     let next = agentHref || '';
     try {
       const parsed = new URL(agentHref, window.location.origin);
-      if (parsed.pathname.startsWith('/run/plugin/')) {
+      if (isPluginLauncherPath(parsed.pathname)) {
         if (workspaceCwd && !parsed.searchParams.has('cwd')) {
           parsed.searchParams.set('cwd', workspaceCwd);
         }

package/server/public/create-launcher.js

@@ -51,6 +51,25 @@
   let modalPrevFocus = null;
   let modalPrevInert = null;
 
+  function getPluginToolCategory(plugin) {
+    const explicitCategory = typeof plugin?.category === 'string' ? plugin.category.trim().toLowerCase() : '';
+    if (explicitCategory === 'ide') {
+      return 'IDE';
+    }
+    if (explicitCategory === 'cli') {
+      return 'CLI';
+    }
+    const launchType = typeof plugin?.launch_type === 'string' ? plugin.launch_type.trim().toLowerCase() : '';
+    if (launchType === 'desktop') {
+      return 'IDE';
+    }
+    if (launchType === 'terminal') {
+      return 'CLI';
+    }
+    const runs = Array.isArray(plugin?.run) ? plugin.run : [];
+    return runs.some((step) => step && step.method === 'exec') ? 'IDE' : 'CLI';
+  }
+
   function mapPluginMenuToCreateLauncherTools(menu) {
     if (!Array.isArray(menu)) return [];
 
@@ -90,16 +109,13 @@
           return null;
         }
         const iconSrc = plugin.image || null;
-        const runs = Array.isArray(plugin.run) ? plugin.run : [];
-        const hasExec = runs.some((step) => step && step.method === 'exec');
-        const category = hasExec ? 'IDE' : 'CLI';
         return {
           value,
           label,
           iconSrc,
           isDefault: Boolean(plugin.default === true),
           href: href || null,
-          category,
+          category: getPluginToolCategory(plugin),
         };
       })
       .filter(Boolean);

package/server/public/plugin-detail.js

@@ -163,7 +163,12 @@
     const normalizedPath = plugin.pluginPath.startsWith("/") ? plugin.pluginPath.slice(1) : plugin.pluginPath;
     if (!normalizedPath) return null;
     const encodedPath = normalizedPath.split("/").map((segment) => encodeURIComponent(segment)).join("/");
-    return `/action/${encodeURIComponent(actionType)}/${encodedPath}?ts=${Date.now()}`;
+    const params = new URLSearchParams();
+    if (plugin.defaultCwd) {
+      params.set("cwd", plugin.defaultCwd);
+    }
+    params.set("ts", String(Date.now()));
+    return `/action/${encodeURIComponent(actionType)}/${encodedPath}?${params.toString()}`;
   }
 
   function showActionModal(actionType) {
@@ -215,6 +220,29 @@
     });
   }
 
+  function buildPluginLaunchTarget(app) {
+    if (!plugin || !plugin.pluginPath || !app || !app.name) {
+      return "";
+    }
+    const queryPairs = [];
+    const pushPair = (key, value, { rawValue = false } = {}) => {
+      if (value === undefined || value === null) {
+        return;
+      }
+      const encodedKey = encodeURIComponent(key);
+      const encodedValue = rawValue ? String(value) : encodeURIComponent(String(value));
+      queryPairs.push(`${encodedKey}=${encodedValue}`);
+    };
+    pushPair("plugin", plugin.pluginPath, { rawValue: true });
+    if (Array.isArray(plugin.extraParams)) {
+      plugin.extraParams.forEach(([key, value]) => {
+        pushPair(key, value);
+      });
+    }
+    const queryString = queryPairs.join("&");
+    return queryPairs.length > 0 ? `/p/${app.name}/dev?${queryString}` : `/p/${app.name}/dev`;
+  }
+
   function createPluginModal(appList) {
     const overlay = document.createElement("div");
     overlay.className = "modal-overlay url-modal-overlay plugin-modal-overlay";
@@ -413,23 +441,12 @@
         alert("Select a project to continue.");
         return;
       }
-      const queryPairs = [];
-      const pushPair = (key, value, { rawValue = false } = {}) => {
-        if (value === undefined || value === null) {
-          return;
-        }
-        const encodedKey = encodeURIComponent(key);
-        const encodedValue = rawValue ? String(value) : encodeURIComponent(String(value));
-        queryPairs.push(`${encodedKey}=${encodedValue}`);
-      };
-      pushPair("plugin", plugin.pluginPath, { rawValue: true });
-      if (Array.isArray(plugin.extraParams)) {
-        plugin.extraParams.forEach(([key, value]) => {
-          pushPair(key, value);
-        });
+      const target = buildPluginLaunchTarget(app);
+      if (!target) {
+        closeModal();
+        alert("This plugin is missing a launch target.");
+        return;
       }
-      const queryString = queryPairs.join("&");
-      const target = queryPairs.length > 0 ? `/p/${app.name}/dev?${queryString}` : `/p/${app.name}/dev`;
       closeModal();
       location.href = target;
     }

package/server/public/task-launcher.css

@@ -1458,6 +1458,18 @@ body.dark .task-badge-warning {
   color: var(--task-accent-contrast);
 }
 
+.plugin-detail-page .task-button.primary[data-plugin-open] {
+  background: var(--task-run-button-bg);
+  border-color: var(--task-run-button-bg);
+  color: var(--task-run-button-color);
+}
+
+.plugin-detail-page .task-button.primary[data-plugin-open]:hover {
+  background: var(--task-run-button-hover);
+  border-color: var(--task-run-button-hover);
+  color: var(--task-run-button-color);
+}
+
 .task-button.danger,
 .task-link-button.danger {
   border-color: rgba(220, 38, 38, 0.18);

package/server/public/task-launcher.js

@@ -56,18 +56,27 @@
       if (!plugin || typeof plugin !== "object") return null;
       const href = typeof plugin.href === "string" ? plugin.href.trim() : "";
       if (!href) return null;
-      let value = href.replace(/^\/run\/plugin\//, "").replace(/^\/+/, "");
+      const normalized = href.replace(/^\/run/, "").replace(/^\/+/, "");
+      const parts = normalized.split("/").filter(Boolean);
+      let value = "";
+      if (parts[0] === "plugin" && parts.length >= 3) {
+        value = parts.slice(1, -1).join("/");
+      } else {
+        value = normalized;
+      }
       if (value.endsWith("/pinokio.js")) {
         value = value.replace(/\/pinokio\.js$/i, "");
       }
       if (!value) return null;
+      const explicitCategory = typeof plugin.category === "string" ? plugin.category.trim().toLowerCase() : "";
+      const launchType = typeof plugin.launch_type === "string" ? plugin.launch_type.trim().toLowerCase() : "";
       const runs = Array.isArray(plugin.run) ? plugin.run : [];
       const hasExec = runs.some((step) => step && step.method === "exec");
       return {
         value,
         label: plugin.title || plugin.text || plugin.name || value,
         iconSrc: plugin.image || null,
-        category: hasExec ? "IDE" : "CLI",
+        category: (explicitCategory === "ide" || launchType === "desktop" || hasExec) ? "IDE" : "CLI",
         isDefault: plugin.default === true
       };
     }).filter(Boolean);

package/server/public/universal-launcher.js

@@ -210,21 +210,34 @@
       const href = typeof plugin.href === 'string' ? plugin.href.trim() : '';
       if (!href) return null;
 
-      let value = href.replace(/^\/run\/plugin\//, '').replace(/^\/+/, '');
+      const normalized = href.replace(/^\/run/, '').replace(/^\/+/, '');
+      const parts = normalized.split('/').filter(Boolean);
+      let value = '';
+      if (parts[0] === 'plugin' && parts.length >= 3) {
+        value = parts.slice(1, -1).join('/');
+      } else {
+        value = normalized;
+      }
       if (value.endsWith('/pinokio.js')) {
         value = value.replace(/\/pinokio\.js$/i, '');
       }
       if (!value) return null;
 
+      const explicitCategory = typeof plugin.category === 'string' ? plugin.category.trim().toLowerCase() : '';
+      const launchType = typeof plugin.launch_type === 'string' ? plugin.launch_type.trim().toLowerCase() : '';
       const runs = Array.isArray(plugin.run) ? plugin.run : [];
       const hasExec = runs.some((step) => step && step.method === 'exec');
+      let category = 'CLI';
+      if (explicitCategory === 'ide' || launchType === 'desktop' || hasExec) {
+        category = 'IDE';
+      }
 
       return {
         value,
         label: plugin.title || plugin.text || plugin.name || value,
         iconSrc: plugin.image || null,
         isDefault: plugin.default === true,
-        category: hasExec ? 'IDE' : 'CLI',
+        category,
       };
     }).filter(Boolean);
   }

package/server/views/app.ejs

@@ -608,6 +608,11 @@ body.dark .ask-ai-drawer-location-input {
   flex-direction: column;
 }
 .ask-ai-drawer-empty {
+  flex: 1 1 auto;
+  min-height: 0;
+  overflow-y: auto;
+  overscroll-behavior: contain;
+  -webkit-overflow-scrolling: touch;
   padding: 16px;
   display: flex;
   flex-direction: column;
@@ -5369,7 +5374,7 @@ header.navheader .mode-selector .community-mode-toggle {
       renderSelection({ force: true })
     }, delay)
   }
-  const pluginLaunchActive = (() => {
+  let pluginLaunchActive = (() => {
     try {
       const params = new URLSearchParams(window.location.search)
       return params.has('plugin')
@@ -6026,9 +6031,9 @@ header.navheader .mode-selector .community-mode-toggle {
     const href = typeof launch.href === "string" ? launch.href : ""
     try {
       const parsed = new URL(href, window.location.origin)
-      if (parsed.pathname.startsWith("/run/plugin/")) {
+      if (parsed.pathname.startsWith("/run/plugin/") || (parsed.pathname.startsWith("/run/api/") && /\/pinokio\.js$/i.test(parsed.pathname))) {
         const parts = parsed.pathname.split("/").filter(Boolean)
-        const pluginSlug = parts.length >= 3 ? parts[2] : ""
+        const pluginSlug = parts.length >= 2 ? parts[parts.length - 2] : ""
         const pluginLabel = titleCaseSlug(pluginSlug)
         if (pluginLabel) {
           return pluginLabel
@@ -6790,6 +6795,10 @@ const rerenderMenuSection = (container, html) => {
     }
 
     const devTab = document.querySelector('#devtab.frame-link')
+    if (!target && preselected && preselected !== devTab) {
+      target = preselected
+    }
+
     if (!triggeredByUser && !resolvedByGlobalSelector && !target && devRouteActive && devTab) {
       const defaultCandidate = getDefaultSelection()
       if (pluginLaunchActive && defaultCandidate) {
@@ -7288,7 +7297,7 @@ const rerenderMenuSection = (container, html) => {
     try {
       const pageUrl = new URL(window.location.href)
       const pluginPath = pageUrl.searchParams.get("plugin")
-      if (!pluginPath || !pluginPath.startsWith("/plugin/")) {
+      if (!pluginPath || (!pluginPath.startsWith("/plugin/") && !pluginPath.startsWith("/api/"))) {
         return null
       }
       const launchUrl = new URL(`/run${pluginPath}`, window.location.origin)
@@ -7334,6 +7343,7 @@ const rerenderMenuSection = (container, html) => {
     queryPluginLaunchHandled = true
     const launched = await handleLaunchRequest(launchRequest.launch, { persist: false })
     if (launched) {
+      pluginLaunchActive = false
       ignorePersistedSelection = false
       stripSearchParams(launchRequest.consumedKeys)
       return true
@@ -7357,6 +7367,7 @@ const rerenderMenuSection = (container, html) => {
       keys.push("plugin_label")
     }
     if (stripSearchParams(keys)) {
+      pluginLaunchActive = false
       resolvedPluginQueryStripped = true
     }
   }
@@ -12793,7 +12804,10 @@ document.addEventListener("DOMContentLoaded", () => {
     if (parsed.origin !== window.location.origin) {
       return null
     }
-    if (parsed.pathname.startsWith("/run/plugin/")) {
+    if (
+      parsed.pathname.startsWith("/run/plugin/")
+      || (parsed.pathname.startsWith("/run/api/") && /\/pinokio\.js$/i.test(parsed.pathname))
+    ) {
       if (workspaceCwd && !parsed.searchParams.has("cwd")) {
         parsed.searchParams.set("cwd", workspaceCwd)
       }
@@ -12846,7 +12860,18 @@ document.addEventListener("DOMContentLoaded", () => {
         return null
       }
       const href = typeof plugin.href === "string" ? plugin.href.trim() : ""
-      if (!href || !href.startsWith("/run/plugin/")) {
+      if (!href) {
+        return null
+      }
+      let parsed
+      try {
+        parsed = new URL(href, window.location.origin)
+      } catch (_) {
+        return null
+      }
+      const isPluginLauncher = parsed.pathname.startsWith("/run/plugin/")
+        || (parsed.pathname.startsWith("/run/api/") && /\/pinokio\.js$/i.test(parsed.pathname))
+      if (parsed.origin !== window.location.origin || !isPluginLauncher) {
         return null
       }
       const label = typeof plugin.title === "string" && plugin.title.trim()
@@ -12855,14 +12880,15 @@ document.addEventListener("DOMContentLoaded", () => {
       const runs = Array.isArray(plugin.run) ? plugin.run : []
       const hasExec = runs.some((step) => step && step.method === "exec")
       const launchType = typeof plugin.launch_type === "string" ? plugin.launch_type.trim().toLowerCase() : ""
+      const explicitCategory = typeof plugin.category === "string" ? plugin.category.trim().toLowerCase() : ""
       const value = normalizeToolValue(href, label)
       if (!value) {
         return null
       }
       let category
-      if (launchType === "desktop") {
+      if (explicitCategory === "ide" || launchType === "desktop") {
         category = "IDE"
-      } else if (launchType === "terminal") {
+      } else if (explicitCategory === "cli" || launchType === "terminal") {
         category = "CLI"
       } else {
         category = hasExec ? "IDE" : "CLI"

package/server/views/d.ejs

@@ -894,7 +894,9 @@ const appendWorkspaceCwd = (value, cwd = workspaceCwd) => {
   const raw = hasPrefix ? value.slice(1) : value
   try {
     const parsed = new URL(raw, window.location.origin)
-    if (parsed.origin !== window.location.origin || !parsed.pathname.startsWith("/run/plugin/")) {
+    const isPluginLauncher = parsed.pathname.startsWith("/run/plugin/")
+      || (parsed.pathname.startsWith("/run/api/") && /\/pinokio\.js$/i.test(parsed.pathname))
+    if (parsed.origin !== window.location.origin || !isPluginLauncher) {
       return value
     }
     if (!parsed.searchParams.has("cwd")) {

package/server/views/plugin_detail.ejs

@@ -275,6 +275,7 @@
       link: plugin.link || "",
       pluginPath: plugin.pluginPath || "",
       extraParams: Array.isArray(plugin.extraParams) ? plugin.extraParams : [],
+      defaultCwd: plugin.defaultCwd || "",
       hasInstall: !!plugin.hasInstall,
       hasUninstall: !!plugin.hasUninstall,
       hasUpdate: !!plugin.hasUpdate,

package/server/views/terminal.ejs

@@ -895,6 +895,7 @@ const createPluginTerminalDiscoveryRefresher = (context = {}) => {
   const enabled = (() => {
     try {
       return window.location.pathname.startsWith("/run/plugin/")
+        || (window.location.pathname.startsWith("/run/api/") && /\/pinokio\.js$/i.test(window.location.pathname))
     } catch (_) {
       return false
     }

package/undefined/logs/dev/plugin/amp/pinokio.js/1775428679177

@@ -0,0 +1,12 @@
+[api shell.run]
+
+The default interactive shell is now zsh.
+To update your account to use zsh, please run `chsh -s /bin/zsh`.
+For more details, please visit https://support.apple.com/kb/HT208050.
+<<PINOKIO_SHELL>>eval "$(conda shell.bash hook)" ; conda deactivate ; conda deactivate ; conda deactivate ; conda activate base && npm install -g @sourcegraph/amp@latest
+
+added 3 packages in 3s
+
+1 package is looking for funding
+  run `npm fund` for details
+(base) <<PINOKIO_SHELL>>

package/undefined/logs/dev/plugin/amp/pinokio.js/events

@@ -0,0 +1,2 @@
+2026-04-05T22:37:59.178Z [memory] {"ts":1775428679177,"step":0,"input":{"ts":"1775428678743"},"args":{"ts":"1775428678743"},"global":{},"local":{},"port":42003}
+2026-04-05T22:37:59.178Z [memory] 

package/undefined/logs/dev/plugin/amp/pinokio.js/latest

@@ -0,0 +1,12 @@
+[api shell.run]
+
+The default interactive shell is now zsh.
+To update your account to use zsh, please run `chsh -s /bin/zsh`.
+For more details, please visit https://support.apple.com/kb/HT208050.
+<<PINOKIO_SHELL>>eval "$(conda shell.bash hook)" ; conda deactivate ; conda deactivate ; conda deactivate ; conda activate base && npm install -g @sourcegraph/amp@latest
+
+added 3 packages in 3s
+
+1 package is looking for funding
+  run `npm fund` for details
+(base) <<PINOKIO_SHELL>>

package/undefined/logs/dev/plugin/pi/pinokio.js/1775428650680

@@ -0,0 +1,9 @@
+[api shell.run]
+
+The default interactive shell is now zsh.
+To update your account to use zsh, please run `chsh -s /bin/zsh`.
+For more details, please visit https://support.apple.com/kb/HT208050.
+<<PINOKIO_SHELL>>eval "$(conda shell.bash hook)" ; conda deactivate ; conda deactivate ; conda deactivate ; conda activate base && npm uninstall -g @mariozechner/pi-coding-agent
+
+up to date in 355ms
+(base) <<PINOKIO_SHELL>>

package/undefined/logs/dev/plugin/pi/pinokio.js/1775428654295

@@ -0,0 +1,10 @@
+[memory]
+{"ts":1775428654295,"step":1,"input":{"id":"93c7335b-5c6c-4d43-87ae-e573d660d6bb"},"args":{"ts":"1775428650149"},"global":{},"local":{},"port":42003}
+
+[api fs.rm]
+
+removing:
+/Users/x/pinokio/plugin/pi
+
+[api fs.rm]
+done

package/undefined/logs/dev/plugin/pi/pinokio.js/events

@@ -0,0 +1,10 @@
+2026-04-05T22:37:30.680Z [memory] {"ts":1775428650679,"step":0,"input":{"ts":"1775428650149"},"args":{"ts":"1775428650149"},"global":{},"local":{},"port":42003}
+2026-04-05T22:37:30.680Z [memory] 
+2026-04-05T22:37:34.296Z [memory] {"ts":1775428654295,"step":1,"input":{"id":"93c7335b-5c6c-4d43-87ae-e573d660d6bb"},"args":{"ts":"1775428650149"},"global":{},"local":{},"port":42003}
+2026-04-05T22:37:34.296Z [memory] 
+2026-04-05T22:37:34.311Z [api fs.rm] 
+2026-04-05T22:37:34.311Z [api fs.rm] removing:
+2026-04-05T22:37:34.311Z [api fs.rm] /Users/x/pinokio/plugin/pi
+2026-04-05T22:37:34.311Z [api fs.rm] 
+2026-04-05T22:37:34.318Z [api fs.rm] done
+2026-04-05T22:37:34.318Z [api fs.rm] 

package/undefined/logs/dev/plugin/pi/pinokio.js/latest

@@ -0,0 +1,10 @@
+[memory]
+{"ts":1775428654295,"step":1,"input":{"id":"93c7335b-5c6c-4d43-87ae-e573d660d6bb"},"args":{"ts":"1775428650149"},"global":{},"local":{},"port":42003}
+
+[api fs.rm]
+
+removing:
+/Users/x/pinokio/plugin/pi
+
+[api fs.rm]
+done