pinokiod 7.5.26 → 7.5.28

package/server/views/partials/main_sidebar.ejs

@@ -35,6 +35,7 @@
   <i class="fa-solid fa-bars" aria-hidden="true"></i>
 </button>
 <button type="button" class="main-sidebar-mobile-backdrop" data-main-sidebar-backdrop aria-label="Close navigation" hidden></button>
+<button type="button" class="main-sidebar-peek-trigger" data-main-sidebar-peek-trigger aria-label="Show navigation" aria-controls="main-sidebar" aria-expanded="false"></button>
 <aside class="main-sidebar" id="main-sidebar" aria-label="Primary navigation">
   <nav class="main-sidebar-nav" aria-label="Pinokio navigation">
     <div class='main-sidebar-section main-sidebar-section-actions' aria-label="Actions">
@@ -155,6 +156,7 @@
 
     const headerToggle = document.getElementById("minimize-header");
     const sidebar = document.getElementById("main-sidebar");
+    const peekTrigger = document.querySelector("[data-main-sidebar-peek-trigger]");
     if (body && sidebar && headerToggle && !headerToggle.dataset.mainSidebarHeaderToggle) {
       headerToggle.dataset.mainSidebarHeaderToggle = "true";
       headerToggle.classList.add("sidebar-toggle", "main-sidebar-header-toggle");
@@ -182,17 +184,66 @@
         }
       };
 
-      const setCollapsed = (collapsed) => {
+      const desktopPeekMq = window.matchMedia("(min-width: 769px) and (hover: hover) and (pointer: fine)");
+      const storageKey = "pinokio.main-sidebar-collapsed";
+      let peekCloseTimer = 0;
+
+      const isCollapsed = () => body.classList.contains("main-sidebar-collapsed");
+      const isPeeking = () => body.classList.contains("main-sidebar-peeking");
+      const syncSidebarVisibility = () => {
+        const peeking = isPeeking();
+        sidebar.setAttribute("aria-hidden", isCollapsed() && !peeking ? "true" : "false");
+        if (peekTrigger) {
+          peekTrigger.setAttribute("aria-expanded", peeking ? "true" : "false");
+        }
+      };
+      const canPeek = () => desktopPeekMq.matches && isCollapsed() && !body.classList.contains("main-sidebar-mobile-open");
+      const setPeeking = (peeking) => {
+        const next = !!peeking && canPeek();
+        window.clearTimeout(peekCloseTimer);
+        body.classList.toggle("main-sidebar-peeking", next);
+        syncSidebarVisibility();
+      };
+      const shouldKeepPeekOpen = () => {
+        const active = document.activeElement;
+        return (
+          (peekTrigger && peekTrigger.matches(":hover")) ||
+          sidebar.matches(":hover") ||
+          (peekTrigger && active === peekTrigger) ||
+          (active instanceof Node && sidebar.contains(active))
+        );
+      };
+      const closePeekSoon = () => {
+        window.clearTimeout(peekCloseTimer);
+        peekCloseTimer = window.setTimeout(() => {
+          if (shouldKeepPeekOpen()) return;
+          setPeeking(false);
+        }, 120);
+      };
+
+      const setCollapsed = (collapsed, options = {}) => {
         const next = !!collapsed;
+        if (!next) {
+          body.classList.remove("main-sidebar-peeking");
+        }
         body.classList.toggle("main-sidebar-collapsed", next);
-        sidebar.setAttribute("aria-hidden", next ? "true" : "false");
+        syncSidebarVisibility();
         updateToggle(next);
+        if (options.persist !== false) {
+          try {
+            window.localStorage.setItem(storageKey, next ? "1" : "0");
+          } catch (_) {}
+        }
         document.dispatchEvent(new CustomEvent("pinokio:sidebar-state", {
           detail: { collapsed: next, source: "main-sidebar" }
         }));
       };
 
-      setCollapsed(false);
+      let initialCollapsed = false;
+      try {
+        initialCollapsed = window.localStorage.getItem(storageKey) === "1";
+      } catch (_) {}
+      setCollapsed(initialCollapsed, { persist: false });
       requestAnimationFrame(() => {
         body.classList.add("main-sidebar-motion-ready");
       });
@@ -202,9 +253,55 @@
         setCollapsed(!body.classList.contains("main-sidebar-collapsed"));
       });
 
