pinokiod 7.1.13 → 7.1.14

package/package.json

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

package/server/index.js

@@ -970,12 +970,11 @@ class Server {
     console.log("Chrome")
 
     let name = req.params.name
-    const binCheckLabel = `bin check ${name} ${process.hrtime.bigint()}`
-    console.time(binCheckLabel)
+    console.time("bin check")
     let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
       bin: this.kernel.bin.preset("dev"),
     })
-    console.timeEnd(binCheckLabel)
+    console.timeEnd("bin check")
     if (!requirements_pending && install_required) {
       res.redirect(`/setup/dev?callback=${req.originalUrl}`)
       return
@@ -4765,8 +4764,12 @@ class Server {
 //      }
     }
   }
-  async terminals(filepath) {
-    let venvs = await Util.find_venv(filepath)
+  async terminals(filepath, options = {}) {
+    const includeVenvs = options.includeVenvs !== false
+    let venvs = []
+    if (includeVenvs) {
+      venvs = await Util.find_venv(filepath)
+    }
     let terminal
     const windowsBashPath = await this.resolveWindowsBashPath()
     const hasWindowsBashOption = this.kernel.platform === "win32" && typeof windowsBashPath === "string" && windowsBashPath.length > 0
@@ -10766,7 +10769,7 @@ class Server {
     }))
     this.app.get("/d/*", ex(async (req, res) => {
       let filepath = Util.u2p(req.params[0])
-      let terminal = await this.terminals(filepath)
+      let terminal = await this.terminals(filepath, { includeVenvs: false })
       let plugin = await this.getPluginGlobal(req, this.kernel.plugin.config, terminal, filepath)
       let html = ""
       let plugin_menu
@@ -10909,6 +10912,7 @@ class Server {
         install: this.install,
         agent: req.agent,
         theme: this.theme,
+        terminals_url: "/pinokio/d-terminals/" + req.params[0],
         //dynamic: plugin_menu
         dynamic,
       })
@@ -11051,6 +11055,23 @@ class Server {
         res.send("")
       }
     }))
