pinokiod 7.3.10 → 7.3.12

package/server/index.js

@@ -1089,7 +1089,7 @@ class Server {
     const doneMarker = "PINOKIO_GITHUB_LOGIN_DONE"
     const delimiter = this.kernel.platform === "win32" ? " && " : " ; "
     const verifyCommand = this.kernel.platform === "win32"
-      ? "cmd /C \"set GIT_TERMINAL_PROMPT=0&& set GCM_INTERACTIVE=never&& (echo protocol=https& echo host=github.com& echo.) | git credential fill >NUL\""
+      ? "powershell.exe -NoProfile -Command \"$env:GIT_TERMINAL_PROMPT='0'; $env:GCM_INTERACTIVE='never'; @('protocol=https','host=github.com','') | git credential fill > $null; exit $LASTEXITCODE\""
       : "printf 'protocol=https\\nhost=github.com\\n\\n' | GIT_TERMINAL_PROMPT=0 GCM_INTERACTIVE=never git credential fill >/dev/null"
     const doneCommand = this.kernel.platform === "win32"
       ? "echo P^INOKIO_GITHUB_LOGIN_DONE"
@@ -4914,11 +4914,17 @@ class Server {
   }
   async composePeerAccessPayload() {
     let peer_access_points = []
+    let peer_access_router_installed = false
     try {
       peer_access_points = await this.buildPeerAccessPoints()
     } catch (error) {
       peer_access_points = []
     }
+    try {
+      peer_access_router_installed = await this.kernel.network_installed()
+    } catch (error) {
+      peer_access_router_installed = false
+    }
     let peer_url = `http://${this.kernel.peer.host}:${DEFAULT_PORT}`
     let peer_qr = null
     if (peer_access_points.length > 0) {
@@ -4929,7 +4935,7 @@ class Server {
         peer_qr = await QRCode.toDataURL(peer_url)
       } catch (_) {}
     }
-    return { peer_access_points, peer_url, peer_qr }
+    return { peer_access_points, peer_url, peer_qr, peer_access_router_installed }
   }
 
   async ensureLogsRootDirectory() {
@@ -8092,6 +8098,8 @@ class Server {
       if (!requireSkillsHome(res)) {
         return
       }
+      const peerAccess = await this.composePeerAccessPayload()
+      const list = this.getPeers()
       let skills = []
       let indexError = ""
       try {
@@ -8100,8 +8108,11 @@ class Server {
         indexError = error && error.message ? error.message : "Failed to read managed skills index."
       }
       res.render("skills", {
+        current_host: this.kernel.peer.host,
+        ...peerAccess,
         theme: this.theme,
         agent: req.agent,
+        list,
         skills,
         skillsRootPath: ManagedSkills.skillsRoot(this.kernel),
         indexPath: ManagedSkills.indexPath(this.kernel),
@@ -12380,49 +12391,53 @@ class Server {
     *  GET /connect/discord
     */
     this.app.get("/connect/:provider", ex(async (req, res) => {
+      const providerUsesDeviceLogin = req.params.provider === "huggingface"
+      const setupMode = providerUsesDeviceLogin ? "connect" : "network"
 
       // check if all the connect related modules are installed
       let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
-        bin: this.kernel.bin.preset("connect"),
+        bin: this.kernel.bin.preset(setupMode),
       })
       if (!requirements_pending && install_required) {
         console.log("REDIRECT", req.params.provider)
-        res.redirect("/setup/connect?callback=/connect/" + req.params.provider)
+        res.redirect(`/setup/${setupMode}?callback=/connect/${req.params.provider}`)
         return
       }
 
-      let https_running = false
-      try {
-        let res = await axios.get(`http://127.0.0.1:2019/config/`, {
-          timeout: 2000
-        })
-        let test = /pinokio\.localhost/.test(JSON.stringify(res.data))
-        if (test) {
-          https_running = true
+      if (!providerUsesDeviceLogin) {
+        let https_running = false
+        try {
+          let res = await axios.get(`http://127.0.0.1:2019/config/`, {
+            timeout: 2000
+          })
+          let test = /pinokio\.localhost/.test(JSON.stringify(res.data))
+          if (test) {
+            https_running = true
+          }
+        } catch (e) {
+          console.log(e)
         }
-      } catch (e) {
-        console.log(e)
-      }
-      if (!https_running) {
+        if (!https_running) {
 //        res.json({ error: "pinokio.host not yet available" })
-        res.redirect("/setup/connect?callback=/connect/" + req.params.provider)
-        return
-      }
+          res.redirect(`/setup/${setupMode}?callback=/connect/${req.params.provider}`)
+          return
+        }
 
-      // check if pinokio.localhost router is running
-      let router_running = false
-      let router = this.kernel.router.published()
-      for(let ip in router) {
-        let domains = router[ip]
-        if (domains.includes("pinokio.localhost")) {
-          router_running = true
-          break
+        // check if pinokio.localhost router is running
+        let router_running = false
+        let router = this.kernel.router.published()
+        for(let ip in router) {
+          let domains = router[ip]
+          if (domains.includes("pinokio.localhost")) {
+            router_running = true
+            break
+          }
         }
-      }
-      if (!router_running) {
+        if (!router_running) {
 //        res.json({ error: "pinokio.localhost not yet available" })
-        res.redirect("/setup/connect?callback=/connect/" + req.params.provider)
-        return
+          res.redirect(`/setup/${setupMode}?callback=/connect/${req.params.provider}`)
+          return
+        }
       }
 
 
@@ -12437,7 +12452,7 @@ class Server {
       const config = this.kernel.connect.config[req.params.provider]
       const isPinokioHost = req.hostname === 'pinokio.localhost'
       const renderProtocol = isPinokioHost ? 'https' : 'http'
-      res.render(`connect/index`, {
+      res.render(providerUsesDeviceLogin ? `connect/huggingface` : `connect/index`, {
         protocol: renderProtocol,
         name: req.params.provider,
         config,
@@ -13516,7 +13531,7 @@ class Server {
       1. mode:ai => all
       2. mode:coding => conda, nodejs, git
       3. mode:network => conda, git, caddy
-      4. mode:connect => conda, git, caddy
+      4. mode:connect => conda, git, huggingface
       */
 
       let bin = this.kernel.bin.preset(req.params.mode)
@@ -15626,6 +15641,32 @@ class Server {
         res.json({ https_active: false, router_info: [], rewrite_mapping: {}, router: {} })
       }
     }))
+    this.app.get("/info/network-sharing", ex(async (req, res) => {
+      res.set("Cache-Control", "no-store")
+      const https_active = !!(this.kernel.peer && this.kernel.peer.https_active)
+      let installed = false
+      let running = false
+      try {
+        const caddy = this.kernel.bin && this.kernel.bin.mod ? this.kernel.bin.mod.caddy : null
+        if (caddy && typeof caddy.installed === "function") {
+          installed = !!(await caddy.installed())
+        }
+      } catch (err) {
+        installed = false
+      }
+      try {
+        await axios.get("http://127.0.0.1:2019/config/", { timeout: 750 })
+        running = true
+      } catch (err) {
+        running = false
+      }
+      res.json({
+        active: https_active,
+        installed,
+        running,
+        available: https_active && installed
+      })
+    }))
     this.app.get("/qr", ex(async (req, res) => {
       try {
         const data = typeof req.query.data === 'string' ? req.query.data : ''
@@ -16042,6 +16083,7 @@ class Server {
       })
     }))
     this.app.get("/pinokio/install", ex((req, res) => {
+      res.set("Cache-Control", "no-store")
       let requirements = req.session.requirements
       let callback = req.session.callback
       req.session.requirements = null

package/server/public/common.js

@@ -116,6 +116,14 @@ function escapePinokioStatusHtml(value) {
     .replace(/'/g, ''')
 }
 
+const PINOKIO_WAIT_STATUS_SPINNER_HTML = `
+  <span class="pinokio-install-inline-status-spinner" aria-hidden="true">
+    <span class="pinokio-install-inline-status-spinner-dot pinokio-install-inline-status-spinner-dot-1"></span>
+    <span class="pinokio-install-inline-status-spinner-dot pinokio-install-inline-status-spinner-dot-2"></span>
+    <span class="pinokio-install-inline-status-spinner-dot pinokio-install-inline-status-spinner-dot-3"></span>
+    <span class="pinokio-install-inline-status-spinner-dot pinokio-install-inline-status-spinner-dot-4"></span>
+  </span>`
+
 function ensurePinokioWaitFooterStatus() {
   let status = document.getElementById(PINOKIO_WAIT_FOOTER_ID)
   if (status) {
@@ -148,9 +156,7 @@ function showPinokioWaitFooterStatus(data = {}) {
   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>
+      ${PINOKIO_WAIT_STATUS_SPINNER_HTML}
       <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>` : ''}
@@ -445,24 +451,28 @@ class ScreenCaptureModal {
 .modal-overlay{position:fixed;inset:0;padding:24px;display:flex;align-items:center;justify-content:center;z-index:9999;opacity:0;visibility:hidden;pointer-events:none;transition:opacity 160ms ease,visibility 0s linear 160ms;}
 .modal-overlay.is-visible{opacity:1;visibility:visible;pointer-events:auto;transition-delay:0s;}
 @media (prefers-reduced-motion: reduce){.modal-overlay{transition:none;}.capture-modal{animation:none;}}
-.capture-modal-overlay{background:rgba(15,23,42,0.45);-webkit-backdrop-filter:blur(16px);backdrop-filter:blur(16px);}
-.capture-modal{width:min(360px,calc(100% - 32px));padding:28px 26px;border-radius:18px;background:rgba(255,255,255,0.92);border:1px solid rgba(15,23,42,0.08);box-shadow:0 30px 80px rgba(15,23,42,0.35);display:flex;flex-direction:column;gap:18px;text-align:center;}
-body.dark .capture-modal{background:rgba(15,23,42,0.9);border-color:rgba(148,163,184,0.24);color:rgba(226,232,240,0.96);box-shadow:0 34px 88px rgba(2,6,20,0.82);}
-.capture-modal-title{font-size:20px;font-weight:600;letter-spacing:-0.01em;color:rgba(15,23,42,0.92);}
+.capture-modal-overlay{background:rgba(9,11,15,0.34);-webkit-backdrop-filter:none;backdrop-filter:none;}
+body.dark .capture-modal-overlay{background:rgba(0,0,0,0.58);}
+.capture-modal{width:min(360px,calc(100% - 32px));padding:20px;border-radius:8px;background:#fff;border:1px solid rgba(24,24,27,0.12);box-shadow:0 18px 50px rgba(15,23,42,0.16);display:flex;flex-direction:column;gap:14px;text-align:center;color:#18181b;}
+body.dark .capture-modal{background:#1b1c1d;border-color:rgba(255,255,255,0.1);color:rgba(250,250,250,0.94);box-shadow:0 24px 72px rgba(0,0,0,0.42);}
+.capture-modal-title{font-size:16px;line-height:1.25;font-weight:600;letter-spacing:0;color:inherit;}
 body.dark .capture-modal-title{color:inherit;}
-.capture-modal-description{font-size:14px;line-height:1.5;color:rgba(71,85,105,0.82);}
-body.dark .capture-modal-description{color:rgba(203,213,225,0.88);}
-.capture-modal-actions{display:flex;justify-content:center;gap:12px;}
-.capture-modal-button{padding:10px 20px;border-radius:999px;border:1px solid transparent;font-size:14px;font-weight:600;cursor:pointer;transition:background 0.18s ease,color 0.18s ease,box-shadow 0.18s ease,transform 0.12s ease;}
-.capture-modal-button.primary{background:linear-gradient(135deg,rgba(127,91,243,0.95),rgba(84,63,196,0.95));color:#fff;box-shadow:0 16px 36px rgba(111,76,242,0.3);}
-.capture-modal-button.primary:hover{box-shadow:0 20px 42px rgba(111,76,242,0.38);transform:translateY(-1px);}
-.capture-modal-button.secondary{background:rgba(148,163,184,0.18);color:rgba(15,23,42,0.78);}
-.capture-modal-button.secondary:hover{background:rgba(148,163,184,0.28);box-shadow:0 12px 28px rgba(15,23,42,0.12);}
-body.dark .capture-modal-button.secondary{background:rgba(148,163,184,0.2);color:rgba(226,232,240,0.92);}
+.capture-modal-description{font-size:12px;line-height:1.45;color:#71717a;}
+body.dark .capture-modal-description{color:rgba(229,231,235,0.62);}
+.capture-modal-actions{display:flex;justify-content:center;gap:8px;}
+.capture-modal-button{min-height:32px;padding:0 12px;border-radius:6px;border:1px solid transparent;font-size:13px;font-weight:600;cursor:pointer;transition:background 0.14s ease,color 0.14s ease,border-color 0.14s ease;}
+.capture-modal-button.primary{background:#18181b;color:#fff;border-color:#18181b;box-shadow:none;}
+.capture-modal-button.primary:hover{background:#27272a;border-color:#27272a;box-shadow:none;transform:none;}
+body.dark .capture-modal-button.primary{background:rgba(250,250,250,0.94);border-color:rgba(250,250,250,0.94);color:#1b1c1d;}
+body.dark .capture-modal-button.primary:hover{background:#fff;border-color:#fff;}
+.capture-modal-button.secondary{background:transparent;color:#52525b;border-color:rgba(24,24,27,0.12);}
+.capture-modal-button.secondary:hover{background:rgba(24,24,27,0.06);border-color:rgba(24,24,27,0.2);box-shadow:none;color:#18181b;}
+body.dark .capture-modal-button.secondary{background:transparent;border-color:rgba(255,255,255,0.1);color:rgba(229,231,235,0.7);}
+body.dark .capture-modal-button.secondary:hover{background:rgba(255,255,255,0.07);border-color:rgba(255,255,255,0.18);color:rgba(250,250,250,0.94);}
 .capture-modal-button:active{transform:translateY(1px);}
-.capture-modal-button:focus-visible{outline:2px solid rgba(127,91,243,0.8);outline-offset:2px;}
+.capture-modal-button:focus-visible{outline:2px solid rgba(24,24,27,0.28);outline-offset:2px;}
 .modal-overlay.is-visible .capture-modal{animation:captureModalPop 160ms ease-out;}
-@media (max-width: 640px){.modal-overlay{padding:16px;}.capture-modal{width:calc(100% - 24px);padding:24px 20px;}.capture-modal-actions{flex-direction:column;}.capture-modal-button{width:100%;}}
+@media (max-width: 640px){.modal-overlay{padding:16px;}.capture-modal{width:calc(100% - 24px);padding:18px;}.capture-modal-actions{flex-direction:column;}.capture-modal-button{width:100%;}}
 @keyframes captureModalPop{from{opacity:0;transform:scale(0.97) translateY(12px);}to{opacity:1;transform:scale(1) translateY(0);}}
 `;
     document.head.appendChild(style);
@@ -2579,13 +2589,13 @@ if (typeof hotkeys === 'function') {
   }
 })();
 
-// Mobile "Tap to connect" curtain to prime audio on the top-level page
-(function initMobileConnectCurtain() {
+// Mobile first-interaction audio primer for notification sounds on the top-level page
+(function initMobileAudioPrimer() {
   if (typeof window === 'undefined' || typeof document === 'undefined') {
     return;
   }
   try {
-    if (window.__pinokioConnectCurtainInstalled || window.__pinokioConnectCurtainInstalling) {
+    if (window.__pinokioAudioPrimerInstalled || window.__pinokioAudioPrimerInstalling) {
       return;
     }
   } catch (_) {}
@@ -2597,7 +2607,7 @@ if (typeof hotkeys === 'function') {
     // cross-origin parent; just bail
     return;
   }
-  if (window.__pinokioConnectCurtainInstalled) {
+  if (window.__pinokioAudioPrimerInstalled) {
     return;
   }
 
@@ -2653,37 +2663,6 @@ if (typeof hotkeys === 'function') {
     return uaMobile;
   };
 
-  const createCurtain = () => {
-    const style = document.createElement('style');
-    style.textContent = `
-.pinokio-connect-curtain{position:fixed;top:0;left:0;right:0;bottom:0;z-index:2147483646;background:rgba(15,23,42,0.35);-webkit-backdrop-filter:blur(2px);backdrop-filter:blur(2px);display:flex;align-items:center;justify-content:center}
-.pinokio-connect-msg{user-select:none;-webkit-user-select:none;color:#fff;background:rgba(15,23,42,0.85);padding:14px 18px;border-radius:12px;font:500 15px/1.35 system-ui,-apple-system,Segoe UI,Roboto,Ubuntu,Cantarell,Noto Sans,sans-serif;box-shadow:0 16px 40px rgba(0,0,0,.38);text-align:center;max-width:200px}
-.pinokio-connect-msg-title{font-weight:600;font-size:16px;margin-bottom:4px}
-.pinokio-connect-msg-hint{font-size:13px;opacity:.72}
-@media (max-width:768px){.pinokio-connect-msg{font-size:14px;padding:12px 16px}}
-    `;
-    document.head.appendChild(style);
-
-    const overlay = document.createElement('div');
-    overlay.className = 'pinokio-connect-curtain';
-    overlay.setAttribute('role', 'button');
-    overlay.setAttribute('aria-label', 'Tap to connect');
-    overlay.tabIndex = 0;
-    const msg = document.createElement('div');
-    msg.className = 'pinokio-connect-msg';
-    const msgTitle = document.createElement('div');
-    msgTitle.className = 'pinokio-connect-msg-title';
-    msgTitle.textContent = 'Tap to connect';
-    const msgHint = document.createElement('div');
-    msgHint.className = 'pinokio-connect-msg-hint';
-    msgHint.textContent = 'To type into the terminal, use the "Input" button.';
-    msg.appendChild(msgTitle);
-    msg.appendChild(msgHint);
-    overlay.appendChild(msg);
-    window.__pinokioConnectCurtainInstalled = true;
-    return overlay;
-  };
-
   const SOUND_PREF_STORAGE_KEY = 'pinokio:idle-sound';
   const primeAudio = async () => {
     // Determine whether the user picked a custom `/sound/...` clip.
@@ -2747,31 +2726,26 @@ if (typeof hotkeys === 'function') {
     if (!(forceParam || isLikelyMobile())) {
       return;
     }
-    if (window.__pinokioConnectCurtainInstalled || window.__pinokioConnectCurtainInstalling) {
+    if (window.__pinokioAudioPrimerInstalled || window.__pinokioAudioPrimerInstalling) {
       return;
     }
-    try { window.__pinokioConnectCurtainInstalling = true; } catch (_) {}
-    const overlay = createCurtain();
+    try { window.__pinokioAudioPrimerInstalling = true; } catch (_) {}
     let handled = false;
-    const onTap = async (e) => {
+    const cleanup = () => {
+      document.removeEventListener('click', onFirstInteraction, true);
+      document.removeEventListener('touchend', onFirstInteraction, true);
+      document.removeEventListener('keydown', onFirstInteraction, true);
+    };
+    const onFirstInteraction = async () => {
       if (handled) return;
       handled = true;
-      try { e.preventDefault(); e.stopPropagation(); } catch (_) {}
+      cleanup();
       try { await primeAudio(); } catch (_) {}
-      try { overlay.remove(); } catch (_) {}
-      try { window.__pinokioConnectCurtainInstalled = true; window.__pinokioConnectCurtainInstalling = false; } catch (_) {}
+      try { window.__pinokioAudioPrimerInstalled = true; window.__pinokioAudioPrimerInstalling = false; } catch (_) {}
     };
-    overlay.addEventListener('click', onTap, { once: true, capture: true });
-    overlay.addEventListener('keydown', (e) => {
-      if (!e) {
-        return;
-      }
-      const key = e.key || '';
-      if (key === 'Enter' || key === ' ' || key === 'Spacebar') {
-        onTap(e);
-      }
-    }, { capture: true });
-    document.body.appendChild(overlay);
+    document.addEventListener('click', onFirstInteraction, true);
+    document.addEventListener('touchend', onFirstInteraction, true);
+    document.addEventListener('keydown', onFirstInteraction, true);
   };
 
   if (document.readyState === 'loading') {

package/server/public/install.js

@@ -38,13 +38,14 @@ const installname = async (url, name, options) => {
       cancelButtonText: 'Cancel',
       confirmButtonText: 'Download',
       buttonsStyling: false,
-      backdrop: 'rgba(9, 11, 15, 0.65)',
+      backdrop: true,
       width: 'min(460px, 92vw)',
       allowOutsideClick: () => !Swal.isLoading(),
       allowEscapeKey: true,
       showLoaderOnConfirm: true,
       loaderHtml: '<span class="pinokio-download-loader-spinner" aria-hidden="true"></span><span class="pinokio-download-loader-text">Downloading...</span>',
       customClass: {
+        container: 'pinokio-download-container',
         popup: 'pinokio-download-modal',
         htmlContainer: 'pinokio-download-html',
         inputLabel: 'pinokio-download-label',
@@ -101,6 +102,23 @@ const escapeInstallHtml = (value) => {
     .replace(/'/g, '&#39;')
 }
 
+const INLINE_INSTALL_STATUS_SPINNER_HTML = `
+  <span class="pinokio-install-inline-status-spinner" aria-hidden="true">
+    <span class="pinokio-install-inline-status-spinner-dot pinokio-install-inline-status-spinner-dot-1"></span>
+    <span class="pinokio-install-inline-status-spinner-dot pinokio-install-inline-status-spinner-dot-2"></span>
+    <span class="pinokio-install-inline-status-spinner-dot pinokio-install-inline-status-spinner-dot-3"></span>
+    <span class="pinokio-install-inline-status-spinner-dot pinokio-install-inline-status-spinner-dot-4"></span>
+  </span>`
+
+const getInlineInstallStatusIconHtml = (iconClass) => {
+  const normalizedIconClass = String(iconClass || '')
+  const isProgressIcon = /\bfa-circle-notch\b/.test(normalizedIconClass) || /\bfa-spin\b/.test(normalizedIconClass)
+  if (isProgressIcon) {
+    return INLINE_INSTALL_STATUS_SPINNER_HTML
+  }
+  return `<span class="pinokio-install-inline-status-icon" aria-hidden="true"><i class="${escapeInstallHtml(normalizedIconClass)}"></i></span>`
+}
+
 const ensureInlineInstallStatus = () => {
   let status = document.getElementById(INLINE_INSTALL_STATUS_ID)
   if (status) {
@@ -126,7 +144,7 @@ const setInlineInstallStatus = ({ state, title, detailHtml, iconClass }) => {
   status.className = `pinokio-install-inline-status is-${normalizedState}`
   status.innerHTML = `
     <div class="pinokio-install-inline-status-shell">
-      <span class="pinokio-install-inline-status-icon" aria-hidden="true"><i class="${iconClass}"></i></span>
+      ${getInlineInstallStatusIconHtml(iconClass)}
       <div class="pinokio-install-inline-status-copy">
         <div class="pinokio-install-inline-status-title">${escapeInstallHtml(title || '')}</div>
         ${detailHtml ? `<div class="pinokio-install-inline-status-detail">${detailHtml}</div>` : ''}

package/server/public/layout.js

@@ -801,7 +801,7 @@
   };
 
   window.PinokioLayout = api;
-  // Mobile "Tap to connect" curtain is centralized in common.js to avoid duplicates
+  // Mobile notification audio priming is centralized in common.js to avoid duplicates
   
   // Top-level notification listener (indicator + optional chime) for mobile
   (function initTopLevelNotificationListener() {