+      if (peekTrigger) {
+        peekTrigger.addEventListener("pointerenter", () => setPeeking(true));
+        peekTrigger.addEventListener("focus", () => setPeeking(true));
+        peekTrigger.addEventListener("click", () => setPeeking(true));
+        peekTrigger.addEventListener("pointerleave", closePeekSoon);
+        peekTrigger.addEventListener("blur", closePeekSoon);
+        sidebar.addEventListener("pointerenter", () => {
+          if (isPeeking()) {
+            window.clearTimeout(peekCloseTimer);
+          }
+        });
+        sidebar.addEventListener("focusin", () => {
+          if (isPeeking()) {
+            window.clearTimeout(peekCloseTimer);
+          }
+        });
+        sidebar.addEventListener("pointerleave", closePeekSoon);
+        sidebar.addEventListener("focusout", closePeekSoon);
+        document.addEventListener("pointerdown", (event) => {
+          if (!isPeeking()) return;
+          const target = event.target;
+          if (target instanceof Node && (sidebar.contains(target) || peekTrigger.contains(target))) return;
+          setPeeking(false);
+        });
+        document.addEventListener("keydown", (event) => {
+          if (event.key === "Escape" && isPeeking()) {
+            setPeeking(false);
+            if (typeof peekTrigger.focus === "function") {
+              peekTrigger.focus();
+            }
+          }
+        });
+        const handlePeekMediaChange = () => {
+          if (!desktopPeekMq.matches) {
+            setPeeking(false);
+          }
+        };
+        if (typeof desktopPeekMq.addEventListener === "function") {
+          desktopPeekMq.addEventListener("change", handlePeekMediaChange);
+        } else if (typeof desktopPeekMq.addListener === "function") {
+          desktopPeekMq.addListener(handlePeekMediaChange);
+        }
+      }
+
       window.PinokioMainSidebar = {
         setCollapsed,
-        isCollapsed: () => body.classList.contains("main-sidebar-collapsed")
+        setPeeking,
+        isCollapsed,
+        isPeeking
       };
     }
 

package/server/views/prototype/index.ejs