+    this.app.get("/pinokio/d-terminals/*", ex(async (req, res) => {
+      let filepath = Util.u2p(req.params[0])
+      let terminal = await this.terminals(filepath)
+      const html = await new Promise((resolve, reject) => {
+        ejs.renderFile(path.resolve(__dirname, "views/partials/d_terminal_column.ejs"), {
+          userTerminal: terminal,
+          terminals_url: null,
+        }, (err, html) => {
+          if (err) {
+            reject(err)
+            return
+          }
+          resolve(html)
+        })
+      })
+      res.send(html)
+    }))
     this.app.get("/pinokio/dynamic/:name", ex(async (req, res) => {
   //    await this.kernel.plugin.init()
 

package/server/public/common.js

@@ -3928,9 +3928,6 @@ document.addEventListener("DOMContentLoaded", () => {
     }
     const fallbackUrl = buildAskAiLaunchUrl(tool.href, workspaceCwd);
     if (fallbackUrl) {
-      refreshTerminalSessions(fallbackUrl, workspaceCwd, {
-        retryDelays: []
-      });
       window.location.href = fallbackUrl;
     }
   }

package/server/views/app.ejs

@@ -5302,6 +5302,7 @@ header.navheader .mode-selector .community-mode-toggle {
   let interacted = false
   let global_selector
   let pendingSelectionRetry = null
+  let initialWorkspaceDiskUsageRequested = false
   const scheduleSelectionRetry = (delay = 100) => {
     if (pendingSelectionRetry !== null) {
       return
@@ -5470,10 +5471,12 @@ header.navheader .mode-selector .community-mode-toggle {
     })
     let frame = document.createElement("iframe")
     frame.name = name
-    refreshTerminalSessions(href)
     frame.src = href
     frame.classList.add("selected")
     iframe_onerror(frame)
+    frame.addEventListener("load", () => {
+      requestInitialWorkspaceDiskUsage()
+    }, { once: true })
     frame.setAttribute(
       "allow", 
       "clipboard-read *; clipboard-write *; accelerometer *; ambient-light-sensor *; autoplay *; battery *; camera *; display-capture *; fullscreen *; gamepad *; geolocation *; gyroscope *; hid *; identity-credentials-get *; microphone *; midi *; otp-credentials *; serial *;"
@@ -5484,17 +5487,6 @@ header.navheader .mode-selector .community-mode-toggle {
     document.querySelector("main").appendChild(frame)
     loaded[name] = true
   }
-  function refreshTerminalSessions(rawUrl, workspaceCwd = "", options = {}) {
-    try {
-      const discovery = window.PinokioTerminalsDiscovery
-      if (!discovery || typeof discovery.refreshTerminalSessions !== "function") {
-        return false
-      }
-      return discovery.refreshTerminalSessions(rawUrl, workspaceCwd, options)
-    } catch (_) {
-      return false
-    }
-  }
   installBrowserviewInjectTargetObserver()
   document.addEventListener("click", (e) => {
     interacted = true
@@ -6579,14 +6571,10 @@ const rerenderMenuSection = (container, html) => {
 
 
 		    // Instantiate a frame with the selected target's href
-		    let url = target.href
 	      const targetInjectDescriptors = readLinkInjectDescriptors(target)
-		    if (!url) {
+		    if (!target.href) {
 		      return
 		    }
-//    document.querySelector("#open-browser").href = url
-//    document.querySelector("#clone-tab").setAttribute("data-href", url)
-
     //document.querySelector("#location").value = url
 
 //    document.querySelector("#open-location").setAttribute('href', target.href)
@@ -6634,6 +6622,7 @@ const rerenderMenuSection = (container, html) => {
         eventParam.preventDefault()
         eventParam.stopPropagation()
       }
+      requestInitialWorkspaceDiskUsage()
       browserPopoutSurface.show(target)
       return
     }
@@ -6709,7 +6698,6 @@ const rerenderMenuSection = (container, html) => {
 	      let mode = target.getAttribute("data-mode")
       if (mode === "refresh") {
         if (targetFrame.src !== target.href) {
-          refreshTerminalSessions(target.href)
           targetFrame.src = target.href
         }
           } else {
@@ -6720,7 +6708,6 @@ const rerenderMenuSection = (container, html) => {
                 let sub = subUrlOf(target.href, targetFrame.src)
                 if (!sub) {
                   if (targetFrame.src !== target.href) {
-                    refreshTerminalSessions(target.href)
                     targetFrame.src = target.href
                   }
                 }
@@ -6736,7 +6723,6 @@ const rerenderMenuSection = (container, html) => {
             } else {
               if (force) {
                 if (targetFrame.src !== target.href) {
-                  refreshTerminalSessions(target.href)
                   targetFrame.src = target.href
                 }
               }
@@ -6758,15 +6744,17 @@ const rerenderMenuSection = (container, html) => {
 	        } else {
 	          let frame = document.createElement("iframe")
 	          frame.name = target.target
-	          refreshTerminalSessions(target.href)
 	          frame.src = target.href
-          iframe_onerror(frame)
-          frame.setAttribute(
-            "allow", 
-            "clipboard-read *; clipboard-write *; accelerometer *; ambient-light-sensor *; autoplay *; battery *; camera *; display-capture *; fullscreen *; gamepad *; geolocation *; gyroscope *; hid *; identity-credentials-get *; microphone *; midi *; otp-credentials *; serial *;"
+	          iframe_onerror(frame)
+	          frame.addEventListener("load", () => {
+	            requestInitialWorkspaceDiskUsage()
+	          }, { once: true })
+	          frame.setAttribute(
+	            "allow",
+	            "clipboard-read *; clipboard-write *; accelerometer *; ambient-light-sensor *; autoplay *; battery *; camera *; display-capture *; fullscreen *; gamepad *; geolocation *; gyroscope *; hid *; identity-credentials-get *; microphone *; midi *; otp-credentials *; serial *;"
 	          )
 	          frame.setAttribute("allowfullscreen", "")
-            writeFrameInjectDescriptors(frame, targetInjectDescriptors)
+	          writeFrameInjectDescriptors(frame, targetInjectDescriptors)
 	          publishBrowserviewInjectTargets([frame], { sync: true })
 	          document.querySelector("main").appendChild(frame)
 	          loaded[target.target] = true
@@ -6922,14 +6910,17 @@ const rerenderMenuSection = (container, html) => {
 
     document.querySelector(".temp-menu").appendChild(item)
 
-    let frame = document.createElement("iframe")
-    frame.name = id
-    frame.src = item.href
-    iframe_onerror(frame)
-    frame.setAttribute(
-      "allow", 
-      "clipboard-read *; clipboard-write *; accelerometer *; ambient-light-sensor *; autoplay *; battery *; camera *; display-capture *; fullscreen *; gamepad *; geolocation *; gyroscope *; hid *; identity-credentials-get *; microphone *; midi *; otp-credentials *; serial *;"
-    )
+	    let frame = document.createElement("iframe")
+	    frame.name = id
+	    frame.src = item.href
+	    iframe_onerror(frame)
+	    frame.addEventListener("load", () => {
+	      requestInitialWorkspaceDiskUsage()
+	    }, { once: true })
+	    frame.setAttribute(
+	      "allow",
+	      "clipboard-read *; clipboard-write *; accelerometer *; ambient-light-sensor *; autoplay *; battery *; camera *; display-capture *; fullscreen *; gamepad *; geolocation *; gyroscope *; hid *; identity-credentials-get *; microphone *; midi *; otp-credentials *; serial *;"
+	    )
     frame.setAttribute("allowfullscreen", "")
     document.querySelector("main").appendChild(frame)
 
@@ -7998,6 +7989,14 @@ const rerenderMenuSection = (container, html) => {
       })
     }
   }
+  const requestInitialWorkspaceDiskUsage = () => {
+    if (initialWorkspaceDiskUsageRequested) {
+      return
+    }
+    initialWorkspaceDiskUsageRequested = true
+    refresh_du()
+    refresh_du("logs")
+  }
 
   const try_dynamic = async (options = {}) => {
     let rendered
@@ -8032,7 +8031,8 @@ const rerenderMenuSection = (container, html) => {
     } else {
       rendered = false
     }
-    if (!rendered) {
+    if (rendered) {
+    } else {
       if (options.retryOnEmpty === false) {
         return
       }
@@ -8089,13 +8089,9 @@ const rerenderMenuSection = (container, html) => {
       renderSelection()
     }
   }
-  let init = document.querySelector("[data-init]")
-  if (init) {
-    init.click()
-  }
   <% if (type === 'browse') { %>
     setTimeout(() => {
-      try_dynamic({ retryOnEmpty: false })
+      try_dynamic()
     }, 0)
   <% } %>
   window.addEventListener('message', (event) => {
@@ -8155,6 +8151,8 @@ const rerenderMenuSection = (container, html) => {
             if (event.data.type === 'stream') {
               const frameName = resolveFrameName(null, event.source)
               updateTabTimestamp(frameName, Date.now())
+            } else if (event.data.type === 'idle') {
+              return
             } else if (event.data.type === 'restart') {
               <% if (type === 'run') { %>
               clearPersistedFrameLinkSelection()
@@ -8183,8 +8181,6 @@ const rerenderMenuSection = (container, html) => {
 
 
   });
-  refresh_du()
-  refresh_du("logs")
   renderSelection({ force: true })
   <% if (type === "browse" || type === "files") { %>
     const repoStatusCache = new Map()
@@ -12405,7 +12401,6 @@ document.addEventListener("DOMContentLoaded", () => {
     if (!normalized) {
       return false
     }
-    refreshTerminalSessions(normalized, workspaceCwd)
     pickerRequestId += 1
     currentUrl = normalized
     setLocation(normalized)

package/server/views/d.ejs

@@ -524,51 +524,7 @@ body.dark #update-spec {
 
   <div class='menu-grid <%= primaryColumnCount === 3 ? "menu-grid--triptych" : "" %>'>
     <% if (userTerminal && userTerminal.menu && userTerminal.menu.length) { %>
-      <div class='menu-container menu-column user-terminal'>
-        <div class='tab-header'>
-          <h3><i class='<%= userTerminal.icon %>'></i> <%= userTerminal.title %></h3>
-        </div>
-        <% if (userTerminal.subtitle || userTerminal.subtitle_link_href) { %>
-          <div class='column-subtitle'>
-            <% if (userTerminal.subtitle) { %>
-              <span><%= userTerminal.subtitle %></span><% if (userTerminal.subtitle_link_href && userTerminal.subtitle_link_label) { %> <% } %>
-            <% } %>
-            <% if (userTerminal.subtitle_link_href && userTerminal.subtitle_link_label) { %>
-              <a class='column-subtitle-link' href="<%= userTerminal.subtitle_link_href %>" target="_parent"><%= userTerminal.subtitle_link_label %></a>
-            <% } %>
-          </div>
-        <% } %>
-        <div class='tab-content'>
-          <% userTerminal.menu.forEach((i) => { %>
-            <div class='tab' role="button" tabindex="0" data-index="<%= index++ %>" data-target="@<%= i.href %>" data-href="<%= i.href %>">
-              <% if (i.image) { %>
-                <img src="<%= i.image %>">
-              <% } else if (i.icon) { %>
-                <i class="img <%= i.icon %>"></i>
-              <% } %>
-              <div class='tab-copy'>
-                <h2 class='tab-title'><%= i.title %></h2>
-                <% if (i.subtitle) { %>
-                  <div class='tab-subtitle subtitle'><%= i.subtitle %></div>
-                <% } %>
-              </div>
-              <div class='tab-actions'>
-                <% if (i.link) { %>
-                  <button class="tab-action-link" type="button" data-doc-link="true" data-href="<%= i.link %>" title="Open docs" data-tippy-content="Open docs" aria-label="Open docs">
-                    <i class="fa-solid fa-circle-info"></i>
-                  </button>
-                <% } %>
-                <button class="ai-perm-link" type="button" data-ai-consent="<%= i.href %>" title="AI permissions" data-tippy-content="AI permissions" aria-label="AI permissions">
-                  <i class="fa-solid fa-shield-halved"></i>
-                </button>
-                <div class='disclosure-indicator' aria-hidden="true">
-                  <i class="fa-solid fa-chevron-right"></i>
-                </div>
-              </div>
-            </div>
-          <% }) %>
-        </div>
-      </div>
+      <%- include('./partials/d_terminal_column', { userTerminal, terminals_url }) %>
     <% } %>
 
     <% if (cliMenu && cliMenu.menu && cliMenu.menu.length) { %>
@@ -797,12 +753,16 @@ document.querySelector("#update-spec").addEventListener("click", (e) => {
 })
 */
 let list = []
-document.querySelectorAll(".tab").forEach((el, index) => {
-  list.push({
-    index: parseInt(el.getAttribute("data-index")),
-    text: el.textContent,
+const rebuildTabList = () => {
+  list = []
+  document.querySelectorAll(".tab").forEach((el, index) => {
+    el.setAttribute("data-index", String(index))
+    list.push({
+      index,
+      text: el.textContent,
+    })
   })
-})
+}
 const search = (items, value) => {
   let filtered = []
   for(let i=0; i<items.length; i++) {
@@ -848,6 +808,7 @@ const renderSearch = () => {
     }
   }
 }
+rebuildTabList()
 renderSearch()
 const workspaceCwd = (() => {
   const node = document.querySelector(".file-open")
@@ -973,6 +934,34 @@ document.querySelector("form input[type=search]").addEventListener("input", (e)
   renderSearch()
 })
 document.querySelector("form input[type=search]").focus()
+const hydrateTerminalColumn = async () => {
+  const terminalColumn = document.querySelector("[data-dev-terminals-column][data-terminals-url]")
+  if (!terminalColumn) {
+    return
+  }
+  const url = terminalColumn.getAttribute("data-terminals-url")
+  if (!url) {
+    return
+  }
+  try {
+    const html = await fetch(url).then((res) => res.text())
+    if (!html || html.trim().length === 0) {
+      return
+    }
+    const wrapper = document.createElement("div")
+    wrapper.innerHTML = html
+    const nextColumn = wrapper.firstElementChild
+    if (!nextColumn) {
+      return
+    }
+    terminalColumn.replaceWith(nextColumn)
+    rebuildTabList()
+    renderSearch()
+  } catch (_) {}
+}
+setTimeout(() => {
+  hydrateTerminalColumn()
+}, 0)
 document.addEventListener("click", (e) => {
   const permTarget = e.target.closest('[data-ai-consent]')
   if (permTarget) {

package/server/views/partials/d_terminal_column.ejs

@@ -0,0 +1,46 @@
+<div class='menu-container menu-column user-terminal' data-dev-terminals-column="true"<% if (terminals_url) { %> data-terminals-url="<%= terminals_url %>"<% } %>>
+  <div class='tab-header'>
+    <h3><i class='<%= userTerminal.icon %>'></i> <%= userTerminal.title %></h3>
+  </div>
+  <% if (userTerminal.subtitle || userTerminal.subtitle_link_href) { %>
+    <div class='column-subtitle'>
+      <% if (userTerminal.subtitle) { %>
+        <span><%= userTerminal.subtitle %></span><% if (userTerminal.subtitle_link_href && userTerminal.subtitle_link_label) { %> <% } %>
+      <% } %>
+      <% if (userTerminal.subtitle_link_href && userTerminal.subtitle_link_label) { %>
+        <a class='column-subtitle-link' href="<%= userTerminal.subtitle_link_href %>" target="_parent"><%= userTerminal.subtitle_link_label %></a>
+      <% } %>
+    </div>
+  <% } %>
+  <div class='tab-content'>
+    <% let localIndex = 0 %>
+    <% userTerminal.menu.forEach((i) => { %>
+      <div class='tab' role="button" tabindex="0" data-index="<%= localIndex++ %>" data-target="@<%= i.href %>" data-href="<%= i.href %>">
+        <% if (i.image) { %>
+          <img src="<%= i.image %>">
+        <% } else if (i.icon) { %>
+          <i class="img <%= i.icon %>"></i>
+        <% } %>
+        <div class='tab-copy'>
+          <h2 class='tab-title'><%= i.title %></h2>
+          <% if (i.subtitle) { %>
+            <div class='tab-subtitle subtitle'><%= i.subtitle %></div>
+          <% } %>
+        </div>
+        <div class='tab-actions'>
+          <% if (i.link) { %>
+            <button class="tab-action-link" type="button" data-doc-link="true" data-href="<%= i.link %>" title="Open docs" data-tippy-content="Open docs" aria-label="Open docs">
+              <i class="fa-solid fa-circle-info"></i>
+            </button>
+          <% } %>
+          <button class="ai-perm-link" type="button" data-ai-consent="<%= i.href %>" title="AI permissions" data-tippy-content="AI permissions" aria-label="AI permissions">
+            <i class="fa-solid fa-shield-halved"></i>
+          </button>
+          <div class='disclosure-indicator' aria-hidden="true">
+            <i class="fa-solid fa-chevron-right"></i>
+          </div>
+        </div>
+      </div>
+    <% }) %>
+  </div>
+</div>

package/server/views/terminal.ejs

@@ -552,6 +552,67 @@ const createRunControls = () => {
   }
   return { set }
 }
+const PLUGIN_TERMINAL_IDLE_WINDOW_MS = 1200
+const createPluginTerminalDiscoveryRefresher = (context = {}) => {
+  const enabled = (() => {
+    try {
+      return window.location.pathname.startsWith("/run/plugin/")
+    } catch (_) {
+      return false
+    }
+  })()
+  let idleTimer = null
+  let armed = false
+  let sawStream = false
+  const clearIdleTimer = () => {
+    if (idleTimer) {
+      clearTimeout(idleTimer)
+      idleTimer = null
+    }
+  }
+  const refresh = () => {
+    if (!enabled || !armed || !sawStream) {
+      return
+    }
+    armed = false
+    sawStream = false
+    try {
+      const discovery = window.PinokioTerminalsDiscovery
+      if (!discovery || typeof discovery.refreshTerminalSessions !== "function") {
+        return
+      }
+      discovery.refreshTerminalSessions(window.location.href, context.cwd || "", {
+        retryDelays: []
+      })
+    } catch (_) {}
+  }
+  return {
+    arm(meaningful) {
+      if (!enabled || !meaningful) {
+        return
+      }
+      armed = true
+      sawStream = false
+      clearIdleTimer()
+    },
+    markActivity() {
+      if (!enabled || !armed) {
+        return
+      }
+      sawStream = true
+      clearIdleTimer()
+      idleTimer = setTimeout(() => {
+        idleTimer = null
+        refresh()
+      }, PLUGIN_TERMINAL_IDLE_WINDOW_MS)
+    },
+    clear() {
+      armed = false
+      sawStream = false
+      clearIdleTimer()
+    }
+  }
+}
 const createAiConsentManager = (context = {}) => {
   const storage = getSafeLocalStorage()
   const storageSupported = !!storage
@@ -848,6 +909,9 @@ document.addEventListener("DOMContentLoaded", async () => {
     uri: scriptUri || ("~" + location.pathname)
   })
   const runControls = createRunControls()
+  const pluginTerminalDiscoveryRefresher = createPluginTerminalDiscoveryRefresher({
+    cwd: scriptCwd
+  })
   consentManager.showChipIfRemembered()
   class RPC {
     constructor() {
@@ -923,16 +987,17 @@ document.addEventListener("DOMContentLoaded", async () => {
       }
     }
     notifyLineSubmitted(line, meta = {}) {
-      if (this.inputTracker) {
-        this.inputTracker.submit(line, meta)
-        return
-      }
       const safeLine = sanitizePreviewLine(line || "")
       const preview = safeLine.trim()
       const limit = 200
       const truncated = preview.length > limit ? preview.slice(0, limit) + "..." : preview
       const hadLineBreak = Boolean(meta && meta.hadLineBreak)
       const meaningful = truncated.length > 0 || hadLineBreak
+      pluginTerminalDiscoveryRefresher.arm(meaningful)
+      if (this.inputTracker) {
+        this.inputTracker.submit(line, meta)
+        return
+      }
       postMessageToAncestors({
         type: "terminal-input",
         frame: window.name || null,
@@ -1096,6 +1161,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             }
           } else if (packet.type === "stream") {
             refreshParent(packet)
+            pluginTerminalDiscoveryRefresher.markActivity()
             // set the current shell id
             const previousShellId = shell_id
             if (packet.data.id) {
@@ -1128,6 +1194,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             runControls.set("running")
           } else if (packet.type === 'disconnect') {
             refreshParent(packet)
+            pluginTerminalDiscoveryRefresher.clear()
             reloadMemory()
             this.term.write("\r\nDisconnected...\r\n")
             document.querySelector("#status-window").innerHTML = "<b>Ready</b>"
@@ -1423,6 +1490,7 @@ document.addEventListener("DOMContentLoaded", async () => {
               n.Noty(payload)
             }
           } else if (packet.type === "restart") {
+            pluginTerminalDiscoveryRefresher.clear()
             try {
               if (window.parent && window.parent !== window && typeof window.parent.postMessage === "function") {
                 window.parent.postMessage(packet, "*")
@@ -1469,6 +1537,7 @@ document.addEventListener("DOMContentLoaded", async () => {
               text: `${packet.data}`,
             })
           } else if (packet.type === "error") {
+            pluginTerminalDiscoveryRefresher.clear()
             runControls.set("idle")
 
 
@@ -1547,6 +1616,7 @@ document.addEventListener("DOMContentLoaded", async () => {
                   type: 'success'
                 })
                 */
+                pluginTerminalDiscoveryRefresher.clear()
                 runControls.set("idle")
               }, 0)
               //this.socket.close()
@@ -1575,6 +1645,7 @@ document.addEventListener("DOMContentLoaded", async () => {
       this.mode = (mode ? mode : "run")
       const allowed = aiConsentRequired ? await consentManager.ensureAllowed() : true
       if (!allowed) {
+        pluginTerminalDiscoveryRefresher.clear()
         runControls.set("idle")
         n.Noty({
           text: "Run canceled; AI agents remain blocked for this folder.",
@@ -1601,6 +1672,7 @@ document.addEventListener("DOMContentLoaded", async () => {
         await this.start(mode)
         return true
       } catch (error) {
+        pluginTerminalDiscoveryRefresher.clear()
         runControls.set("idle")
         const message = error && error.message ? error.message : "Failed to start"
         n.Noty({