pinokiod 7.3.0 → 7.3.3

package/server/lib/launcher_instruction_bootstrap.js

@@ -1,5 +1,7 @@
 "use strict"
 
+const ManagedSkills = require("../../kernel/managed_skills")
+
 const LAUNCHER_AGENT_FILES = [
   "AGENTS.md",
   "CLAUDE.md",
@@ -34,107 +36,13 @@ const LAUNCHER_FOLDER_CONTEXT_PREAMBLE = [
   "3. If they conflict, follow `REQUEST.md` for the current run while preserving the broader intent in `SPEC.md`."
 ].join("\n")
 
-const parseSimpleFrontmatter = (content) => {
-  const normalized = String(content || "").replace(/\r\n/g, "\n")
-  if (!normalized.startsWith("---\n")) {
-    return {
-      frontmatter: null,
-      bodyWithoutFrontmatter: normalized.trim()
-    }
-  }
-  const end = normalized.indexOf("\n---\n", 4)
-  if (end === -1) {
-    return {
-      frontmatter: null,
-      bodyWithoutFrontmatter: normalized.trim()
-    }
-  }
-  return {
-    frontmatter: normalized.slice(4, end),
-    bodyWithoutFrontmatter: normalized.slice(end + 5).trim()
-  }
-}
-
 const createLauncherInstructionBootstrap = ({ kernel, fs, path, os }) => {
-  const getSkillRoots = () => {
-    const roots = []
-    const seen = new Set()
-    const addRoot = (target) => {
-      if (typeof target !== "string" || !target.trim()) {
-        return
-      }
-      const resolved = path.resolve(target)
-      if (seen.has(resolved)) {
-        return
-      }
-      seen.add(resolved)
-      roots.push(resolved)
-    }
-    const home = os.homedir()
-    addRoot(path.join(home, ".agents", "skills"))
-    addRoot(path.join(home, ".agent", "skills"))
-    addRoot(path.join(home, ".codex", "skills"))
-    addRoot(path.join(home, ".claude", "skills"))
-    addRoot(path.join(home, ".gemini", "skills"))
-    addRoot(path.join(home, ".config", "gemini", "skills"))
-    addRoot(path.join(home, ".openclaw", "skills"))
-    if (kernel && typeof kernel.path === "function") {
-      addRoot(kernel.path("skills"))
-    }
-    return roots
-  }
-
-  const readFileIfExists = async (filepath) => {
-    if (typeof filepath !== "string" || !filepath.trim()) {
-      return ""
-    }
-    try {
-      return await fs.promises.readFile(filepath, "utf8")
-    } catch (error) {
-      if (error && error.code === "ENOENT") {
-        return ""
-      }
-      throw error
-    }
-  }
-
-  const resolveSkillBody = async (skillName, fallbackResolver) => {
-    const normalizedName = typeof skillName === "string" ? skillName.trim() : ""
-    if (!normalizedName) {
-      return ""
-    }
-
-    const roots = getSkillRoots()
-    for (let i = 0; i < roots.length; i++) {
-      const skillPath = path.resolve(roots[i], normalizedName, "SKILL.md")
-      const contents = await readFileIfExists(skillPath)
-      if (contents.trim()) {
-        return parseSimpleFrontmatter(contents).bodyWithoutFrontmatter
-      }
-    }
-
-    if (typeof fallbackResolver === "function") {
-      const fallback = await fallbackResolver()
-      if (typeof fallback === "string" && fallback.trim()) {
-        return parseSimpleFrontmatter(fallback).bodyWithoutFrontmatter
-      }
-    }
-    return ""
-  }
-
   const resolvePinokioBody = async () => {
-    return resolveSkillBody("pinokio", async () => {
-      return readFileIfExists(path.resolve(__dirname, "../../prototype/system/SKILL_PINOKIO.md"))
-    })
+    return ManagedSkills.readEnabledManagedSkillBody(kernel, "pinokio").catch(() => "")
   }
 
   const resolveGepetoBody = async () => {
-    return resolveSkillBody("gepeto", async () => {
-      if (!kernel || !kernel.homedir) {
-        return ""
-      }
-      return readFileIfExists(path.resolve(kernel.homedir, "AGENTS.md"))
-    })
+    return ManagedSkills.readEnabledManagedSkillBody(kernel, "gepeto").catch(() => "")
   }
 
   const buildLauncherInstructionBody = async () => {

package/server/lib/terminal_session_helpers.js

@@ -333,9 +333,6 @@ const createTerminalSessionHelpers = ({ kernel, fs, path, os, crypto }) => {
     addRoot(path.join(home, ".gemini", "skills"))
     addRoot(path.join(home, ".config", "gemini", "skills"))
     addRoot(path.join(home, ".openclaw", "skills"))
-    if (kernel && kernel.homedir) {
-      addRoot(kernel.path("skills"))
-    }
     return roots
   }
 

package/server/public/common.js

@@ -104,6 +104,79 @@ function createMinimalLoadingSwal () {
   });
   return close;
 }
+
+const PINOKIO_WAIT_FOOTER_ID = 'pinokio-process-wait-footer-status'
+
+function escapePinokioStatusHtml(value) {
+  return String(value == null ? '' : value)
+    .replace(/&/g, '&')
+    .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()
+  status.className = 'pinokio-install-inline-status pinokio-process-wait-footer-status is-progress'
+  status.innerHTML = `
+    <div class="pinokio-install-inline-status-shell">
+      <span class="pinokio-install-inline-status-icon" aria-hidden="true">
+        <i class="fa-solid fa-circle-notch fa-spin"></i>
+      </span>
+      <div class="pinokio-install-inline-status-copy">
+        <div class="pinokio-install-inline-status-title">${escapePinokioStatusHtml(title)}</div>
+        ${description ? `<div class="pinokio-install-inline-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) => {
@@ -3482,33 +3555,6 @@ 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();
 
@@ -3920,6 +3966,7 @@ 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))
       );
   }
