pinokiod 7.2.18 → 7.3.1

package/server/lib/content_validation.js

@@ -1,7 +1,6 @@
 const fs = require("fs")
 const path = require("path")
 const clearModule = require("clear-module")
-const PluginSources = require("../../kernel/plugin_sources")
 
 const {
   TASK_CONFIG_FILENAME,
@@ -118,7 +117,23 @@ function createContentValidationService({ kernel }) {
   }
 
   const normalizePluginPath = (value) => {
-    return PluginSources.normalizePluginPath(value)
+    let normalized = typeof value === "string" ? value.trim() : ""
+    if (!normalized) {
+      return ""
+    }
+    normalized = normalized.replace(/\\/g, "/")
+    normalized = normalized.replace(/^\/run(?=\/)/, "")
+    if (!normalized.startsWith("/")) {
+      normalized = `/${normalized}`
+    }
+    normalized = normalized.replace(/\/{2,}/g, "/").replace(/\/+$/, "")
+    if (!normalized) {
+      return ""
+    }
+    if (!normalized.endsWith("/pinokio.js")) {
+      normalized = `${normalized}/pinokio.js`
+    }
+    return normalized
   }
 
   const normalizeBundledPluginSpec = (value) => {
@@ -147,16 +162,16 @@ function createContentValidationService({ kernel }) {
       absolutePath,
       dir: pluginDir,
       config,
-      hasInstall: PluginSources.isAction(config && config.install),
-      hasUpdate: PluginSources.isAction(config && config.update),
-      hasUninstall: PluginSources.isAction(config && config.uninstall),
+      hasInstall: Array.isArray(config && config.install),
+      hasUpdate: Array.isArray(config && config.update),
+      hasUninstall: Array.isArray(config && config.uninstall),
       image: null,
     }
 
     if (config && typeof config.icon === "string" && config.icon.trim()) {
-      const pluginImage = PluginSources.pluginAssetHrefForIcon(normalizedPath, config.icon)
-      if (pluginImage) {
-        context.image = pluginImage
+      if (normalizedPath.startsWith("/plugin/")) {
+        const relativeDir = path.posix.dirname(normalizedPath.slice(1))
+        context.image = `/asset/${relativeDir}/${config.icon.trim()}`
       } else if (normalizedPath.startsWith("/api/")) {
         const segments = normalizedPath.replace(/^\/+/, "").split("/")
         const appName = segments[1] || ""
@@ -177,10 +192,7 @@ function createContentValidationService({ kernel }) {
     const fallbackTitle = normalizedPath
       ? path.basename(path.posix.dirname(normalizedPath))
       : "Plugin"
-    const isSystemPlugin = PluginSources.isSystemPluginPath(normalizedPath)
-    const isHomePlugin = normalizedPath.startsWith("/plugin/")
-    const isApiPlugin = normalizedPath.startsWith("/api/")
-    if (!normalizedPath || (!isSystemPlugin && !isHomePlugin && !isApiPlugin)) {
+    if (!normalizedPath || (!normalizedPath.startsWith("/plugin/") && !normalizedPath.startsWith("/api/"))) {
       return buildInvalid({
         type: "plugin",
         subjectTitle: fallbackTitle,
@@ -193,21 +205,8 @@ function createContentValidationService({ kernel }) {
         detailUrl: "/plugins",
       })
     }
-    if (PluginSources.isLegacyPluginCodePath(normalizedPath)) {
-      return buildInvalid({
-        type: "plugin",
-        subjectTitle: fallbackTitle,
-        errors: [
-          buildError(
-            "This managed plugin path is no longer used.",
-            "Open the built-in Pinokio plugin instead."
-          ),
-        ],
-        detailUrl: "/plugins",
-      })
-    }
 
-    const absolutePath = PluginSources.pluginPathToAbsolute(kernel, normalizedPath)
+    const absolutePath = kernel.path(normalizedPath.replace(/^\/+/, ""))
     const folderPath = path.dirname(absolutePath)
     const loaded = await loadJsFile(absolutePath)
     if (!loaded.exists) {
@@ -252,35 +251,25 @@ function createContentValidationService({ kernel }) {
         { file: absolutePath }
       ))
     } else {
-      if (!PluginSources.isAction(config.run)) {
+      if (!Array.isArray(config.run)) {
         errors.push(buildError(
-          "Plugins must define a top-level run array or function.",
-          "Add `run: [...]` or `run: async (ctx) => [...]` to pinokio.js.",
+          "Plugins must define a top-level run array.",
+          "Add `run: [...]` to pinokio.js.",
           { file: absolutePath }
         ))
       }
-      const topLevelFunctionKeys = Object.keys(config).filter((key) => {
-        return typeof config[key] === "function" && !PluginSources.ACTION_KEYS.has(key)
-      })
+      const topLevelFunctionKeys = Object.keys(config).filter((key) => typeof config[key] === "function")
       if (topLevelFunctionKeys.length > 0) {
         errors.push(buildError(
           `Top-level function fields are not supported: ${topLevelFunctionKeys.join(", ")}.`,
-          "Only action fields such as run, install, uninstall, and update may be functions.",
+          "Move those functions out of pinokio.js or replace them with data.",
           { file: absolutePath }
         ))
       }
-      for (const key of PluginSources.ACTION_KEYS) {
-        if (key in config && !PluginSources.isAction(config[key])) {
-          errors.push(buildError(
-            `Plugin action ${key} must be an array or function.`,
-            `Set ${key} to an array or async function returning an array.`,
-            { file: absolutePath }
-          ))
-        }
-      }
       if (normalizedPath.startsWith("/plugin/")) {
+        const isManagedDefaultPlugin = normalizedPath.startsWith("/plugin/code/")
         const declaredPath = typeof config.path === "string" ? config.path.trim() : ""
-        if (declaredPath !== "plugin") {
+        if (!isManagedDefaultPlugin && declaredPath !== "plugin") {
           errors.push(buildError(
             'Standalone plugins must set `path: "plugin"`.',
             'Add `path: "plugin"` to pinokio.js.',
@@ -578,7 +567,7 @@ function createContentValidationService({ kernel }) {
     })
   }
 
-  const validateRunPath = async (pathComponents, options = {}) => {
+  const validateRunPath = async (pathComponents) => {
     if (!Array.isArray(pathComponents) || pathComponents.length === 0) {
       return buildValid()
     }
@@ -587,9 +576,6 @@ function createContentValidationService({ kernel }) {
       return buildValid()
     }
     if (normalized[0] === "plugin") {
-      if (options && options.system) {
-        return validatePluginByPath(`${PluginSources.SYSTEM_RUN_PREFIX}/${normalized.join("/")}`)
-      }
       return validatePluginByPath(`/${normalized.join("/")}`)
     }
     if (normalized[0] === "api" && normalized.length > 1) {

package/server/public/common.js

@@ -16,7 +16,6 @@ const requirementsGuardedRoutePrefixes = [
   '/api/',
   '/_api/',
   '/run/',
-  '/pinokio/run/',
   '/tools',
   '/bundle/',
   '/connect/',
@@ -105,96 +104,6 @@ function createMinimalLoadingSwal () {
   });
   return close;
 }
-
-const PINOKIO_WAIT_FOOTER_ID = 'pinokio-process-wait-footer-status'
-const PINOKIO_INSTALL_SPINNER_VARIANTS = ["grid-shift", "single-vacancy", "pulse-swap", "corner-chase", "flip-2x2", "stack-ripple", "pixel-orbit", "binary-shuffle"]
-const PINOKIO_INSTALL_STATUS_SPINNER_HTML = `
-<span class="install-status-spinner" aria-hidden="true">
-  <span class="install-status-grid-anchor install-status-grid-anchor-1"></span>
-  <span class="install-status-grid-anchor install-status-grid-anchor-2"></span>
-  <span class="install-status-grid-anchor install-status-grid-anchor-3"></span>
-  <span class="install-status-grid-anchor install-status-grid-anchor-4"></span>
-  <span class="install-status-grid-tile install-status-grid-tile-1"></span>
-  <span class="install-status-grid-tile install-status-grid-tile-2"></span>
-  <span class="install-status-grid-tile install-status-grid-tile-3"></span>
-  <span class="install-status-grid-tile install-status-grid-tile-4"></span>
-  <span class="install-status-grid-chaser"></span>
-  <span class="install-status-grid-pixel"></span>
-</span>`
-let lastPinokioWaitSpinnerVariant = null
-
-function escapePinokioStatusHtml(value) {
-  return String(value == null ? '' : value)
-    .replace(/&/g, '&amp;')
-    .replace(/</g, '&lt;')
-    .replace(/>/g, '&gt;')
-    .replace(/"/g, '&quot;')
-    .replace(/'/g, '&#39;')
-}
-
-function ensurePinokioWaitFooterStatus() {
-  let status = document.getElementById(PINOKIO_WAIT_FOOTER_ID)
-  if (status) {
-    return status
-  }
-  status = document.createElement('div')
-  status.id = PINOKIO_WAIT_FOOTER_ID
-  status.className = 'pinokio-install-inline-status pinokio-process-wait-footer-status'
-  status.hidden = true
-  status.setAttribute('aria-live', 'polite')
-
-  const anchor = document.querySelector('.terminal-container')
-    || document.querySelector('main')
-    || document.querySelector('#terminal')?.parentElement
-    || document.querySelector('footer')
-    || document.body
-
-  if (anchor && anchor !== document.body) {
-    anchor.insertAdjacentElement('afterend', status)
-  } else {
-    document.body.appendChild(status)
-  }
-  return status
-}
-
-function showPinokioWaitFooterStatus(data = {}) {
-  const title = data.title || 'Waiting'
-  const description = data.description || data.message || ''
-  const status = ensurePinokioWaitFooterStatus()
-  const candidates = PINOKIO_INSTALL_SPINNER_VARIANTS.filter((variant) => variant !== lastPinokioWaitSpinnerVariant)
-  const pool = candidates.length > 0 ? candidates : PINOKIO_INSTALL_SPINNER_VARIANTS
-  lastPinokioWaitSpinnerVariant = pool[Math.floor(Math.random() * pool.length)]
-  document.documentElement.dataset.installSpinnerVariant = lastPinokioWaitSpinnerVariant
-  status.className = 'pinokio-install-inline-status pinokio-process-wait-footer-status is-progress'
-  status.innerHTML = `
-    <div class="install-status-shell">
-      ${PINOKIO_INSTALL_STATUS_SPINNER_HTML}
-      <div class="install-status-copy">
-        <div class="install-status-title">${escapePinokioStatusHtml(title)}</div>
-        ${description ? `<div class="install-status-detail">${escapePinokioStatusHtml(description)}</div>` : ''}
-      </div>
-    </div>
-  `
-  status.hidden = false
-  document.body.classList.add('pinokio-install-status-visible')
-}
-
-function hidePinokioWaitFooterStatus() {
-  const status = document.getElementById(PINOKIO_WAIT_FOOTER_ID)
-  if (!status) {
-    return
-  }
-  status.hidden = true
-  status.innerHTML = ''
-  document.body.classList.remove('pinokio-install-status-visible')
-}
-
-if (typeof window !== 'undefined') {
-  window.PinokioWaitFooterStatus = {
-    show: showPinokioWaitFooterStatus,
-    hide: hidePinokioWaitFooterStatus
-  }
-}
 function check_ready (targetUrl = null, options = {}) {
   createLauncherDebugLog('check_ready start');
   return fetch("/pinokio/requirements_ready").then((res) => {
@@ -2419,14 +2328,6 @@ if (typeof hotkeys === 'function') {
     playNextSound();
   };
 
-  window.PinokioPlayNotificationSound = (sound) => {
-    if (sound === false || isFalseyString(sound)) {
-      return false;
-    }
-    enqueueSound(typeof sound === 'string' && sound ? sound : '/chime.mp3');
-    return true;
-  };
-
   const handlePacket = (packet) => {
     if (!packet || packet.id !== CHANNEL_ID || packet.type !== 'notification') {
       return;
@@ -3581,6 +3482,32 @@ document.addEventListener("DOMContentLoaded", () => {
     tools: null,
     toolsPromise: null
   };
+  const ASK_AI_FALLBACK_TOOLS = [
+    {
+      value: 'claude',
+      label: 'Claude Code',
+      iconSrc: '/asset/plugin/code/claude/claude.png',
+      href: '/run/plugin/code/claude/pinokio.js',
+      category: 'CLI',
+      isDefault: true
+    },
+    {
+      value: 'codex',
+      label: 'OpenAI Codex',
+      iconSrc: '/asset/plugin/code/codex/openai.webp',
+      href: '/run/plugin/code/codex/pinokio.js',
+      category: 'CLI',
+      isDefault: false
+    },
+    {
+      value: 'gemini',
+      label: 'Google Gemini CLI',
+      iconSrc: '/asset/plugin/code/gemini/gemini.jpeg',
+      href: '/run/plugin/code/gemini/pinokio.js',
+      category: 'CLI',
+      isDefault: false
+    }
+  ];
 
   initializeUniversalLauncherIntegration();
   initializeCreateLauncherIntegration();
@@ -3993,7 +3920,6 @@ document.addEventListener("DOMContentLoaded", () => {
     return typeof pathname === 'string'
       && (
         pathname.startsWith('/run/plugin/')
-        || pathname.startsWith('/pinokio/run/plugin/')
         || (pathname.startsWith('/run/api/') && /\/pinokio\.js$/i.test(pathname))
       );
   }
@@ -4085,11 +4011,11 @@ document.addEventListener("DOMContentLoaded", () => {
       })
       .then((payload) => {
         const mapped = mapPluginMenuToAskAiTools(payload && Array.isArray(payload.menu) ? payload.menu : []);
-        return mapped;
+        return mapped.length > 0 ? mapped : ASK_AI_FALLBACK_TOOLS.slice();
       })
       .catch((error) => {
-        console.warn('Failed to load Ask AI plugins', error);
-        return [];
+        console.warn('Failed to load Ask AI plugins, using fallback list', error);
+        return ASK_AI_FALLBACK_TOOLS.slice();
       })
       .finally(() => {
         askAiState.toolsPromise = null;

package/server/public/create-launcher.js

@@ -5,6 +5,33 @@
     return;
   }
 
+  const FALLBACK_TOOLS = [
+    {
+      value: 'claude',
+      label: 'Claude Code',
+      iconSrc: '/asset/plugin/code/claude/claude.png',
+      isDefault: true,
+      href: '/run/plugin/code/claude/pinokio.js',
+      category: 'CLI',
+    },
+    {
+      value: 'codex',
+      label: 'OpenAI Codex',
+      iconSrc: '/asset/plugin/code/codex/openai.webp',
+      isDefault: false,
+      href: '/run/plugin/code/codex/pinokio.js',
+      category: 'CLI',
+    },
+    {
+      value: 'gemini',
+      label: 'Google Gemini CLI',
+      iconSrc: '/asset/plugin/code/gemini/gemini.jpeg',
+      isDefault: false,
+      href: '/run/plugin/code/gemini/pinokio.js',
+      category: 'CLI',
+    },
+  ];
+
   const CATEGORY_ORDER = ['CLI', 'IDE'];
   const MODAL_VARIANTS = {
     CREATE: 'create',
@@ -56,7 +83,7 @@
 
         let value = '';
         if (href) {
-          // Normalize href to a launcher tool path for the backend.
+          // Normalize href to a plugin-relative path for the backend (e.g., code/codex)
           const normalized = href.replace(/^\/run/, '').replace(/^\/+/, '');
           const parts = normalized.split('/').filter(Boolean);
           // Expect /plugin/<path...>/pinokio.js -> want <path...>
@@ -112,11 +139,11 @@
       .then((data) => {
         const menu = data && Array.isArray(data.menu) ? data.menu : [];
         const tools = mapPluginMenuToCreateLauncherTools(menu);
-        return tools;
+        return tools.length > 0 ? tools : FALLBACK_TOOLS.slice();
       })
       .catch((error) => {
-        console.warn('Failed to load create launcher plugins', error);
-        return [];
+        console.warn('Falling back to default plugins for create launcher modal', error);
+        return FALLBACK_TOOLS.slice();
       })
       .finally(() => {
         loadingTools = null;

package/server/public/electron.css

@@ -25,6 +25,12 @@ aside {
   -webkit-app-region: no-drag !important;
   cursor: auto !important;
 }
+header.grabbable {
+/*
+  padding: 32px 10px 0 !important;
+  padding: 26px 0px 0 !important;
+  */
+}
 /*
 header {
   cursor: grab;