pinokiod 2.15.19 → 2.15.20

package/kernel/api/fs/index.js

@@ -67,7 +67,6 @@ class FS {
   }
 
   async link(req, ondata, kernel) {
-    console.log("FS.link", req)
     let response = await this.share(req, ondata, kernel)
     return response
   }
@@ -277,7 +276,7 @@ class FS {
           }
 
 
-          
+          // fs.link should overwrite by default.
           if (req.params.options) {
             d.options = req.params.options 
           } else {
@@ -311,7 +310,6 @@ class FS {
           ondata({
             raw: "\r\nLINKING DRIVES:\r\n" + JSON.stringify(d, null, 2).replace(/\n/g, "\r\n")
           })
-          console.log("CREATE", JSON.stringify(d, null, 2))
           await drive.create(d)
           ondata({
             raw: "Done.\r\n"

package/kernel/api/index.js

@@ -56,14 +56,12 @@ class Api {
     this.checkProxy({ uri, name })
     // if the name exists, throw error
     // if the uri exists, throw error
-    console.log("lproxy start", uri, options)
     let proxy_uri = await this.lproxy.start(uri, options)
     if (this.proxies[scriptPath]) {
       this.proxies[scriptPath].push({ target: uri, proxy: proxy_uri, name})
     } else {
       this.proxies[scriptPath] = [{ target: uri, proxy: proxy_uri, name }]
     }
-    console.log("this.proxies", JSON.stringify(this.proxies, null, 2))
     return {
       target: uri,
       proxy: proxy_uri
@@ -92,7 +90,6 @@ class Api {
         })
       }
     }
-    console.log("this.proxies", JSON.stringify(this.proxies, null, 2))
   }
   async init() {
     if (this.kernel.homedir) {
@@ -519,11 +516,11 @@ class Api {
       mods.push(r)
     }
     let mod = _.zipObjectDeep(paths, mods)
-    console.log("MOD", mod)
     return mod
 
   }
   async step (request, rawrpc, input, i, total, args) {
+    console.log("STEP")
 
     await this.init()
 
@@ -534,6 +531,8 @@ class Api {
 
     let { cwd, script } = await this.resolveScript(request.path)
 
+    console.log("RESOLVED SCRIPT", script)
+
     let memory = {
       script: this.kernel.script,
       input,
@@ -565,10 +564,19 @@ class Api {
     // 1. render once
     let rpc = rawrpc
     let pass = 0;
+    console.log("PARSE START")
     while(true) {
+      console.log("rpc", rpc)
+      console.log("memory", memory)
       rpc = this.kernel.template.render(rpc, memory)
+      console.log("parsed rpc", rpc)
+      console.log(this.kernel.template.istemplate.toString())
+      console.log("isteamplate = ", this.kernel.template.istemplate(rpc))
+      let test = this.kernel.template.istemplate(rpc)
+      console.log({ test })
       if (this.kernel.template.istemplate(rpc)) {
         pass++;
+        console.log("PASS", pass)
         if (pass >= 4) {
           // only try 4 times
           break;
@@ -579,10 +587,13 @@ class Api {
         break;
       }
     }
+    console.log("rpc before", { rpc })
 
     // replace {{{ }}} with {{ }}
     rpc = this.kernel.template.flatten(rpc)
 
+    console.log("rpc after", { rpc })
+
     // 6. rpc must have method names
     if (rpc.method) {
 

package/kernel/api/json/index.js

@@ -0,0 +1,112 @@
+const path = require('path')
+const set = require("../set")
+const rm = require("../rm")
+class J {
+  async get(req, ondata, kernel) {
+    /*
+      // set local variables from json
+      req := {
+        "method": "json.get",
+        "params": {
+          "<key1>": <filepath1>,
+          "<key1>": <filepath2>
+        }
+      }
+    */
+    let params = {}
+    for(let key in req.params) {
+      let filepath = path.resolve(req.cwd, req.params[key])
+      if (filepath.endsWith(".json")) {
+        let j = (await kernel.loader.load(filepath)).resolved
+        params[key] = j
+      }
+    }
+    let converted = Object.assign({}, req, {
+      params: {
+        local: params
+      }
+    })
+    await set(converted, ondata, kernel)
+  }
+  async set(req, ondata, kernel) {
+    /*
+      req := {
+        "method": "json.set",
+        "params": {
+          "index.json": {
+            <key>: <val>,
+            <key>: <val>,
+          },
+          "data/models.json": {
+            <key>: <val>,
+            <key>: <val>,
+          }
+        }
+      }
+
+      equivalent to:
+
+      req := {
+        "method": "set",
+        "params": {
+          "json": {
+            "index.json": {
+              <key>: <val>,
+              <key>: <val>,
+            },
+            "data/models.json": {
+              <key>: <val>,
+              <key>: <val>,
+            }
+          }
+        }
+      }
+    */
+    let converted = Object.assign({}, req, {
+      params: {
+        json: req.params
+      }
+    })
+    let res = await set(converted, ondata, kernel)
+    return res
+  }
+  async rm(req, ondata, kernel) {
+    /*
+      req := {
+        "method": "json.rm",
+        "params": {
+          "index.json": {
+            "abc": "def"
+          },
+          "data/models.json": {
+            [ "attr", "a.b.c" ]
+          }
+        }
+      }
+
+      equivalent to:
+
+      req := {
+        "method": "rm",
+        "params": {
+          "json": {
+            "index.json": {
+              "abc": "def"
+            },
+            "data/models.json": {
+              [ "attr", "a.b.c" ]
+            }
+          }
+        }
+      }
+    */
+    let converted = Object.assign({}, req, {
+      params: {
+        json: req.params
+      }
+    })
+    let res = await rm(converted, ondata, kernel)
+    return res
+  }
+}
+module.exports = J

package/kernel/api/local/index.js

@@ -25,7 +25,6 @@ class Local {
     return res
   }
   async set(req, ondata, kernel) {
-    console.log("SET", req)
     /*
       req := {
         "method": "local.set",
@@ -96,7 +95,6 @@ class Local {
             }
           }
           const p = new Proxy()
-          console.log("> proxy", req)
           await p.start(req, ondata, kernel)
         }
       }

package/kernel/api/rm/index.js

@@ -52,8 +52,12 @@ module.exports = async (req, ondata, kernel) => {
   }
   */
 
-  if (req.params.self) {
-    for(let relative_filepath in req.params.self) {
+  let self = req.params.self
+  if (!self) {
+    self = req.params.json
+  }
+  if (self) {
+    for(let relative_filepath in self) {
       let filepath = path.resolve(req.cwd, relative_filepath)
       // ensure that the filepath is .json
       if (filepath.endsWith(".json")) {
@@ -66,7 +70,7 @@ module.exports = async (req, ondata, kernel) => {
           let folder = path.dirname(filepath)
           await fs.promises.mkdir(folder, { recursive: true }).catch((e) => { })
         }
-        let kv = req.params.self[relative_filepath]
+        let kv = self[relative_filepath]
 
 
         old = rm(old, kv)

package/kernel/api/set/index.js

@@ -1,6 +1,7 @@
 const path = require('path')
 const fs = require('fs')
 const set = async (old, kv, kernel, req, ondata) => {
+  console.log("SET", { old, kv })
   for (let key in kv) {
     try {
       if (key.startsWith('[')) {
@@ -13,14 +14,33 @@ const set = async (old, kv, kernel, req, ondata) => {
         );
         old = fun(old, key, kv[key]);
       } else {
-        let fun = new Function(
-          'old',
-          'key',
-          'val',
-          //`old.${key} = val; return old;`
-          `old["${key}"] = val; return old;`
-        );
-        old = fun(old, key, kv[key]);
+
+        let keypath = key.split(".")
+        // multiple keys. check if that path exists.
+        // if not, create the path
+        let next = old
+        for(let i=0; i<keypath.length; i++) {
+          console.log("turn", { i, path: keypath[i], next })
+          if (i === keypath.length-1) {
+            // last
+            next[keypath[i]] = kv[key]
+          } else {
+            const key = keypath[i];
+            if (!(key in next)) {
+              next[key] = {}
+            }
+            next = next[key];
+          }
+        }
+
+//        let fun = new Function(
+//          'old',
+//          'key',
+//          'val',
+//          //`old.${key} = val; return old;`
+//          `old["${key}"] = val; return old;`
+//        );
+//        old = fun(old, key, kv[key]);
       }
 
 
@@ -89,6 +109,7 @@ module.exports = async (req, ondata, kernel) => {
 //      }
     }
   }
+  console.log("kernel.memory", kernel.memory)
 
   // set self => save to the file
 
@@ -110,8 +131,12 @@ module.exports = async (req, ondata, kernel) => {
   }
   */
 
-  if (req.params.self) {
-    for(let relative_filepath in req.params.self) {
+  let self = req.params.self
+  if (!self) {
+    self = req.params.json
+  }
+  if (self) {
+    for(let relative_filepath in self) {
       let filepath = path.resolve(req.cwd, relative_filepath)
       // ensure that the filepath is .json
       if (filepath.endsWith(".json")) {
@@ -124,7 +149,7 @@ module.exports = async (req, ondata, kernel) => {
           let folder = path.dirname(filepath)
           await fs.promises.mkdir(folder, { recursive: true }).catch((e) => { })
         }
-        let kv = req.params.self[relative_filepath]
+        let kv = self[relative_filepath]
 
         old = await set(old, kv, kernel, req, ondata)
 

package/kernel/bin/index.js

@@ -207,7 +207,6 @@ class Bin {
       })
       let pipconfig_path = path.resolve(this.kernel.homedir, "pipconfig")
       let pipconfig_exists = await this.kernel.api.exists(pipconfig_path)
-      console.log("pipconfig exists?", { pipconfig_path, pipconfig_exists })
       // if not, create one
       if (!pipconfig_exists) {
         const pipconfigStr = `[global]
@@ -371,9 +370,6 @@ class Bin {
 //    console.log("metaFiles", metaFiles)
 //    console.log("paths", paths)
 
-    console.log("this.installed", this.installed)
-
-
 
     this.installed_initialized = true
 

package/kernel/bin/uv.js

@@ -0,0 +1,20 @@
+const fs = require('fs')
+const fetch = require('cross-fetch')
+const { rimraf } = require('rimraf')
+const decompress = require('decompress');
+class UV {
+  async install(req, ondata) {
+    await this.kernel.bin.exec({
+      message: "conda install -y -c conda-forge uv",
+    }, ondata)
+  }
+  async installed() {
+    return this.kernel.bin.installed.conda.has("uv")
+  }
+  async uninstall(req, ondata) {
+    await this.kernel.bin.exec({
+      message: "conda remove uv",
+    }, ondata)
+  }
+}
+module.exports = UV

package/kernel/index.js

@@ -1,5 +1,4 @@
 const fs = require('fs')
-//const {JSONPath} = require('jsonpath-plus');
 const os = require("os")
 const jsdom = require("jsdom");
 const path = require('path')
@@ -359,6 +358,7 @@ class Kernel {
           system,
           platform: this.platform,
           arch: this.arch,
+          env: this.envs,
           proxy: (port) => {
             return this.api.get_proxy_url("/proxy", port)
           },

package/kernel/shell.js

@@ -403,9 +403,9 @@ class Shell {
         })
         cb()
       }, 1)
-      term.onExit((result) => {
-        console.log("onExit", { result })
-      })
+//      term.onExit((result) => {
+//        console.log("onExit", { result })
+//      })
       term.onData((data) => {
         if (ready) {
           queue.push(data)
@@ -670,9 +670,9 @@ class Shell {
               this.queue.push(data)
             }
           });
-          this.ptyProcess.onExit((result) => {
-            console.log("onExit", result)
-          })
+//          this.ptyProcess.onExit((result) => {
+//            console.log("onExit", result)
+//          })
         }
       } catch (e) {
         console.log("** Error", e)

package/kernel/shells.js

@@ -41,8 +41,16 @@ class Shells {
     }, async (stream) => {
       process.stdout.write(stream.raw)
     })
-    console.log(">>> sh.env =", sh.env)
+
     this.kernel.envs = sh.env
+    // also set the uppercase variables if they're not set
+    for(let key in sh.env) {
+      let up = key.toUpperCase()
+      if (!this.kernel.envs[up]) {
+        this.kernel.envs[up] = sh.env[key]
+      }
+    }
+
   }
   async launch(params, options, ondata) {
     // iterate through all the envs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "2.15.19",
+  "version": "2.15.20",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -35,7 +35,7 @@
     "http-proxy-middleware": "^3.0.0",
     "http-terminator": "^3.2.0",
     "isomorphic-git": "^1.23.0",
-    "jimini": "^0.0.6",
+    "jimini": "^0.0.7",
     "jsdom": "^24.0.0",
     "key-store": "^1.2.0",
     "kleur": "^4.1.5",

package/server/index.js

@@ -158,8 +158,15 @@ class Server {
         name = x.name
         description = ""
       }
+      let browser_url 
+      if (x.run) {
+        browser_url = "/env/api/" + x.name
+      } else {
+        browser_url = "/pinokio/browser/" + x.name
+      }
       return {
         icon,
+        run: x.run,
         menu: x.menu,
         shortcuts: x.shortcuts,
         index: x.index,
@@ -170,11 +177,11 @@ class Server {
         //description: x.path,
         description,
         url: p + "/" + x.name,
-        browser_url: "/pinokio/browser/" + x.name
+        browser_url,
       }
     })
   }
-  async init_env(env_dir_path) {
+  async init_env(env_dir_path, options) {
     let current = this.kernel.path(env_dir_path, "ENVIRONMENT")
       // if environment.json doesn't exist, 
     let exists = await this.exists(current)
@@ -187,12 +194,19 @@ class Server {
       // if _ENVIRONMENT exists, 
       let _environment = this.kernel.path(env_dir_path, "_ENVIRONMENT")
       let _exists = await this.exists(_environment)
-      let content = await Environment.ENV("app", this.kernel.homedir)
-      if (_exists) {
-        let _environmentStr = await fs.promises.readFile(_environment, "utf8")
-        await fs.promises.writeFile(current, _environmentStr + "\n\n\n" + content)
+      if (options && options.no_inherit) {
+        if (_exists) {
+          let _environmentStr = await fs.promises.readFile(_environment, "utf8")
+          await fs.promises.writeFile(current, _environmentStr)
+        }
       } else {
-        await fs.promises.writeFile(current, content)
+        let content = await Environment.ENV("app", this.kernel.homedir)
+        if (_exists) {
+          let _environmentStr = await fs.promises.readFile(_environment, "utf8")
+          await fs.promises.writeFile(current, _environmentStr + "\n\n\n" + content)
+        } else {
+          await fs.promises.writeFile(current, content)
+        }
       }
     }
   }
@@ -453,6 +467,8 @@ class Server {
         name: "playwright"
       }, {
         name: "huggingface"
+      }, {
+        name: "uv"
       }])
 
       let requirements_pending = !this.kernel.bin.installed_initialized
@@ -691,6 +707,7 @@ class Server {
 //            template = "editor"
 //          }
 //        }
+        
 
         let requirements = [{
           name: "conda",
@@ -730,6 +747,8 @@ class Server {
           name: "playwright"
         }, {
           name: "huggingface"
+        }, {
+          name: "uv"
         }])
 //        if (platform === "linux") {
 //          requirements.push({
@@ -845,7 +864,16 @@ class Server {
         edu.searchParams.set("mode", "source")
         let editorUrl = edu.pathname + edu.search
 
+        let referer = req.get("Referer")
+        console.log({ referer })
+
+        let prev = null
+        if (/\/env\/api\/.+/.test(new URL(referer).pathname)) {
+          prev = referer 
+        }
+
         const result = {
+          prev,
           error,
           memory: mem,
 //          memory: mem,
@@ -880,6 +908,8 @@ class Server {
           proxies: this.kernel.api.proxies[filepath],
         }
 
+        console.log({ result })
+
         res.render(template, result)
       } else {
         res.render("frame", {
@@ -1055,19 +1085,22 @@ class Server {
                 error = `Please update Pinokio to the latest version (current script version: ${config.version}, supported: ${this.kernel.schema}`
               }
             }
-            if (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)
-                }
-              }
-
-              await this.renderMenu(uri, item.name, config, pathComponents)
-
-              items[i].menu = config.menu
-            }
+//            if (config.run) {
+//              items[i].run = config.run
+//            }
+//            if (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)
+//                }
+//              }
+//
+//              await this.renderMenu(uri, item.name, config, pathComponents)
+//
+//              items[i].menu = config.menu
+//            }
 
             if (config.shortcuts) {
               if (typeof config.shortcuts === "function") {
@@ -1087,6 +1120,11 @@ class Server {
             continue
           }
 
+//          // if there's a run clause, do not display on the home page
+//          if (config && config.run && Array.isArray(config.run)) {
+//            continue
+//          }
+
 
           // check if there is a running process with this folder name
           let runningApps = new Set()
@@ -1123,10 +1161,63 @@ class Server {
 
       // check running for each
       // running_items
+      items = items.map((x) => {
+        //let name = (x.name.startsWith("0x") ? Buffer.from(x.name.slice(2), "hex").toString() : x.name)
+        let name
+        let description
+        let icon
+        let uri
+        if (meta) {
+          let m = meta[x.name]
+          name = (m && m.title ? m.title : x.name)
+          description = (m && m.description ? m.description : "")
+          if (m && m.icon) {
+            icon = m.icon
+          } else {
+            icon = null
+          }
+          uri = x.name
+        } else {
+          if (x.isDirectory()) {
+            icon = "fa-solid fa-folder"
+          } else {
+            icon = "fa-regular fa-file"
+          }
+          name = x.name
+          description = ""
+        }
+        return {
+          icon,
+          menu: x.menu,
+          run: x.run,
+          shortcuts: x.shortcuts,
+          //icon: (x.isDirectory() ? "fa-solid fa-folder" : "fa-regular fa-file"),
+          name,
+          uri,
+          //description: x.path,
+          description,
+          //url: p + "/" + x.name,
+          url: _p + "/" + x.name,
+//            url: `${U}/${x.name}`,
+          browser_url: "/pinokio/browser/" + x.name
+        }
+      })
 
-      // items
-
-
+//      if (req.query && req.query.mode === "task") {
+//        running = running.filter((x) => {
+//          return x.run && Array.isArray(x.run)
+//        })
+//        notRunning = notRunning.filter((x) => {
+//          return x.run && Array.isArray(x.run)
+//        })
+//      } else {
+//        running = running.filter((x) => {
+//          return !(x.run && Array.isArray(x.run))
+//        })
+//        notRunning = notRunning.filter((x) => {
+//          return !(x.run && Array.isArray(x.run))
+//        })
+//      }
 
 
  //     let U = `${_p}/${pathComponents.join("/")}`
@@ -1146,7 +1237,6 @@ class Server {
       if (this.cloudflare_pub) {
         qr_cloudflare = await QRCode.toDataURL(this.cloudflare_pub)
       }
-      console.log("****************", { items })
 
       res.render("index", {
         home_url: `http://localhost:${this.port}`,
@@ -1172,50 +1262,9 @@ class Server {
         notRunning,
         readme,
         filepath,
-        items: items
-//        .filter((x) => {
-//          return x.type !== "lib"
-//        })
-        .map((x) => {
-          //let name = (x.name.startsWith("0x") ? Buffer.from(x.name.slice(2), "hex").toString() : x.name)
-          let name
-          let description
-          let icon
-          let uri
-          if (meta) {
-            let m = meta[x.name]
-            name = (m && m.title ? m.title : x.name)
-            description = (m && m.description ? m.description : "")
-            if (m && m.icon) {
-              icon = m.icon
-            } else {
-              icon = null
-            }
-            uri = x.name
-          } else {
-            if (x.isDirectory()) {
-              icon = "fa-solid fa-folder"
-            } else {
-              icon = "fa-regular fa-file"
-            }
-            name = x.name
-            description = ""
-          }
-          return {
-            icon,
-            menu: x.menu,
-            shortcuts: x.shortcuts,
-            //icon: (x.isDirectory() ? "fa-solid fa-folder" : "fa-regular fa-file"),
-            name,
-            uri,
-            //description: x.path,
-            description,
-            //url: p + "/" + x.name,
-            url: _p + "/" + x.name,
-//            url: `${U}/${x.name}`,
-            browser_url: "/pinokio/browser/" + x.name
-          }
-        }),
+        mode: null,
+        //mode: (req.query && req.query.mode ? req.query.mode : null),
+        items
       })
     }
   }
@@ -2120,17 +2169,18 @@ class Server {
     this.app.get("/proxy", ex(async (req, res) => {
       let live_proxies = this.kernel.api.proxies["/proxy"]
       if (!live_proxies) live_proxies = []
-      let proxies = [{
-        icon: "ollama.webp",
-        name: "Ollama",
-        target: 'http://127.0.0.1:11434',
-        port: 44002
-      }, {
-        icon: "lmstudio.jpg",
-        name: "LMStudio",
-        target: 'http://127.0.0.1:1234',
-        port: 44003
-      }]
+      let proxies = []
+//      let proxies = [{
+//        icon: "ollama.webp",
+//        name: "Ollama",
+//        target: 'http://127.0.0.1:11434',
+//        port: 44002
+//      }, {
+//        icon: "lmstudio.jpg",
+//        name: "LMStudio",
+//        target: 'http://127.0.0.1:1234',
+//        port: 44003
+//      }]
       for(let i=0; i<proxies.length; i++) {
         proxies[i].running = false
         for(let live_proxy of live_proxies) {
@@ -2182,8 +2232,6 @@ class Server {
           })
         }
       }
-      console.log({ apps })
-
       res.render("proxy", {
         agent: this.agent,
         theme: this.theme,
@@ -2313,17 +2361,22 @@ class Server {
     this.app.get("/env/*", ex(async (req, res) => {
 
       let env_path = req.params[0]
-      await this.init_env(env_path)
-
-      let pathComponents = req.params[0].split("/")
-      let filepath = path.resolve(this.kernel.homedir, req.params[0], "ENVIRONMENT")
-      let editorpath = "/edit/" + req.params[0] + "/ENVIRONMENT"
-      const items = await Util.parse_env_detail(filepath)
       let p = path.resolve(this.kernel.homedir, env_path, "pinokio.js")
       let config  = (await this.kernel.loader.load(p)).resolved
+      if (config.run) {
+        await this.init_env(env_path, { no_inherit: true })
+      } else {
+        await this.init_env(env_path)
+      }
 
+      let pathComponents = req.params[0].split("/")
+      let filepath = path.resolve(this.kernel.homedir, req.params[0], "ENVIRONMENT")
 
-      console.log(">>>>>>>>>>>>>>>>>", { config })
+      let items = []
+      let e = await this.exists(filepath)
+      if (e) {
+        items = await Util.parse_env_detail(filepath)
+      }
       if (config.icon) {
         config.icon = `/${env_path}/${config.icon}?raw=true`
       }
@@ -2332,48 +2385,49 @@ class Server {
       if (env_path.startsWith("api")) {
         name = env_path.split("/")[1]
       }
+      let editorpath = "/edit/" + req.params[0] + "/ENVIRONMENT"
 
-      //if (config.run) {
-      //  let configStr = await fs.promises.readFile(p, "utf8")
-      //  res.render("disposable", {
-      //    home: null,
-      //    config,
-      //    name,
-      //    init: req.query ? req.query.init : null,
-      //    editorpath,
-      //    items,
-      //    theme: this.theme,
-      //    filepath,
-      //    agent: this.agent,
-      //    path: "/api/" + name + "/pinokio.js",
-      //    _path: "/_api/" + name,
-      //    str: configStr
-      //  })
-      //} else {
-      //  res.render("env_editor", {
-      //    home: null,
-      //    config,
-      //    name,
-      //    init: req.query ? req.query.init : null,
-      //    editorpath,
-      //    items,
-      //    theme: this.theme,
-      //    filepath,
-      //    agent: this.agent,
-      //  })
-      //}
-      res.render("env_editor", {
-        home: null,
-        config,
-        name,
-        init: req.query ? req.query.init : null,
-        editorpath,
-        items,
-        theme: this.theme,
-        filepath,
-        agent: this.agent,
-      })
-
+      if (config.run) {
+        let configStr = await fs.promises.readFile(p, "utf8")
+        res.render("task", {
+          home: null,
+          config,
+          name,
+          init: true,
+//          init: req.query ? req.query.init : null,
+          editorpath,
+          items,
+          theme: this.theme,
+          filepath,
+          agent: this.agent,
+          path: "/api/" + name + "/pinokio.js",
+          _path: "/_api/" + name,
+          str: configStr
+        })
+      } else {
+        res.render("env_editor", {
+          home: null,
+          config,
+          name,
+          init: req.query ? req.query.init : null,
+          editorpath,
+          items,
+          theme: this.theme,
+          filepath,
+          agent: this.agent,
+        })
+      }
+      //res.render("env_editor", {
+      //  home: null,
+      //  config,
+      //  name,
+      //  init: req.query ? req.query.init : null,
+      //  editorpath,
+      //  items,
+      //  theme: this.theme,
+      //  filepath,
+      //  agent: this.agent,
+      //})
     }))
     this.app.get("/pre/api/:name", ex(async (req, res) => {
       let p = path.resolve(this.kernel.homedir, "api", req.params.name, "pinokio.js")

package/server/public/style.css

@@ -53,6 +53,40 @@
   */
   --dark-btn-color: whitesmoke;
 }
+.type-tabs {
+  display: flex;
+  padding: 20px 20px 0;
+  /*
+  background: rgba(0,0,0,0.05);
+  */
+}
+.type-tab {
+  display: flex;
+  align-items: center;
+  padding: 10px 20px;
+  text-decoration: none;
+  color: black;
+  margin-right: 10px;
+}
+.type-tab.selected {
+  background: rgba(0,0,100,0.04);
+}
+body.dark .type-tab {
+  background: none;
+  color: white;
+}
+body.dark .type-tab.selected {
+  background: rgba(255,255,255,0.03);
+}
+body.dark .type-tabs {
+/*
+  background: rgba(255,255,255,0.05);
+  */
+}
+.type-tab img {
+  height: 20px;
+  margin-right: 5px;
+}
 .navheader {
   padding: 15px 10px;
 }
@@ -1468,8 +1502,16 @@ body.dark .btn2 {
 body.dark .btn2:hover {
   background: rgba(255,255,255,0.06);
 }
+/*
+body.dark .browser-options {
+  background: rgba(255,255,255,0.05);
+}
+*/
 .browser-options {
   padding: 10px;
+  /*
+  background: rgba(0,0,0,0.05);
+  */
 }
 .btn2 {
   background: none;
@@ -1530,7 +1572,7 @@ body.dark .header-label {
   font-weight: bold;
   text-transform: uppercase;
   top: 0;
-  padding: 10px;
+  padding: 25px 15px 15px;
   /*
   border-top: 2px solid rgba(0,0,0,0.04);
   */
@@ -1542,7 +1584,11 @@ nav.error-message {
   color: rgba(0,0,0,0.7);
   font-weight: bold;
 }
-.not-running-apps {
+.not-running-apps, .running-apps {
+  background: rgba(0,0,100,0.04);
+}
+body.dark .not-running-apps, body.dark .running-apps {
+  background: rgba(255,255,255,0.03);
 }
 .running-apps .line img {
   border: 4px solid #8fd400;

package/server/views/env_editor.ejs

@@ -178,8 +178,6 @@ body {
 }
 h1 {
   font-size: 50px;
-  font-family: georgia;
-  font-style: italic;
   padding-bottom: 20px;
 }
 footer {

package/server/views/fullscreen_editor.ejs

@@ -495,6 +495,12 @@ document.addEventListener("DOMContentLoaded", async () => {
                     }
                   })
                 }
+              <% if (locals.prev) { %>
+                n.Noty({
+                  text: '[Notice] finished',
+                  type: 'success'
+                })
+              <% } %>
               /*
                 n.Noty({
                   text: '[Notice] finished',
@@ -740,6 +746,9 @@ const reloadMemory = async () => {
   <header class='navheader'>
   <% if (!install_required) { %>
     <div class='runner'>
+      <% if (locals.prev) { %>
+        <a class='btn' href="<%=prev%>"><i class="fa-solid fa-arrow-left"></i> Back</a>
+      <% } %>
       <div class='btn run <%= mod && runnable ? "" : "hidden" %>'>
         <span class='play'><i class="fa-solid fa-play"></i> Start</span>
         <span class='starting hidden'><i class="fa-solid fa-circle-notch fa-spin"></i> Starting...</span>

package/server/views/index.ejs

@@ -70,10 +70,12 @@ header .runner {
   padding-top: 5px;
 }
 .browser-options-row {
+/*
   border-top: 1px solid rgba(0,0,0,0.1);
   border-bottom: 1px solid rgba(0,0,0,0.1);
+  */
   display: flex;
-  padding: 20px 0;
+  padding: 10px;
   align-items: flex-start;
 }
 .browser-options-row h3 {
@@ -117,10 +119,12 @@ body.dark .btn {
 body.dark .badge {
   background: rgba(255,255,255,0.1);
 }
+/*
 body.dark .browser-options-row {
   border-top: 1px solid rgba(255,255,255,0.05);
   border-bottom: 1px solid rgba(255,255,255,0.05);
 }
+*/
 @media only screen and (max-width: 480px) {
   .btn2 {
     padding: 5px;
@@ -288,6 +292,17 @@ body.dark .browser-options-row {
       </div>
     </div>
   <% } %>
+  <!--
+  <div class='type-tabs'>
+    <% if (mode === "task") { %>
+      <a class='type-tab' href="/"><img src='/pinokio-<%=theme=='dark' ? 'white' : 'black'%>.png'> Apps</a>
+      <a class='type-tab selected' href="/?mode=task"> <img src='/<%=theme=='dark' ? 'term-dark.png' : 'term-white.png'%>'> Tasks</a>
+    <% } else { %>
+      <a class='type-tab selected' href="/"><img src='/pinokio-<%=theme=='dark' ? 'white' : 'black'%>.png'> Apps</a>
+      <a class='type-tab' href="/?mode=task"> <img src='/<%=theme=='dark' ? 'term-dark.png' : 'term-white.png'%>'> Tasks</a>
+    <% } %>
+  </div>
+  -->
   <% if (running.length > 0) { %>
     <div class='running-apps'>
       <div class='header-label'>Running</div>

package/server/views/proxy.ejs

@@ -143,8 +143,6 @@ body.dark .browser-options-row {
   margin-top: 10px;
 }
 .header-label {
-  font-family: Georgia;
-  font-style: italic;
   font-size: 50px;
   letter-spacing: -1px;
   padding: 50px;
@@ -255,7 +253,15 @@ body.dark .browser-options-row {
       <% apps.forEach((item) => { %>
         <a class='line align-top' href="<%=item.link%>">
           <h3>
-            <img class='icon' src="<%=item.icon%>">
+            <% if (item.icon) { %>
+              <img class='icon' src="<%=item.icon%>">
+            <% } else { %>
+              <% if (theme === 'dark') { %>
+                <img class='icon' src="/pinokio-white.png">
+              <% } else { %>
+                <img class='icon' src="/pinokio-black.png">
+              <% } %>
+            <% } %>
             <div class='col'>
               <div class='title'><%=item.name%></div>
               <div class='description'><%=item.description%></div>

package/server/views/settings.ejs

@@ -66,10 +66,8 @@
   padding: 20px 0;
 }
 .titleview h1 {
-  font-style: italic;
   word-break: break-word;
   font-size: 50px;
-  font-family: Georgia;
   letter-spacing: -1px;
 }
 .item > .d {

package/server/views/share_editor.ejs

@@ -206,8 +206,6 @@ body.dark .cloudflare-running {
 }
 h1 {
   font-size: 50px;
-  font-family: georgia;
-  font-style: italic;
   padding-bottom: 10px;
 }
 

package/server/views/{disposable.ejs → task.ejs}

@@ -178,8 +178,6 @@ body {
 }
 h1 {
   font-size: 50px;
-  font-family: georgia;
-  font-style: italic;
   padding-bottom: 20px;
 }
 footer {
@@ -234,20 +232,14 @@ document.addEventListener("DOMContentLoaded", async () => {
       return res.json()
     })
     console.log("res" ,res)
-    <% if (init && name) { %>
-      location.href = "/pinokio/browser/<%=name%>"
-    <% } else { %>
-      n.Noty({
-        text: `Updated!`
-      })
-    <% } %>
+    location.href = "<%=path%>"
   })
   <% if (init) { %>
-    /*
     document.querySelector("#customize").addEventListener("click", (e) => {
       e.preventDefault()
       e.stopPropagation()
       document.querySelector("#editor").classList.toggle("hidden")
+      document.querySelector("body").classList.toggle("center")
     })
     let editor = ace.edit("editor");
     editor.setTheme("ace/theme/nord_dark");
@@ -257,7 +249,6 @@ document.addEventListener("DOMContentLoaded", async () => {
     });
     editor.session.setMode("ace/mode/javascript");
     editor.clearSelection()
-    */
   <% } %>
 })
 </script>
@@ -266,25 +257,38 @@ document.addEventListener("DOMContentLoaded", async () => {
   <main>
     <% if (init) { %>
       <div>
-        <h1>Run</h1>
         <% if (config) { %>
           <div class='card'>
             <% if (config.icon) { %>
               <img src="<%=config.icon%>">
+            <% } else { %>
+              <img src="/term.png">
             <% } %>
             <div class='col'>
               <div class='title'><%=config.title%></div>
               <div class='description'><%=config.description%></div>
             </div>
           </div>
+          <div class='env-form'>
+            <% items.forEach((item) => { %>
+              <% if (item.type === "comment") { %>
+                <div class='comment'><%=item.val.replaceAll(/^[ #]+/g, "")%></div>
+              <% } else { %>
+                <div class='env-item'>
+                  <label for="<%=item.key%>"><%=item.key%></label>
+                  <input id="<%=item.key%>" type="text" value="<%=item.val%>">
+                </div>
+              <% } %>
+            <% }) %>
+          </div>
         <% } %>
         <footer>
           <a href="/" class='btn go-home'><i class='fa-solid fa-home'></i> home</a>
           <div class='flexible'></div>
-          <a id='customize' class='btn' target="_blank" href='<%=_path%>'><i class='fa-solid fa-code'></i> View Script</a>
           <!--
-          <button id='customize' class='btn'><i class="fa-solid fa-code"></i> View Script</button>
+          <a id='customize' class='btn' target="_blank" href='<%=_path%>'><i class='fa-solid fa-code'></i> View Script</a>
           -->
+          <button id='customize' class='btn'><i class="fa-solid fa-code"></i> View Script</button>
           <a id='save' href="<%=path%>" class='btn'>
             <span class='save'><i class="fa-solid fa-check"></i> Run</span>
           </a>
@@ -307,7 +311,7 @@ document.addEventListener("DOMContentLoaded", async () => {
         </h1>
       </header>
     <% } %>
-    <div id='editor' class='<%=init ? "hidden" : ''%>'><%=str%></div>
   </main>
+  <div id='editor' class='<%=init ? "hidden" : ''%>'><%=str%></div>
 </body>
 </html>