@@ -4010,12 +4057,11 @@ document.addEventListener("DOMContentLoaded", () => {
         return res.json();
       })
       .then((payload) => {
-        const mapped = mapPluginMenuToAskAiTools(payload && Array.isArray(payload.menu) ? payload.menu : []);
-        return mapped.length > 0 ? mapped : ASK_AI_FALLBACK_TOOLS.slice();
+        return mapPluginMenuToAskAiTools(payload && Array.isArray(payload.menu) ? payload.menu : []);
       })
       .catch((error) => {
-        console.warn('Failed to load Ask AI plugins, using fallback list', error);
-        return ASK_AI_FALLBACK_TOOLS.slice();
+        console.warn('Failed to load Ask AI plugins', error);
+        return [];
       })
       .finally(() => {
         askAiState.toolsPromise = null;

package/server/public/create-launcher.js

@@ -5,33 +5,6 @@
     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',
@@ -83,7 +56,7 @@
 
         let value = '';
         if (href) {
-          // Normalize href to a plugin-relative path for the backend (e.g., code/codex)
+          // Normalize href to a plugin-relative path for the backend (e.g., pinokio/run/plugin/codex)
           const normalized = href.replace(/^\/run/, '').replace(/^\/+/, '');
           const parts = normalized.split('/').filter(Boolean);
           // Expect /plugin/<path...>/pinokio.js -> want <path...>
@@ -138,12 +111,11 @@
       })
       .then((data) => {
         const menu = data && Array.isArray(data.menu) ? data.menu : [];
-        const tools = mapPluginMenuToCreateLauncherTools(menu);
-        return tools.length > 0 ? tools : FALLBACK_TOOLS.slice();
+        return mapPluginMenuToCreateLauncherTools(menu);
       })
       .catch((error) => {
-        console.warn('Falling back to default plugins for create launcher modal', error);
-        return FALLBACK_TOOLS.slice();
+        console.warn('Failed to load plugins for create launcher modal', error);
+        return [];
       })
       .finally(() => {
         loadingTools = null;