pinokiod 7.1.13 → 7.1.15

package/kernel/index.js

@@ -906,6 +906,11 @@ class Kernel {
 ///    })
 ///  }
   async init(options) {
+    // Re-arm startup readiness on every init cycle so restart waits for the
+    // newly rebuilt template/sysinfo state instead of a stale resolved promise.
+    this.sysReady = new Promise((resolve) => {
+      this._resolveSysReady = resolve
+    })
 
     let home = this.store.get("home") || process.env.PINOKIO_HOME
     this.homedir = home

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "7.1.13",
+  "version": "7.1.15",
   "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
@@ -4845,6 +4848,107 @@ class Server {
     }
     return terminal
   }
+  async resolveDevTerminalShell(shellKey) {
+    if (this.kernel.platform === "win32") {
+      if (shellKey === "cmd") {
+        return {
+          key: "cmd",
+          title: "Cmd",
+          icon: "fa-brands fa-windows",
+          groupIndex: 0,
+          shellPath: null,
+        }
+      }
+      if (shellKey === "bash") {
+        const windowsBashPath = await this.resolveWindowsBashPath()
+        if (typeof windowsBashPath === "string" && windowsBashPath.length > 0) {
+          return {
+            key: "bash",
+            title: "Bash",
+            icon: "fa-solid fa-terminal",
+            groupIndex: 1,
+            shellPath: windowsBashPath,
+          }
+        }
+      }
+      return null
+    }
+    if (shellKey === "bash") {
+      return {
+        key: "bash",
+        title: "Bash",
+        icon: "fa-solid fa-terminal",
+        groupIndex: 0,
+        shellPath: null,
+      }
+    }
+    return null
+  }
+  async devTerminals(filepath, refPath) {
+    const shellKeys = this.kernel.platform === "win32" ? ["cmd", "bash"] : ["bash"]
+    const menu = []
+    for (const shellKey of shellKeys) {
+      const shell = await this.resolveDevTerminalShell(shellKey)
+      if (!shell) {
+        continue
+      }
+      menu.push({
+        icon: shell.icon,
+        title: shell.title,
+        subtitle: "Open shell options",
+        shell_key: shell.key,
+        options_url: `/pinokio/d-terminal-options/${refPath}?shell=${encodeURIComponent(shell.key)}`,
+      })
+    }
+    return {
+      icon: "fa-solid fa-terminal",
+      title: "Terminals",
+      subtitle: "Choose a shell, then open it with or without Python activated.",
+      skip_sort: true,
+      menu,
+    }
+  }
+  async devTerminalOptions(filepath, shellKey) {
+    const shell = await this.resolveDevTerminalShell(shellKey)
+    if (!shell) {
+      return []
+    }
+    const shellOptions = [
+      this.renderShell(filepath, shell.groupIndex, 0, {
+        icon: shell.icon,
+        title: "Shell",
+        subtitle: `Open a plain ${shell.title} shell`,
+        text: "Shell",
+        type: "Start",
+        shell: {
+          ...(shell.shellPath ? { shell: shell.shellPath } : {}),
+          input: true,
+        }
+      })
+    ]
+    const venvs = await Util.find_venv(filepath)
+    for (let i = 0; i < venvs.length; i++) {
+      const venv = venvs[i]
+      const parsed = path.parse(venv)
+      let relativeVenv = path.relative(filepath, venv)
+      if (!relativeVenv || relativeVenv.startsWith("..")) {
+        relativeVenv = parsed.base || path.basename(venv)
+      }
+      shellOptions.push(this.renderShell(filepath, shell.groupIndex, i + 1, {
+        icon: "fa-brands fa-python",
+        title: "Python Shell",
+        subtitle: `Activates ${relativeVenv}`,
+        text: `Python Shell: ${relativeVenv}`,
+        type: "Start",
+        shell: {
+          ...(shell.shellPath ? { shell: shell.shellPath } : {}),
+          venv,
+          input: true,
+        }
+      }))
+    }
+    return shellOptions
+  }
   async getPluginGlobal(req, config, terminal, filepath) {
 //    if (!this.kernel.plugin.config) {
 //      await this.kernel.plugin.init()
@@ -10766,8 +10870,8 @@ class Server {
     }))
     this.app.get("/d/*", ex(async (req, res) => {
       let filepath = Util.u2p(req.params[0])
-      let terminal = await this.terminals(filepath)
-      let plugin = await this.getPluginGlobal(req, this.kernel.plugin.config, terminal, filepath)
+      let terminal = await this.devTerminals(filepath, req.params[0])
+      let plugin = await this.getPluginGlobal(req, this.kernel.plugin.config, { menu: [] }, filepath)
       let html = ""
       let plugin_menu
       try {
@@ -10779,7 +10883,7 @@ class Server {
       let current_urls = await this.current_urls(req.originalUrl.slice(1))
       let retry = false
       // if plugin_menu is empty, try again in 1 sec
-      if (plugin_menu.length === 0) {
+      if (plugin_menu.length === 0 && (!terminal.menu || terminal.menu.length === 0)) {
         retry = true
       }
 
@@ -10867,7 +10971,6 @@ class Server {
 //      let online_terminal = await this.getPluginGlobal(req, terminal, filepath)
 //      console.log("online_terminal", online_terminal)
       terminal.menus = href_menus
-      sortNestedMenus(terminal.menu)
       sortNestedMenus(terminal.menus)
         let dynamic = [
         terminal,
@@ -10889,7 +10992,7 @@ class Server {
         },
       ]
       for (const item of dynamic) {
-        if (item && Array.isArray(item.menu)) {
+        if (item && Array.isArray(item.menu) && !item.skip_sort) {
           sortNestedMenus(item.menu)
         }
       }
@@ -11051,6 +11154,23 @@ class Server {
         res.send("")
       }
     }))
+    this.app.get("/pinokio/d-terminal-options/*", ex(async (req, res) => {
+      let filepath = Util.u2p(req.params[0])
+      const shellKey = typeof req.query.shell === "string" ? req.query.shell.trim().toLowerCase() : ""
+      let options = await this.devTerminalOptions(filepath, shellKey)
+      const html = await new Promise((resolve, reject) => {
+        ejs.renderFile(path.resolve(__dirname, "views/partials/d_terminal_options.ejs"), {
+          options,
+        }, (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/public/install.js

@@ -5,42 +5,56 @@ const installname = async (url, name, options) => {
     if (!defaultName.endsWith(".git")) {
       defaultName = defaultName + ".git"
     }
-  //  defaultName = defaultName.split(".")[0]
+    const normalizedPath = options && options.path ? normalizeInstallPath(options.path) : null
+    const relativePath = normalizedPath || DEFAULT_INSTALL_RELATIVE_PATH
+    const inputValue = name || defaultName
     let result = await Swal.fire({
       title: 'Save as',
-      html: '<input id="swal-input1" class="swal2-input" placeholder="Name">',
+      html: `<p class="pinokio-download-note">Saved in <code>~/${relativePath}</code></p>`,
+      input: 'text',
+      inputLabel: 'Folder name',
+      inputValue,
+      inputPlaceholder: defaultName,
+      inputAttributes: {
+        autocapitalize: 'off',
+        autocorrect: 'off',
+        autocomplete: 'off',
+        spellcheck: 'false'
+      },
       focusConfirm: false,
       focusCancel: false,
       showCancelButton: true,
       showCloseButton: true,
       cancelButtonText: 'Cancel',
       confirmButtonText: 'Download',
+      buttonsStyling: false,
+      backdrop: 'rgba(9, 11, 15, 0.65)',
+      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: {
-        popup: 'pinokio-download-modal'
+        popup: 'pinokio-download-modal',
+        htmlContainer: 'pinokio-download-html',
+        inputLabel: 'pinokio-download-label',
+        input: 'pinokio-download-input',
+        validationMessage: 'pinokio-download-validation',
+        actions: 'pinokio-download-actions',
+        loader: 'pinokio-download-loader',
+        closeButton: 'pinokio-download-close',
+        confirmButton: 'pinokio-download-confirm',
+        cancelButton: 'pinokio-download-cancel'
       },
       didOpen: () => {
-        let input = Swal.getPopup().querySelector('#swal-input1')
-        if (name) {
-          input.value = name
-        } else {
-          input.value = defaultName;
-        }
-        input.addEventListener("keypress", (e) => {
-          if (e.key === "Enter") {
-            e.preventDefault()
-            e.stopPropagation()
-            Swal.clickConfirm()
-          }
-        })
-        setTimeout(() => {
+        const input = Swal.getInput()
+        if (input) {
           input.focus()
-        }, 0)
+          input.select()
+        }
       },
-      preConfirm: async () => {
-        const folderName = (Swal.getPopup().querySelector("#swal-input1").value || "").trim()
+      preConfirm: async (value) => {
+        const folderName = String(value || "").trim()
         const validationError = validateInstallFolderName(folderName)
         if (validationError) {
           Swal.showValidationMessage(validationError)

package/server/public/style.css

@@ -2248,23 +2248,221 @@ body.dark .swal2-title {
   background: rgba(0,0,0,0.8) !important;
   */
 }
-.pinokio-download-modal .swal2-actions {
-  justify-content: flex-start !important;
-  padding: 6px 15px 16px !important;
+.swal2-popup.pinokio-download-modal {
+  border-radius: 14px !important;
+  padding: 18px !important;
+  background: #ffffff !important;
+  color: #0f172a !important;
+  border: 1px solid rgba(148, 163, 184, 0.2) !important;
+  box-shadow: 0 24px 60px rgba(15, 23, 42, 0.18) !important;
+}
+body.dark .swal2-popup.pinokio-download-modal {
+  background: #0f172a !important;
+  color: #e2e8f0 !important;
+  border: 1px solid rgba(148, 163, 184, 0.24) !important;
+  box-shadow: 0 32px 90px rgba(2, 8, 23, 0.72) !important;
+}
+.swal2-popup.pinokio-download-modal .swal2-title {
+  margin: 0 40px 6px 0 !important;
+  padding: 0 !important;
+  text-align: left !important;
+  font-size: 20px !important;
+  font-weight: 700 !important;
+  line-height: 1.2 !important;
+  letter-spacing: -0.02em !important;
+  color: #0f172a !important;
 }
-.pinokio-download-modal .swal2-close {
-  position: absolute;
-  top: 12px;
-  right: 12px;
-  width: 34px;
-  height: 34px;
-  line-height: 34px;
+body.dark .swal2-popup.pinokio-download-modal .swal2-title {
+  color: #f8fafc !important;
+}
+.pinokio-download-html.swal2-html-container {
+  margin: 0 0 12px 0 !important;
+  padding: 0 !important;
+  text-align: left !important;
+  font-size: 13px !important;
+  line-height: 1.45 !important;
+  color: rgba(71, 85, 105, 0.84) !important;
+}
+body.dark .pinokio-download-html.swal2-html-container {
+  color: rgba(148, 163, 184, 0.88) !important;
+}
+.pinokio-download-note {
   margin: 0;
-  font-size: 28px;
-  color: rgba(0,0,0,0.55);
 }
-body.dark .pinokio-download-modal .swal2-close {
-  color: rgba(255,255,255,0.6);
+.pinokio-download-note code {
+  font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+  font-size: 12px;
+  padding: 2px 6px;
+  border-radius: 999px;
+  background: rgba(15, 23, 42, 0.06);
+  color: inherit;
+}
+body.dark .pinokio-download-note code {
+  background: rgba(148, 163, 184, 0.16);
+}
+.pinokio-download-label.swal2-input-label {
+  display: block !important;
+  width: 100% !important;
+  margin: 0 0 6px 0 !important;
+  text-align: left !important;
+  font-size: 12px !important;
+  font-weight: 600 !important;
+  line-height: 1.3 !important;
+  color: rgba(15, 23, 42, 0.78) !important;
+}
+body.dark .pinokio-download-label.swal2-input-label {
+  color: rgba(241, 245, 249, 0.84) !important;
+}
+.pinokio-download-input.swal2-input {
+  width: 100% !important;
+  margin: 0 !important;
+  height: 40px !important;
+  padding: 0 12px !important;
+  border-radius: 10px !important;
+  border: 1px solid rgba(148, 163, 184, 0.58) !important;
+  background: #ffffff !important;
+  color: #0f172a !important;
+  box-shadow: none !important;
+  font-size: 14px !important;
+  line-height: 1.2 !important;
+}
+.pinokio-download-input.swal2-input:focus {
+  border-color: rgba(59, 130, 246, 0.78) !important;
+  box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.16) !important;
+}
+body.dark .pinokio-download-input.swal2-input {
+  border-color: rgba(148, 163, 184, 0.45) !important;
+  background: rgba(15, 23, 42, 0.65) !important;
+  color: rgba(248, 250, 252, 0.96) !important;
+}
+.pinokio-download-actions.swal2-actions {
+  width: 100% !important;
+  justify-content: flex-end !important;
+  gap: 8px !important;
+  margin-top: 14px !important;
+  padding: 0 !important;
+}
+.pinokio-download-actions.swal2-actions.swal2-loading {
+  justify-content: flex-end !important;
+  gap: 8px !important;
+}
+.pinokio-download-confirm.swal2-confirm,
+.pinokio-download-cancel.swal2-cancel {
+  min-width: 92px !important;
+  height: 36px !important;
+  margin: 0 !important;
+  padding: 0 14px !important;
+  border-radius: 10px !important;
+  font-size: 13px !important;
+  font-weight: 650 !important;
+}
+.swal2-popup.pinokio-download-modal .pinokio-download-confirm.swal2-confirm {
+  border: none !important;
+  background: royalblue !important;
+  color: #ffffff !important;
+}
+.swal2-popup.pinokio-download-modal .pinokio-download-confirm.swal2-confirm:hover {
+  background: #315cd8 !important;
+}
+.swal2-popup.pinokio-download-modal .pinokio-download-cancel.swal2-cancel {
+  border: 1px solid rgba(148, 163, 184, 0.6) !important;
+  background: #ffffff !important;
+  color: #0f172a !important;
+}
+body.dark .swal2-popup.pinokio-download-modal .pinokio-download-cancel.swal2-cancel {
+  border-color: rgba(148, 163, 184, 0.52) !important;
+  background: rgba(15, 23, 42, 0.64) !important;
+  color: rgba(248, 250, 252, 0.96) !important;
+}
+.swal2-popup.pinokio-download-modal .pinokio-download-cancel.swal2-cancel:hover {
+  background: rgba(148, 163, 184, 0.12) !important;
+}
+body.dark .swal2-popup.pinokio-download-modal .pinokio-download-cancel.swal2-cancel:hover {
+  background: rgba(148, 163, 184, 0.18) !important;
+}
+.pinokio-download-close.swal2-close {
+  position: absolute !important;
+  top: 14px !important;
+  right: 14px !important;
+  width: 28px !important;
+  height: 28px !important;
+  line-height: 28px !important;
+  margin: 0 !important;
+  font-size: 20px !important;
+  color: rgba(71, 85, 105, 0.7) !important;
+  border-radius: 999px !important;
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  transition: background 0.2s ease, color 0.2s ease !important;
+}
+.pinokio-download-close.swal2-close:hover {
+  background: rgba(148, 163, 184, 0.14) !important;
+  color: #0f172a !important;
+}
+body.dark .pinokio-download-close.swal2-close {
+  color: rgba(226, 232, 240, 0.72) !important;
+}
+body.dark .pinokio-download-close.swal2-close:hover {
+  background: rgba(148, 163, 184, 0.16) !important;
+  color: #f8fafc !important;
+}
+.pinokio-download-validation.swal2-validation-message {
+  margin: 10px 0 0 0 !important;
+  padding: 10px 12px !important;
+  border-radius: 10px !important;
+  background: rgba(255, 66, 66, 0.1) !important;
+  border: 1px solid rgba(255, 66, 66, 0.18) !important;
+  border-left: 4px solid rgba(255, 66, 66, 0.5) !important;
+  color: rgba(15, 23, 42, 0.92) !important;
+  font-size: 13px !important;
+  line-height: 1.4 !important;
+  justify-content: flex-start !important;
+  align-items: flex-start !important;
+}
+.pinokio-download-validation.swal2-validation-message::before {
+  display: none !important;
+}
+body.dark .pinokio-download-validation.swal2-validation-message {
+  background: rgba(255, 66, 66, 0.16) !important;
+  border-color: rgba(255, 66, 66, 0.24) !important;
+  border-left-color: rgba(255, 66, 66, 0.68) !important;
+  color: rgba(248, 250, 252, 0.94) !important;
+}
+.pinokio-download-loader.swal2-loader {
+  align-items: center !important;
+  justify-content: center !important;
+  gap: 8px !important;
+  width: auto !important;
+  height: 36px !important;
+  margin: 0 !important;
+  padding: 0 14px !important;
+  animation: none !important;
+  border: none !important;
+  border-radius: 10px !important;
+  background: royalblue !important;
+  color: #ffffff !important;
+}
+.pinokio-download-actions.swal2-actions.swal2-loading .pinokio-download-loader.swal2-loader {
+  display: inline-flex !important;
+}
+.pinokio-download-loader-spinner {
+  width: 14px;
+  height: 14px;
+  border: 2px solid rgba(255, 255, 255, 0.34);
+  border-top-color: #ffffff;
+  border-radius: 50%;
+  animation: pinokio-download-spin 0.8s linear infinite;
+}
+.pinokio-download-loader-text {
+  font-size: 13px;
+  font-weight: 700;
+  line-height: 1;
+}
+@keyframes pinokio-download-spin {
+  to {
+    transform: rotate(360deg);
+  }
 }
 .swal2-validation-message {
   margin: 12px 15px 0;

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

@@ -292,6 +292,42 @@ body.dark .menu-column .tab-header {
 .menu-column .tab-content .tab {
   flex: 0 0 auto;
 }
+.terminal-shell-group {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+.terminal-shell-group.is-expanded > .terminal-shell-tab .disclosure-indicator {
+  transform: rotate(90deg);
+}
+.terminal-shell-tab.is-loading {
+  cursor: progress;
+}
+.terminal-shell-tab.is-loading .disclosure-indicator {
+  transform: none;
+}
+.terminal-shell-options {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  margin-left: 20px;
+  padding-left: 12px;
+  border-left: 1px solid rgba(0, 0, 0, 0.08);
+}
+body.dark .terminal-shell-options {
+  border-left-color: rgba(255, 255, 255, 0.12);
+}
+.terminal-option-tab {
+  padding-left: 12px;
+}
+.terminal-shell-status {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  font-size: 12px;
+  opacity: 0.72;
+  padding: 8px 10px 10px 12px;
+}
 @media (max-width: 920px) {
   .menu-grid.menu-grid--triptych {
     grid-template-columns: 1fr;
@@ -524,51 +560,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 }) %>
     <% } %>
 
     <% if (cliMenu && cliMenu.menu && cliMenu.menu.length) { %>
@@ -797,12 +789,17 @@ 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,
+      isTerminalOption: el.hasAttribute("data-terminal-option-tab"),
+    })
   })
-})
+}
 const search = (items, value) => {
   let filtered = []
   for(let i=0; i<items.length; i++) {
@@ -822,8 +819,9 @@ let filteredBtnsCount = 0
 
 const renderSearch = () => {
   let target = document.querySelector("form input[type=search]")
+  const searching = target.value.trim().length > 0
   let result
-  if (target.value.trim().length === 0) {
+  if (!searching) {
     result = list.map((i, index) => {
       return { item: i }
     })
@@ -835,12 +833,36 @@ const renderSearch = () => {
     el.classList.add("hidden")
     el.classList.remove("selected")
   }
+  document.querySelectorAll(".terminal-shell-group").forEach((group) => {
+    const panel = group.querySelector("[data-terminal-options-panel]")
+    if (!panel) {
+      return
+    }
+    if (searching) {
+      panel.classList.add("hidden")
+    } else {
+      panel.classList.toggle("hidden", !group.classList.contains("is-expanded"))
+    }
+  })
 
   filteredCount = result.length
   for(let i=0; i<result.length; i++) {
     let selector = result[i]
     let el = document.querySelector(".tab[data-index='" + selector.item.index + "']")
     el.classList.remove("hidden")
+    if (selector.item.isTerminalOption) {
+      const group = el.closest(".terminal-shell-group")
+      if (group) {
+        const shellTab = group.querySelector(".tab[data-terminal-group]")
+        if (shellTab) {
+          shellTab.classList.remove("hidden")
+        }
+        const panel = group.querySelector("[data-terminal-options-panel]")
+        if (panel) {
+          panel.classList.remove("hidden")
+        }
+      }
+    }
     if (i === selectedIndex) {
       el.classList.add("selected")
     } else {
@@ -848,6 +870,7 @@ const renderSearch = () => {
     }
   }
 }
+rebuildTabList()
 renderSearch()
 const workspaceCwd = (() => {
   const node = document.querySelector(".file-open")
@@ -915,6 +938,8 @@ const revokeConsentForHref = (href) => {
 }
 const START_ICON_HTML = '<i class="fa-solid fa-chevron-right"></i>'
 const STARTING_ICON_HTML = '<i class="fa-solid fa-circle-notch fa-spin"></i>'
+const TERMINAL_GROUP_ICON_HTML = '<i class="fa-solid fa-chevron-right"></i>'
+const TERMINAL_GROUP_LOADING_HTML = '<i class="fa-solid fa-circle-notch fa-spin"></i>'
 const setTabLaunchState = (tab, state) => {
   if (!tab) return
   const indicator = tab.querySelector('.disclosure-indicator')
@@ -927,6 +952,76 @@ const setTabLaunchState = (tab, state) => {
     tab.classList.remove('is-starting')
   }
 }
+const setTerminalGroupState = (tab, state) => {
+  if (!tab) {
+    return
+  }
+  const indicator = tab.querySelector('.disclosure-indicator')
+  if (indicator) {
+    indicator.innerHTML = state === 'loading' ? TERMINAL_GROUP_LOADING_HTML : TERMINAL_GROUP_ICON_HTML
+  }
+  if (state === 'loading') {
+    tab.classList.add('is-loading')
+  } else {
+    tab.classList.remove('is-loading')
+  }
+}
+const setTerminalGroupExpanded = (group, expanded) => {
+  if (!group) {
+    return
+  }
+  group.classList.toggle('is-expanded', expanded)
+  const panel = group.querySelector('[data-terminal-options-panel]')
+  if (panel) {
+    panel.classList.toggle('hidden', !expanded)
+  }
+}
+const toggleTerminalGroup = async (tab) => {
+  if (!tab) {
+    return
+  }
+  const group = tab.closest('.terminal-shell-group')
+  if (!group) {
+    return
+  }
+  const panel = group.querySelector('[data-terminal-options-panel]')
+  if (!panel) {
+    return
+  }
+  if (group.dataset.loaded === '1') {
+    setTerminalGroupExpanded(group, !group.classList.contains('is-expanded'))
+    rebuildTabList()
+    renderSearch()
+    return
+  }
+  if (group.dataset.loading === '1') {
+    return
+  }
+  const url = tab.dataset.optionsUrl
+  if (!url) {
+    return
+  }
+  group.dataset.loading = '1'
+  setTerminalGroupExpanded(group, true)
+  setTerminalGroupState(tab, 'loading')
+  panel.innerHTML = '<div class="terminal-shell-status"><i class="fa-solid fa-circle-notch fa-spin"></i><span>Loading shell options...</span></div>'
+  try {
+    const html = await fetch(url).then((res) => res.text())
+    if (!html || html.trim().length === 0) {
+      panel.innerHTML = '<div class="terminal-shell-status"><span>No shell options available.</span></div>'
+    } else {
+      panel.innerHTML = html
+      group.dataset.loaded = '1'
+    }
+  } catch (_) {
+    panel.innerHTML = '<div class="terminal-shell-status"><span>Unable to load shell options.</span></div>'
+  } finally {
+    delete group.dataset.loading
+    setTerminalGroupState(tab, 'idle')
+    rebuildTabList()
+    renderSearch()
+  }
+}
 const pendingLaunchTabs = new Map()
 const launchTab = (tab) => {
   if (!tab) {
@@ -997,6 +1092,14 @@ document.addEventListener("click", (e) => {
     return
   }
 
+  const groupTab = e.target.closest('.tab[data-terminal-group]')
+  if (groupTab) {
+    e.preventDefault()
+    e.stopPropagation()
+    toggleTerminalGroup(groupTab)
+    return
+  }
+
   const tab = e.target.closest('.tab[data-href]')
   if (!tab) {
     return
@@ -1018,6 +1121,14 @@ document.addEventListener('keydown', (e) => {
     return
   }
 
+  const groupTab = target.closest('.tab[data-terminal-group]')
+  if (groupTab && groupTab === target) {
+    e.preventDefault()
+    e.stopPropagation()
+    toggleTerminalGroup(groupTab)
+    return
+  }
+
   const tab = target.closest('.tab[data-href]')
   if (!tab || tab !== target) {
     return

package/server/views/partials/d_terminal_column.ejs

@@ -0,0 +1,40 @@
+<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='terminal-shell-group' data-terminal-shell-group="<%= i.shell_key %>">
+        <div class='tab terminal-shell-tab' role="button" tabindex="0" data-terminal-group="<%= i.shell_key %>" data-options-url="<%= i.options_url %>">
+          <% 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'>
+            <div class='disclosure-indicator' aria-hidden="true">
+              <i class="fa-solid fa-chevron-right"></i>
+            </div>
+          </div>
+        </div>
+        <div class='terminal-shell-options hidden' data-terminal-options-panel="<%= i.shell_key %>"></div>
+      </div>
+    <% }) %>
+  </div>
+</div>

package/server/views/partials/d_terminal_options.ejs

@@ -0,0 +1,28 @@
+<% options.forEach((i) => { %>
+  <div class='tab terminal-option-tab' role="button" tabindex="0" data-terminal-option-tab="true" 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>
+<% }) %>

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({