@@ -1010,6 +1010,9 @@ body.dark .appcanvas {
 <button class='btn2' id='minimize-header' data-tippy-content="fullscreen" title='fullscreen'>
   <div><i class="fa-solid fa-expand"></i></div>
 </button>
+<a class='btn2 pinokio-explore-nav-button' href="/home?mode=explore" data-pinokio-explore-nav="true" data-tippy-content="Explore" title="Explore" aria-label="Explore">
+  <div><i class="fa-solid fa-globe" aria-hidden="true"></i></div>
+</a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/review.ejs

@@ -941,6 +941,9 @@ body.dark .top-menu .btn2.selected {
 <button class='btn2' id='minimize-header' data-tippy-content="fullscreen" title='fullscreen'>
   <div><i class="fa-solid fa-expand"></i></div>
 </button>
+<a class='btn2 pinokio-explore-nav-button' href="/home?mode=explore" data-pinokio-explore-nav="true" data-tippy-content="Explore" title="Explore" aria-label="Explore">
+  <div><i class="fa-solid fa-globe" aria-hidden="true"></i></div>
+</a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/screenshots.ejs

@@ -873,6 +873,9 @@ document.addEventListener('DOMContentLoaded', function() {
 <button class='btn2' id='minimize-header' data-tippy-content="fullscreen" title='fullscreen'>
   <div><i class="fa-solid fa-expand"></i></div>
 </button>
+<a class='btn2 pinokio-explore-nav-button' href="/home?mode=explore" data-pinokio-explore-nav="true" data-tippy-content="Explore" title="Explore" aria-label="Explore">
+  <div><i class="fa-solid fa-globe" aria-hidden="true"></i></div>
+</a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/settings.ejs

@@ -1011,6 +1011,9 @@ document.addEventListener('DOMContentLoaded', function() {
 <button class='btn2' id='minimize-header' data-tippy-content="fullscreen" title='fullscreen'>
   <div><i class="fa-solid fa-expand"></i></div>
 </button>
+<a class='btn2 pinokio-explore-nav-button' href="/home?mode=explore" data-pinokio-explore-nav="true" data-tippy-content="Explore" title="Explore" aria-label="Explore">
+  <div><i class="fa-solid fa-globe" aria-hidden="true"></i></div>
+</a>
 <button class='btn2' id='back' data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class='btn2' id='forward' data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class='btn2' id='refresh-page' data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/setup_home.ejs

@@ -155,6 +155,9 @@ body.dark .card {
 <button class='btn2' id='minimize-header' data-tippy-content="fullscreen" title='fullscreen'>
   <div><i class="fa-solid fa-expand"></i></div>
 </button>
+<a class='btn2 pinokio-explore-nav-button' href="/home?mode=explore" data-pinokio-explore-nav="true" data-tippy-content="Explore" title="Explore" aria-label="Explore">
+  <div><i class="fa-solid fa-globe" aria-hidden="true"></i></div>
+</a>
 <button class='btn2' id='screenshot' data-tippy-content="screen capture"><i class="fa-solid fa-camera"></i></button>
 <button class='btn2' id='inspector' data-tippy-content="X-ray mode"><i class="fa-solid fa-eye"></i></button>
 <div class='flexible'></div>

package/server/views/terminal.ejs

@@ -3403,6 +3403,9 @@ const reloadMemory = async () => {
         <button class="btn2" id="minimize-header" data-tippy-content="fullscreen" title="fullscreen">
           <div><i class="fa-solid fa-expand"></i></div>
         </button>
+        <a class='btn2 pinokio-explore-nav-button' href="/home?mode=explore" data-pinokio-explore-nav="true" data-tippy-content="Explore" title="Explore" aria-label="Explore">
+          <div><i class="fa-solid fa-globe" aria-hidden="true"></i></div>
+        </a>
         <button class="btn2" id="back" data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
         <button class="btn2" id="forward" data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
         <button class="btn2" id="refresh-page" data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/server/views/terminals.ejs

@@ -4554,6 +4554,9 @@ body.dark .pinokio-git-commit-item {
 <button class="btn2" id="minimize-header" data-tippy-content="fullscreen" title="fullscreen">
   <div><i class="fa-solid fa-expand"></i></div>
 </button>
+<a class='btn2 pinokio-explore-nav-button' href="/home?mode=explore" data-pinokio-explore-nav="true" data-tippy-content="Explore" title="Explore" aria-label="Explore">
+  <div><i class="fa-solid fa-globe" aria-hidden="true"></i></div>
+</a>
 <button class="btn2" id="back" data-tippy-content="back"><div><i class="fa-solid fa-chevron-left"></i></div></button>
 <button class="btn2" id="forward" data-tippy-content="forward"><div><i class="fa-solid fa-chevron-right"></i></div></button>
 <button class="btn2" id="refresh-page" data-tippy-content="refresh"><div><i class="fa-solid fa-rotate-right"></i></div></button>

package/test/info-ready.test.js

@@ -0,0 +1,88 @@
+const assert = require("node:assert/strict")
+const fs = require("node:fs")
+const os = require("node:os")
+const path = require("node:path")
+const test = require("node:test")
+
+const Info = require("../kernel/info")
+
+const createInfo = ({ callerFile, scriptResolve, readyPaths = [] }) => {
+  const ready = new Set(readyPaths.map((item) => path.resolve(item)))
+  const info = new Info({
+    script: {
+      resolve: scriptResolve || (() => false)
+    },
+    isScriptReady: (scriptPath) => ready.has(path.resolve(scriptPath))
+  })
+  info.caller = () => callerFile
+  return info
+}
+
+test("info.ready checks caller-relative script paths first", (t) => {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), "pinokio-info-ready-"))
+  t.after(() => fs.rmSync(root, { recursive: true, force: true }))
+
+  const appRoot = path.join(root, "app")
+  const callerFile = path.join(appRoot, "pinokio.js")
+  const startScript = path.join(appRoot, "start.js")
+  fs.mkdirSync(appRoot, { recursive: true })
+  fs.writeFileSync(callerFile, "module.exports = {}")
+  fs.writeFileSync(startScript, "module.exports = {}")
+
+  let resolverCalls = 0
+  const info = createInfo({
+    callerFile,
+    scriptResolve: () => {
+      resolverCalls += 1
+      return false
+    },
+    readyPaths: [startScript]
+  })
+
+  assert.equal(info.ready("start.js"), true)
+  assert.equal(resolverCalls, 0)
+})
+
+test("info.ready falls back to Pinokio script URI resolution", (t) => {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), "pinokio-info-ready-"))
+  t.after(() => fs.rmSync(root, { recursive: true, force: true }))
+
+  const callerFile = path.join(root, "caller", "pinokio.js")
+  const remoteRoot = path.join(root, "api", "remote.git")
+  const remoteStart = path.join(remoteRoot, "start.js")
+  const remoteUri = "https://github.com/example/remote.git"
+  fs.mkdirSync(path.dirname(callerFile), { recursive: true })
+  fs.mkdirSync(remoteRoot, { recursive: true })
+  fs.writeFileSync(callerFile, "module.exports = {}")
+  fs.writeFileSync(remoteStart, "module.exports = {}")
+
+  const info = createInfo({
+    callerFile,
+    scriptResolve: (...args) => {
+      if (args[0] === remoteUri) {
+        return path.resolve(remoteRoot, ...args.slice(1))
+      }
+      return false
+    },
+    readyPaths: [remoteStart]
+  })
+
+  assert.equal(info.ready(remoteUri, "start.js"), true)
+})
+
+test("info.ready returns false when neither relative nor URI path is ready", (t) => {
+  const root = fs.mkdtempSync(path.join(os.tmpdir(), "pinokio-info-ready-"))
+  t.after(() => fs.rmSync(root, { recursive: true, force: true }))
+
+  const appRoot = path.join(root, "app")
+  const callerFile = path.join(appRoot, "pinokio.js")
+  fs.mkdirSync(appRoot, { recursive: true })
+  fs.writeFileSync(callerFile, "module.exports = {}")
+
+  const info = createInfo({
+    callerFile,
+    scriptResolve: () => false
+  })
+
+  assert.equal(info.ready("missing.js"), false)
+})

package/test/launch-settings-ui.test.js

@@ -369,6 +369,9 @@ test("static guard: open without launching is not wired to launch requirement st
 
   assert.match(homeActionModal, /Open without launching/)
   assert.match(homeActionModal, /class='home-mode-command home-browse' data-src='<%= item\.view_url %>'/)
+  assert.match(homeActionModal, /Open dev mode/)
+  assert.doesNotMatch(homeActionModal, /home-actions-tabs|home-actions-tab|role='tab'|role='tabpanel'/)
+  assert.doesNotMatch(homeActionModal, /Open files mode/)
   assert.doesNotMatch(homeActionModal, /launch.requirements|data-launch-requirements|frame-link/)
   assert.match(homeView, /if \(target\) \{[\s\S]*window\.PinokioHomeGuardNavigate\(src\)[\s\S]*location\.href = src/)
   assert.match(statusClient, /const status = data && data\.ok \? data\.status : null/)

package/test/shell-cleaned-log.test.js

@@ -0,0 +1,66 @@
+const assert = require('node:assert/strict')
+const fs = require('node:fs/promises')
+const os = require('node:os')
+const path = require('node:path')
+const test = require('node:test')
+
+const Kernel = require('../kernel')
+
+async function exists(targetPath) {
+  try {
+    await fs.access(targetPath)
+    return true
+  } catch (_) {
+    return false
+  }
+}
+
+test('kernel shell logs write cleaned output without creating info logs', async () => {
+  const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-shell-cleaned-log-'))
+  try {
+    const kernel = Object.create(Kernel.prototype)
+    kernel.homedir = root
+
+    const group = path.join(root, 'api', 'demo', 'start.js')
+    await Kernel.prototype._log.call(kernel, {
+      cleaned: 'hello from cleaned log\n'
+    }, group, {
+      index: 3
+    })
+
+    const relativeGroup = path.relative(root, group)
+    const cleanedLog = path.join(root, 'logs', 'shell', 'cleaned', `${relativeGroup}.3.txt`)
+    const infoLog = path.join(root, 'logs', 'shell', 'info', `${relativeGroup}.3.txt`)
+
+    assert.equal(await exists(cleanedLog), true)
+    assert.equal(await fs.readFile(cleanedLog, 'utf8'), 'hello from cleaned log\n')
+    assert.equal(await exists(infoLog), false)
+  } finally {
+    await fs.rm(root, { recursive: true, force: true })
+  }
+})
+
+test('kernel shell log clearing removes cleaned files and legacy info files', async () => {
+  const root = await fs.mkdtemp(path.join(os.tmpdir(), 'pinokio-shell-cleaned-clear-'))
+  try {
+    const kernel = Object.create(Kernel.prototype)
+    kernel.homedir = root
+
+    const group = path.join(root, 'api', 'demo', 'start.js')
+    const relativeGroup = path.relative(root, group)
+    const cleanedLog = path.join(root, 'logs', 'shell', 'cleaned', `${relativeGroup}.3.txt`)
+    const infoLog = path.join(root, 'logs', 'shell', 'info', `${relativeGroup}.3.txt`)
+
+    await fs.mkdir(path.dirname(cleanedLog), { recursive: true })
+    await fs.mkdir(path.dirname(infoLog), { recursive: true })
+    await fs.writeFile(cleanedLog, 'cleaned\n')
+    await fs.writeFile(infoLog, 'legacy info\n')
+
+    await Kernel.prototype.clearLog.call(kernel, group)
+
+    assert.equal(await exists(cleanedLog), false)
+    assert.equal(await exists(infoLog), false)
+  } finally {
+    await fs.rm(root, { recursive: true, force: true })
+  }
+})