pinokiod 3.9.36 → 3.9.37

package/kernel/api/filepicker/index.js

@@ -6,7 +6,7 @@ const { spawn } = require("child_process");
   params: {
     title,             := <dialog title>
     type,              := folder | file (default)
-    cwd,               := <cwd to open from>
+    path,               := <cwd to open from>
     filetypes,         := <file types to accept> (example:   [["Images", "*.png *.jpg *.jpeg"]] )
     multiple,          := True | False (allow multiple)
     save,              := True | False ('save as' dialog, which lets the user select a file name)
@@ -30,6 +30,8 @@ class Filepicker {
   async open(req, ondata, kernel) {
     if (req.params.cwd) {
       req.params.cwd = path.resolve(req.cwd, req.params.cwd)
+    } else if (req.params.path) {
+      req.params.cwd = path.resolve(req.cwd, req.params.path)
     } else {
       req.params.cwd = req.cwd
     }

package/kernel/api/fs/index.js

@@ -75,13 +75,15 @@ class FS {
     /*
       params := {
         path: <filepath>,
-        command: "view(default)|open|<any command in PATH>"
+        action: "view(default)|open|<any command in PATH>"
       }
       open finder/file explorer at path
     */
     let dirPath = path.resolve(req.cwd, req.params.path)
     ondata({ raw: `\r\nopening path: ${dirPath}\r\n` })
-    if (req.params.command) {
+    if (req.params.action) {
+      Util.openfs(dirPath, req.params, kernel)
+    } else if (req.params.command) {
       Util.openfs(dirPath, req.params, kernel)
     } else if (req.params.mode) {
       Util.openfs(dirPath, req.params, kernel)

package/kernel/api/index.js

@@ -77,6 +77,9 @@ class Api {
     meta.web_path = `/api/${api_name}`
     meta.ui = `/pinokio/browser/${api_name}`
     meta.browse = `/pinokio/browser/${api_name}/browse`
+    if (!pinokio && !pinokio2 && !pinokio3 ) {
+      meta.init_required = true
+    }
     return meta
   }
   get_proxy_url(root, port) {
@@ -707,6 +710,7 @@ class Api {
         uri: request.uri,
         path: request.path,
         git: this.parentGitURI(request.path),
+        origin: request.origin,
         body: script 
       }
       // 7. resolve the rpc

package/kernel/api/web/index.js

@@ -22,7 +22,12 @@ class Web {
     console.log("kernel.exposed", kernel.exposed)
   }
   async open(req, ondata, kernel) {
-    ondata(req.params, "browser.open")
+    console.log("WEB.open", req)
+    //ondata(req.params, "browser.open")
+    let type = req.params.type || "web"
+    req.params.uri = kernel.url(req.parent.origin, req.params.uri, type)
+    console.log("params", req.params)
+    ondata(req.params, "web.open")
   }
   async close(req, ondata, kernel) {
     ondata(req.params, "browser.close")

package/kernel/environment.js

@@ -443,46 +443,48 @@ const get_raw = async (homedir) => {
 const requirements = async (script, filepath, kernel) => {
   let pre_items = []
   let requires_instantiation = false
-  if (script && script.pre) {
-    let env = await get2(filepath, kernel)
-    for(let item of script.pre) {
-      if (item.env) {
-        // if index is not set, use 0 as default (for key)
-        if (!item.index) {
-          item.index = 0
-        }
-        if (item.key) {
-          const hasProtocol = /^[a-zA-Z][a-zA-Z\d+\-.]*:\/\//.test(item.key);
-          const url = new URL(hasProtocol ? item.key : `https://${item.key}`);
-          item.host = url.host
-          item.val = await kernel.kv.get(item.host, item.index)
-        } else {
-          item.host = ""
+  if (script) {
+    let pre
+    if (script.pre) {
+      pre = script.pre
+    } else if (script.env) {
+      pre = script.env
+    }
+    if (pre) {
+      let env = await get2(filepath, kernel)
+      for(let item of pre) {
+        let env_key
+        if (item.env) {
+          env_key = item.env
+        } else if (item.key) {
+          env_key = item.key
+          item.env = item.key
         }
+        if (env_key) {
+          // if index is not set, use 0 as default (for key)
+          if (!item.index) {
+            item.index = 0
+          }
+          if (item.host) {
+            const hasProtocol = /^[a-zA-Z][a-zA-Z\d+\-.]*:\/\//.test(item.host);
+            const url = new URL(hasProtocol ? item.host : `https://${item.host}`);
+            item.host = url.host
+            item.val = await kernel.kv.get(item.host, item.index)
+          } else {
+            item.host = ""
+          }
+          console.log({ env, env_key })
 
-        if (env[item.env]) {
-          item.val = env[item.env]
-        } else {
-          if (item.default) {
-            if (typeof item.default === 'object') {
-              if (item.default.key) {
-                const hasProtocol = /^[a-zA-Z][a-zA-Z\d+\-.]*:\/\//.test(item.default.key);
-                const url = new URL(hasProtocol ? item.default.key : `https://${item.default.key}`);
-                item.host = url.host
-
-                let index = item.default.index || 0
-                item.index = index
-                item.val = await kernel.kv.get(item.host, index)
-              } else {
-                item.host = ""
-              }
-            } else {
+          if (env[env_key]) {
+            item.val = env[env_key]
+          } else {
+            if (item.default) {
               item.val = item.default
             }
+            requires_instantiation = true
           }
-          requires_instantiation = true
+          pre_items.push(item)
         }
-        pre_items.push(item)
       }
     }
   }

package/kernel/index.js

@@ -176,6 +176,33 @@ class Kernel {
     let id = this.api.filePath(uri, cwd)
     return this.api.running[id]
   }
+  url (origin, _path, _type) {
+    console.log("kernel.url", { origin, _path, _type })
+    /*
+    // get web url / asset / run URL
+    type := "web" (default) | "asset" | "run"
+    */
+    let relative = path.relative(this.homedir, _path)
+    let chunks = relative.split(path.sep)
+    let type = _type || "web"
+    let result
+    if (type === "web") {
+      if (chunks[0] === "api") {
+        result = "/pinokio/browser/" + chunks.slice(1).join("/")
+      }
+    } else if (type === "browse" || type === "dev") {
+      if (chunks[0] === "api") {
+        result = "/pinokio/browser/" + chunks.slice(1).join("/") + "/browse"
+      }
+//    } else if (type === "web") {
+//      result = "/" + chunks.join("/")
+    } else if (type === "asset") {
+      result = "/asset/" + chunks.join("/")
+    } else if (type === "run") {
+      result = "/run/" + chunks.join("/")
+    }
+    return origin + result
+  }
   start_port () {
     if (this.router.port_mapping && Object.keys(this.router.port_mapping).length > 0) {
       let max_caddy_port = Math.max(...Object.values(this.router.port_mapping))

package/kernel/prototype.js

@@ -29,6 +29,15 @@ class Proto {
       let config = await this.kernel.require(pinokiojs_path)
       this.config = config
 
+      this.config.menu.push({
+        icon: "fa-solid fa-rotate",
+        text: "Update",
+        shell: {
+          message: "git pull",
+          path: this.kernel.path("prototype/system")
+        }
+      })
+
 
 
 ////      let prototype_paths = (await glob('**/pinokio.js', { cwd }))

package/kernel/router/index.js

@@ -209,7 +209,7 @@ class Router {
     if (JSON.stringify(this.config) === JSON.stringify(this.old_config)) {
 //      console.log("config hasn't updated")
     } else {
-      console.log("caddy config has updated", this.config)
+//      console.log("caddy config has updated", this.config)
       try {
         let response = await axios.post('http://127.0.0.1:2019/load', this.config, {
           headers: { 'Content-Type': 'application/json' }

package/kernel/util.js

@@ -126,10 +126,12 @@ const openfs = (dirPath, options, kernel) => {
   let command = '';
   const platform = os.platform()
   console.log("openfs", dirPath, options)
-  if (options && options.command) {
+  if (options && (options.command || options.action)) {
     let mode = "view"
-    if (options && options.command) {
+    if (options.command) {
       mode = options.command
+    } else if (options.action) {
+      mode = options.action
     }
     console.log("> mode", mode)
     if (mode === "view") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.9.36",
+  "version": "3.9.37",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -38,7 +38,7 @@
     "http-terminator": "^3.2.0",
     "https": "^1.0.0",
     "isomorphic-git": "^1.23.0",
-    "jimini": "^0.0.7",
+    "jimini": "^0.0.8",
     "jsdom": "^24.0.0",
     "key-store": "^1.2.0",
     "kill-sync": "^1.0.3",

package/server/index.js

@@ -371,20 +371,8 @@ class Server {
 //    }
 
 
-
-    if (config && config.menu) {
-      if (typeof config.menu === "function") {
-        if (config.menu.constructor.name === "AsyncFunction") {
-          config.menu = await config.menu(this.kernel, this.kernel.info)
-        } else {
-          config.menu = config.menu(this.kernel, this.kernel.info)
-        }
-      }
-
-      let uri = this.kernel.path("api")
-      await this.renderMenu(uri, name, config, [])
-
-    } else {
+    if (config.init_required) {
+      // none of the pinokio.js, pinokio.json, pinokio_meta.json exists => need to initialize
       // if there is no menu, display all files
       let p = this.kernel.path("api", name)
       let files = await fs.promises.readdir(p, { withFileTypes: true })
@@ -406,7 +394,21 @@ class Server {
       }
       let uri = this.kernel.path("api")
       await this.renderMenu(uri, name, config, [])
+    } else {
+      let menu = config.menu || []
+      if (typeof config.menu === "function") {
+        if (config.menu.constructor.name === "AsyncFunction") {
+          config.menu = await config.menu(this.kernel, this.kernel.info)
+        } else {
+          config.menu = config.menu(this.kernel, this.kernel.info)
+        }
+      }
+
+      let uri = this.kernel.path("api")
+      await this.renderMenu(uri, name, config, [])
+
     }
+
     let platform = os.platform()
 
 //    if (config.icon) {
@@ -955,6 +957,7 @@ class Server {
             items: env_requirements.items
           })
         } else {
+          console.log("req.query.callback", req.query.callback)
 
           // check if it's a prototype script
           let kill_message
@@ -964,6 +967,8 @@ class Server {
 //            kill_message = "Done! Click to go to the project"
           }
 
+          console.log(">>>>>>>>>> Callback", callback)
+
           let logpath = encodeURIComponent(Util.log_path(filepath, this.kernel))
           const result = {
             portal: this.portal,
@@ -1569,6 +1574,7 @@ class Server {
         config.html = `${config.text}` 
       }
       config.btn = config.html
+      config.arrow = true
     }
     /*
     if (config.href && !config.href.startsWith("/")) {
@@ -1580,6 +1586,7 @@ class Server {
     if (keypath) {
       config.href = base.href + "/" + keypath.join("/") + "?path=" + base.cwd
     }
+    console.log({ config })
     return config
   }
 
@@ -3503,6 +3510,7 @@ class Server {
       }
     }))
     this.app.get("/prototype/run/*", ex(async (req, res) => {
+      console.log("/prototype/run", req.params[0])
       let pathComponents = req.params[0].split("/").concat("pinokio.js")
       let config = await this.kernel.api.meta({ path: req.query.path })
       let pinokiojson_path = path.resolve(req.query.path, "pinokio.json")
@@ -3528,6 +3536,8 @@ class Server {
       }
       req.base = this.kernel.path("prototype")
       req.query.callback = config.ui
+      console.log("config.ui", config.ui)
+      console.log("req.query", req.query)
       //req.query.callback = config.browse
       req.query.cwd = req.query.path
       await this.render(req, res, pathComponents, null)
@@ -3546,27 +3556,56 @@ class Server {
       for(let key of paths) {
         config = config.menu[key] 
       }
-      let run_path = "/run/prototype/system/" + config.href + "?cwd=" + req.query.path
-      console.log({ config, run_path, query: req.query })
-      let readme_path = this.kernel.path("prototype/system", config.readme)
-      console.log("config.readme.split", config.readme.split("/").slice(0, -1))
-      let md = await fs.promises.readFile(readme_path, "utf8")
-      console.log({ readme_path, md })
-      let baseUrl = "/asset/prototype/system/" + (config.readme.split("/").slice(0, -1).join("/")) + "/"
-      console.log("baseUrl", baseUrl)
-      let readme = marked.parse(md, {
-        baseUrl
-      })
+      console.log("config.shell", config.shell)
+      if (config.shell) {
+
+        let rendered = this.kernel.template.render(config.shell, {})
+        let params = new URLSearchParams()
+        if (rendered.path) params.set("path", encodeURIComponent(rendered.path))
+        if (rendered.message) params.set("message", encodeURIComponent(rendered.message))
+        if (rendered.venv) params.set("venv", encodeURIComponent(rendered.venv))
+        if (rendered.input) params.set("input", true)
+        if (rendered.callback) params.set("callback", encodeURIComponent(rendered.callback))
+        if (rendered.kill) params.set("kill", encodeURIComponent(rendered.kill))
+        if (rendered.done) params.set("done", encodeURIComponent(rendered.done))
+        if (rendered.env) {
+          for(let key in rendered.env) {
+            let env_key = "env." + key
+            params.set(env_key, rendered.env[key])
+          }
+        }
+        if (rendered.conda) {
+          for(let key in rendered.conda) {
+            let conda_key = "conda." + key
+            params.set(conda_key, rendered.conda[key])
+          }
+        }
+        let shell_id = Math.floor("SH_" + 1000000000000 * Math.random())
+        let href = "/shell/" + shell_id + "?" + params.toString()
+        res.redirect(href)
+      } else {
+        let run_path = "/run/prototype/system/" + config.href + "?cwd=" + req.query.path
+        console.log({ config, run_path, query: req.query })
+        let readme_path = this.kernel.path("prototype/system", config.readme)
+        console.log("config.readme.split", config.readme.split("/").slice(0, -1))
+        let md = await fs.promises.readFile(readme_path, "utf8")
+        console.log({ readme_path, md })
+        let baseUrl = "/asset/prototype/system/" + (config.readme.split("/").slice(0, -1).join("/")) + "/"
+        console.log("baseUrl", baseUrl)
+        let readme = marked.parse(md, {
+          baseUrl
+        })
+        res.render("prototype/show", {
+          run_path,
+          portal: this.portal,
+          readme,
+          logo: this.logo,
+          theme: this.theme,
+          agent: this.agent,
+          kernel: this.kernel,
+        })
+      }
 
-      res.render("prototype/show", {
-        run_path,
-        portal: this.portal,
-        readme,
-        logo: this.logo,
-        theme: this.theme,
-        agent: this.agent,
-        kernel: this.kernel,
-      })
     }))
     this.app.get("/prototype", ex(async (req, res) => {
       // load meta
@@ -3591,6 +3630,7 @@ class Server {
         href: "/prototype/show",
         path: "/asset/prototype/system"
       })
+      console.log("FINAL CONFIG", JSON.stringify(config, null, 2))
 
 //    {
 //      "icon": "fa-solid fa-power-off",
@@ -3695,6 +3735,7 @@ class Server {
       }
     }))
     this.app.post("/env", ex(async (req, res) => {
+      console.log("REQ.body", req.body)
       let fullpath = path.resolve(this.kernel.homedir, req.body.filepath, "ENVIRONMENT")
       let updated = req.body.vals
       let hosts = req.body.hosts
@@ -3734,8 +3775,9 @@ class Server {
     this.app.get("/env/*", ex(async (req, res) => {
 
       let env_path = req.params[0]
-      let p = path.resolve(this.kernel.homedir, env_path, "pinokio.js")
-      let config  = (await this.kernel.loader.load(p)).resolved
+//      let p = path.resolve(this.kernel.homedir, env_path, "pinokio.js")
+//      let config  = (await this.kernel.loader.load(p)).resolved
+      let config = await this.kernel.api.meta(env_path)
       if (config.run) {
         await this.init_env(env_path, { no_inherit: true })
       } else {

package/server/public/common.js

@@ -1,5 +1,36 @@
+const open_url2 = (href, target, features) => {
+  if (target) {
+    if (target === "_blank") {
+      // if target=_blank => open in new window
+      //  - if features=pinokio => open in pinokio
+      //  - otherwise => open in a regular browser
+      if (features && features.includes("pinokio")) {
+        window.open(el.href, "_blank", features)
+      } else {
+        fetch("/go", {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify({ url: el.href })
+        }).then((res) => {
+          return res.json()
+        }).then((res) => {
+          console.log(res)
+        })
+      }
+    } else {
+      // no target => just move from the same window
+      window.open(href, target, features)
+    }
+  } else {
+    // no target => just use window.open => move in the current window
+    window.open(href, "_self", features)
+  }
+}
 hotkeys("ctrl+t,cmd+t,ctrl+n,cmd+n", (e) => {
-  window.open("/", "_blank", "self")
+  open_url2(location.href, "_blank")
+//  window.open("/", "_blank", "self")
 })
 const refreshParent = (e) => {
   if (window.parent === window.top) {

package/server/public/modalinput.js

@@ -46,7 +46,7 @@ const ModalInput = async (params, uri) => {
         </div>
       </div>`
       } else if (type === 'file') {
-        input = `<div class='dropzone' data-type='file' data-id='${field.key}'></div>`
+        input = `<div data-accept='${field.accept}' class='dropzone' data-type='file' data-id='${field.key}'></div>`
         //input = `<input type='file' data-id="${field.key}" />`
       } else {
         input = `<input ${autofocus} type='${type}' data-id="${field.key}" class="swal2-input" placeholder="${field.placeholder ? field.placeholder : ''}">`
@@ -73,6 +73,7 @@ const ModalInput = async (params, uri) => {
       Swal.getPopup().querySelectorAll('[data-type=file]').forEach((el, index) => {
         const dz = new Dropzone(el, {
           url: '/no-op', // dummy, not used
+          acceptedFiles: el.getAttribute("data-accept") || null,
           autoProcessQueue: false,
           uploadMultiple: false,
           maxFiles: 1,

package/server/public/nav.js

@@ -14,7 +14,18 @@ document.addEventListener("DOMContentLoaded", () => {
   //}
   if (document.querySelector("#new-window")) {
     document.querySelector("#new-window").addEventListener("click", (e) => {
-      window.open("/", "_blank", "self")
+      //window.open("/", "_blank", "self")
+      fetch("/go", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ url: location.href })
+      }).then((res) => {
+        return res.json()
+      }).then((res) => {
+        console.log(res)
+      })
     })
   }
 })

package/server/public/opener.js

@@ -1,3 +1,34 @@
+const open_url = (href, target, features) => {
+  debugger
+  if (target) {
+    if (target === "_blank") {
+      // if target=_blank => open in new window
+      //  - if features=pinokio => open in pinokio
+      //  - otherwise => open in a regular browser
+      if (features && features.includes("pinokio")) {
+        window.open(el.href, "_blank", features)
+      } else {
+        fetch("/go", {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify({ url: el.href })
+        }).then((res) => {
+          return res.json()
+        }).then((res) => {
+          console.log(res)
+        })
+      }
+    } else {
+      // no target => just move from the same window
+      window.open(href, target, features)
+    }
+  } else {
+    // no target => just use window.open => move in the current window
+    window.open(href, "_self", features)
+  }
+}
 document.addEventListener("click", async (e) => {
   // [data-filepath] should open in file explorer
   let el = e.target.closest("[data-filepath]")
@@ -69,22 +100,22 @@ document.addEventListener("click", async (e) => {
     e.preventDefault()
     e.stopPropagation()
     let features = el.getAttribute("features")
-    if (features.includes("browser")) {
-      debugger
-      fetch("/go", {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({ url: el.href })
-      }).then((res) => {
-        return res.json()
-      }).then((res) => {
-        console.log(res)
-      })
-    } else {
-      window.open(el.href, "_blank", features)
-    }
+    open_url(el.href, "_blank", features)
+//    if (features && features.includes("app")) {
+//      window.open(el.href, "_blank", features)
+//    } else {
+//      fetch("/go", {
+//        method: "POST",
+//        headers: {
+//          "Content-Type": "application/json"
+//        },
+//        body: JSON.stringify({ url: el.href })
+//      }).then((res) => {
+//        return res.json()
+//      }).then((res) => {
+//        console.log(res)
+//      })
+//    }
     return
   }
 

package/server/public/style.css

@@ -114,11 +114,16 @@ body.dark *::-webkit-scrollbar-thumb {
   max-height: 0;
 }
 .dynamic.selected {
+/*
   background: rgba(0,0,0,0.05);
+  */
+  border-left: 10px solid rgb(130, 188, 9);
 }
+/*
 body.dark .dynamic.selected {
   background: rgba(0,150,250,0.05);
 }
+*/
 .dynamic-item img {
   width: 20px !important;
   height: 20px !important;
@@ -1164,7 +1169,7 @@ body.dark .line:hover {
   /*
   padding: 15px 15px;
   */
-  padding: 7px;
+  padding: 7px 5px;
   border-bottom: 1px solid var(--light-thin);
 }
 .thick.line {
@@ -1862,22 +1867,27 @@ body.dark .not-running-apps, body.dark .running-apps {
   color: #82bc09;
 }
 */
-.running-apps .line img {
+.running-apps .line {
   border-left: 10px solid #82bc09;
-  padding-left: 10px;
+}
+.running-apps .line img {
+  padding-left: 3px;
   /*
+  padding-left: 10px;
   border: 3px solid #8fd400;
   */
   /*
   border-radius: 5px;
   */
 }
-body.dark .not-running-apps .line img {
+body.dark .not-running-apps .line {
   border-left: 10px solid rgba(255,255,255,0.1);
 }
-.not-running-apps .line img {
+.not-running-apps .line {
   border-left: 10px solid rgba(0,0,0,0.04);
-  padding-left: 10px;
+}
+.not-running-apps .line img {
+  padding-left: 3px;
 }
 /*
 .running-apps .line.align-top h3 .col .title {

package/server/socket.js

@@ -12,13 +12,18 @@ class Socket {
     this.subscriptions = new Map(); // Initialize a Map to store the WebSocket connections interested in each event
     this.parent.kernel.api.listen("server.socket", this.trigger.bind(this))
     wss.on('connection', (ws, request) => {
+      ws._headers = request.headers;
+      ws._ip = request.socket.remoteAddress;
+      ws._boundUrl = (request.headers['x-forwarded-proto'] || 'ws') + '://' +
+                    (request.headers['x-forwarded-host'] || request.headers.host) +
+                    request.url;
+      ws._origin = request.headers.origin;
       ws.on('close', () => {
         this.subscriptions.forEach((set, eventName) => {
           set.delete(ws);
         });
       });
       ws.on('message', async (message, isBinary) => {
-
         let req
         if (isBinary) {
           const buffer = Buffer.from(message);
@@ -46,6 +51,7 @@ class Socket {
         } else {
           req = JSON.parse(message)
         }
+        req.origin = ws._origin
         if (req.response) {
           this.parent.kernel.api.respond(req)
         } else {

package/server/views/app.ejs

@@ -752,11 +752,6 @@ body.dark .appcanvas {
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>
   <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
-  <% if (agent === "electron") { %>
-    <a href="/" target="_blank" class='btn2' features="browser"><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } else { %>
-    <a href="/" target="_blank" class='btn2'><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } %>
   <button id='new-window' title='open a new window' class='btn2'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
 </div>
 </h1>
@@ -1702,13 +1697,20 @@ body.dark .appcanvas {
           e.stopPropagation()
           <% if (type === 'run') { %>
             // run mode => switch to dev mode
+            location.hash = ""
             location.pathname = location.pathname + "/browse"
           <% } else { %>
             // dev mode => already dev. reveal the hidden menu
-            target.closest(".dynamic").classList.toggle("selected")
-            target.closest(".nested-menu").querySelector(".submenu").classList.toggle("hidden")
-            target.querySelector(".loader .fa-angle-down").classList.toggle("hidden")
-            target.querySelector(".loader .fa-angle-up").classList.toggle("hidden")
+            if (target.closest(".dynamic")) {
+              target.closest(".dynamic").classList.toggle("selected")
+              target.closest(".nested-menu").querySelector(".submenu").classList.toggle("hidden")
+              target.querySelector(".loader .fa-angle-down").classList.toggle("hidden")
+              target.querySelector(".loader .fa-angle-up").classList.toggle("hidden")
+            } else {
+              target.closest(".nested-menu").querySelector(".submenu").classList.toggle("hidden")
+              target.querySelector(".loader .fa-angle-down").classList.toggle("hidden")
+              target.querySelector(".loader .fa-angle-up").classList.toggle("hidden")
+            }
           <% } %>
           return
         } else {
@@ -1793,7 +1795,9 @@ body.dark .appcanvas {
       return res.text()
     })
     console.log({ dynamic })
-    document.querySelector(".dynamic").innerHTML = dynamic
+    if (document.querySelector(".dynamic")) {
+      document.querySelector(".dynamic").innerHTML = dynamic
+    }
 
     location.hash = ""
 
@@ -1826,6 +1830,12 @@ body.dark .appcanvas {
   if (init) {
     init.click()
   }
+  /*
+  window.addEventListener("hashchange", function () {
+    console.log("Hash changed:", location.hash);
+    location.reload()
+  });
+  */
   window.addEventListener('message', (event) => {
 
     // only process the event it's coming from pinokio
@@ -1898,7 +1908,9 @@ body.dark .appcanvas {
   });
   refresh_du()
   <% if (type !== 'run') { %>
-    document.querySelector(".dynamic .reveal").click()
+    if (document.querySelector(".dynamic .reveal")) {
+      document.querySelector(".dynamic .reveal").click()
+    }
   <% } %>
   /*
   document.addEventListener("keydown", (e) => {

package/server/views/connect.ejs

@@ -239,11 +239,6 @@ body.dark .config {
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>
   <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
-  <% if (agent === "electron") { %>
-    <a href="/" target="_blank" class='btn2' features="browser"><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } else { %>
-    <a href="/" target="_blank" class='btn2'><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } %>
   <button id='new-window' title='open a new window' class='btn2'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
 </div>
 </h1>

package/server/views/download.ejs

@@ -126,11 +126,6 @@ body.frozen {
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>
   <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
-  <% if (agent === "electron") { %>
-    <a href="/" target="_blank" class='btn2' features="browser"><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } else { %>
-    <a href="/" target="_blank" class='btn2'><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } %>
   <button id='new-window' title='open a new window' class='btn2'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
 </div>
 </h1>

package/server/views/explore.ejs

@@ -133,11 +133,6 @@ body main iframe {
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>
   <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
-  <% if (agent === "electron") { %>
-    <a href="/" target="_blank" class='btn2' features="browser"><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } else { %>
-    <a href="/" target="_blank" class='btn2'><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } %>
   <button id='new-window' title='open a new window' class='btn2'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
 </div>
 <!--

package/server/views/github.ejs

@@ -188,11 +188,6 @@ hr {
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>
   <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
-  <% if (agent === "electron") { %>
-    <a href="/" target="_blank" class='btn2' features="browser"><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } else { %>
-    <a href="/" target="_blank" class='btn2'><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } %>
   <button id='new-window' title='open a new window' class='btn2'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
 </div>
 </h1>

package/server/views/index.ejs

@@ -275,11 +275,6 @@ body.dark .open-menu, body.dark .browse {
     <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
     <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>
     <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
-    <% if (agent === "electron") { %>
-      <a href="/" target="_blank" class='btn2' features="browser"><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-    <% } else { %>
-      <a href="/" target="_blank" class='btn2'><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-    <% } %>
     <button id='new-window' title='open a new window' class='btn2'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
   </div>
 <% } %>

package/server/views/network.ejs

@@ -414,11 +414,6 @@ input:checked + .slider:before {
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>
   <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
-  <% if (agent === "electron") { %>
-    <a href="/" target="_blank" class='btn2' features="browser"><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } else { %>
-    <a href="/" target="_blank" class='btn2'><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } %>
   <button id='new-window' title='open a new window' class='btn2'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
 </div>
 </h1>

package/server/views/partials/menu.ejs

@@ -14,22 +14,37 @@
       <% if (item.action) { %>
         <div <%=item.default ? 'data-default' : ''%> data-action="<%=JSON.stringify(item.action)%>" class='btn header-item frame-link <%=item.display || ""%>'>
           <div class='tab'><%-item.btn%></div>
+          <% if (item.arrow) { %>
+            <i class="fa-solid fa-angle-right"></i>
+          <% } %>
         </div>
       <% } else if (item.run) { %>
         <div data-run="<%=item.run%>" data-cwd="<%=item.cwd%>" class='btn header-item frame-link <%=item.display || ""%>'>
           <div class='tab'><%-item.btn%></div>
+          <% if (item.arrow) { %>
+            <i class="fa-solid fa-angle-right"></i>
+          <% } %>
         </div>
       <% } else if (item.command) { %>
         <div data-command="<%=item.command%>" data-filepath="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'>
           <div class='tab'><%-item.btn%></div>
+          <% if (item.arrow) { %>
+            <i class="fa-solid fa-angle-right"></i>
+          <% } %>
         </div>
       <% } else if (item.fs) { %>
         <div data-filepath="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'>
           <div class='tab'><%-item.btn%></div>
+          <% if (item.arrow) { %>
+            <i class="fa-solid fa-angle-right"></i>
+          <% } %>
         </div>
       <% } else if (item.target === "_blank") { %>
         <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'>
           <div class='tab'><%-item.btn%></div>
+          <% if (item.arrow) { %>
+            <i class="fa-solid fa-angle-right"></i>
+          <% } %>
           <div class='loader'>
             <i class="fa-solid fa-up-right-from-square"></i>
           </div>
@@ -50,6 +65,9 @@
               </button>
             </div>
           <% } %>
+          <% if (item.arrow) { %>
+            <i class="fa-solid fa-angle-right"></i>
+          <% } %>
         </a>
       <% } %>
     <% } %>

package/server/views/prototype/index.ejs

@@ -143,6 +143,11 @@ body.dark .header-item .btn2 {
 .header-item > * {
   display: block;
 }
+.header-item i {
+  font-size: 20px !important;
+  width: 20px !important;
+  padding: 10px;
+}
 .header-item img {
 /*
   width: 60px;

package/server/views/prototype/old_index.ejs

@@ -558,11 +558,6 @@ body.dark .header-item.cursor.header-top {
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>
   <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
-  <% if (agent === "electron") { %>
-    <a href="/" target="_blank" class='btn2' features="browser"><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } else { %>
-    <a href="/" target="_blank" class='btn2'><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } %>
   <button id='new-window' title='open a new window' class='btn2'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
 </div>
 </h1>

package/server/views/settings.ejs

@@ -276,11 +276,6 @@ body.dark .keys pre {
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>
   <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
-  <% if (agent === "electron") { %>
-    <a href="/" target="_blank" class='btn2' features="browser"><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } else { %>
-    <a href="/" target="_blank" class='btn2'><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } %>
   <button id='new-window' title='open a new window' class='btn2'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
 </div>
 <!--

package/server/views/setup_home.ejs

@@ -162,11 +162,6 @@ body.dark .card {
   <button class='btn2' id='genlog'><div><i class="fa-solid fa-laptop-code"></i></div><div>Logs</div></button>
   <a id='downloadlogs' download class='hidden btn2' href="/pinokio/logs.zip"><div><i class="fa-solid fa-download"></i></div><div>Download logs</div></a>
   <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
-  <% if (agent === "electron") { %>
-    <a href="/" target="_blank" class='btn2' features="browser"><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } else { %>
-    <a href="/" target="_blank" class='btn2'><div><i class="fa-solid fa-square-up-right"></i></div><div>Open</div></a>
-  <% } %>
   <button id='new-window' title='open a new window' class='btn2'><i class="fa-solid fa-plus"></i></button>
 
 </div>

package/server/views/shell.ejs

@@ -578,13 +578,16 @@ document.addEventListener("DOMContentLoaded", async () => {
               callbacks: {
                 onClose: () => {
                   location.href = "<%=callback%>"
+                  location.reload()
                 }
               }
               <% } %>
             })
           <% } else { %>
             <% if (callback) { %>
+            debugger
             location.href = "<%=callback%>"
+            location.reload()
             <% } %>
           <% } %>
         })

package/server/views/terminal.ejs

@@ -435,11 +435,14 @@ document.addEventListener("DOMContentLoaded", async () => {
 
             refreshParent()
             let params = packet.data
-            window.open(
-              params.uri,
-              (params.target || "_self"),
-              params.features
-            )
+            debugger
+            console.log("Web open", params)
+            open_url(params.uri, params.target, params.features)
+//            window.open(
+//              params.uri,
+//              (params.target || "_self"),
+//              params.features
+//            )
           } else if (packet.type === "browser.open") {
           /*
             {