pinokiod 3.18.9 → 3.19.2

package/kernel/api/index.js

@@ -62,7 +62,6 @@ class Api {
       delete pinokio3.menu
     }
     let meta = Object.assign({}, pinokio, pinokio2, pinokio3)
-    console.log("meta", meta)
 
     // create pinokio.json if it doesn't exist
 //    if (!pinokio3) {

package/kernel/prototype.js

@@ -18,52 +18,51 @@ class Proto {
         await fs.promises.mkdir(this.kernel.path("prototype"), { recursive: true }).catch((e) => { })
         await this.kernel.exec({
           //message: "git clone https://github.com/peanutcocktail/prototype system",
-          message: "git clone https://github.com/pinokiocomputer/prototype system",
+          //message: "git clone https://github.com/pinokiocomputer/prototype system",
+          message: "git clone https://github.com/pinokiocomputer/proto system",
           path: this.kernel.path("prototype")
         }, (e) => {
           process.stdout.write(e.raw)
         })
-      }
-
-      let pinokiojs_path = this.kernel.path("prototype/system/pinokio.js")
-      let config = await this.kernel.require(pinokiojs_path)
-      this.config = config
-
-      if (this.config && this.config.menu) {
-        this.config.menu.push({
-          icon: "fa-solid fa-rotate",
-          text: "Update",
-          shell: {
-            message: "git pull",
-            path: this.kernel.path("prototype/system")
-          }
+        await this.kernel.download({
+          uri: "https://raw.githubusercontent.com/pinokiocomputer/home/refs/heads/main/docs/README.md",
+          path: this.kernel.path("prototype"),
+          filename: "PINOKIO.md"
+        }, (e) => {
+          process.stdout.write(e.raw)
         })
       }
+    }
+  }
+  async reset() {
+    await fs.promises.rm(this.kernel.path("prototype"), { recursive: true })
+  }
+  async create(req, ondata) {
+    console.log("proto.create", req)
+    try {
+      let projectType = req.params.projectType
+      let startType = req.params.cliType || req.params.startType
+      console.log({ projectType, startType })
 
+      let cwd = req.cwd
+      let name = req.name
+      let payload = {}
+      payload.cwd = path.resolve(cwd, name)
+      payload.input = req.params
 
+      let mod_path = this.kernel.path("prototype/system", projectType, startType)
+      let mod = await this.kernel.require(mod_path)
 
+      await mod(payload, ondata, this.kernel)
 
+      // copy readme
+      let readme_path = this.kernel.path("prototype/PINOKIO.md")
+      await fs.promises.cp(readme_path, path.resolve(cwd, name, "PINOKIO.md"))
 
-////      let prototype_paths = (await glob('**/pinokio.js', { cwd }))
-//      let prototype_dir = path.resolve(this.kernel.homedir, "prototype")
-//      for(let prototype_path of prototype_paths) {
-//        let proto = path.dirname(prototype_path)
-//        let pinokiojs = path.resolve(prototype_dir, prototype_path)
-//        let config = await this.kernel.require(pinokiojs)
-//        if (config && config.run) {
-//          if (config.icon) {
-//            config.icon = "/prototype/" + proto + "/" + config.icon
-//          } else {
-//            config.icon === "/pinokio-black.png"
-//          }
-//          let c = {
-//            id: proto,
-//            ...config
-//          }
-//          this.items.push(c)
-//          this.kv[proto] = c
-//        }
-//      }
+      return { success: "/p/" + name }
+    } catch (e) {
+      console.log("ERROR", e)
+      return { error: e.stack }
     }
   }
   async readme(proto) {

package/kernel/shell.js

@@ -449,7 +449,6 @@ class Shell {
     }
     this.prompt_pattern = await this.prompt(params.path)
     this.cb = cb
-    console.log("shell request", params)
     let r = await this.exec(params)
     return r
   }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "pinokiod",
-  "version": "3.18.9",
+  "version": "3.19.2",
   "description": "",
   "main": "index.js",
   "scripts": {
     "download_readme": "wget -O kernel/proto/PINOKIO.md https://raw.githubusercontent.com/pinokiocomputer/home/refs/heads/main/docs/README.md",
-    "start": "npm run download_readme && node script/index"
+    "start": "node script/index"
   },
   "author": "",
   "license": "MIT",

package/server/index.js

@@ -562,9 +562,6 @@ class Server {
     if (!this.kernel.proto.config) {
       await this.kernel.proto.init()
     }
-//    if (!this.kernel.plugin.config) {
-//      await this.kernel.plugin.init()
-//    }
     res.render("app", result)
   }
   getVariationUrls(req) {
@@ -1934,7 +1931,6 @@ class Server {
         if (config.menu[i].popout) {
           config.menu[i].target = "_blank"
         } else {
-          console.log("config.menu", config.menu)
           config.menu[i].target = "@" + (config.menu[i].id || config.menu[i].src)
         }
 
@@ -2586,6 +2582,9 @@ class Server {
           path.resolve(__dirname, "..", "kernel", "gitconfig_template"),
           gitconfig
         )
+
+        let prototype_path = path.resolve(home, "prototype")
+        await fse.remove(prototype_path)
         
 
         console.log("[TRY] Updating to the new version")
@@ -2738,9 +2737,9 @@ class Server {
 //        return
 //      }
       
-      if (!this.kernel.proto.config) {
-        await this.kernel.proto.init()
-      }
+//      if (!this.kernel.proto.config) {
+//        await this.kernel.proto.init()
+//      }
       if (!this.kernel.plugin.config) {
         await this.kernel.plugin.init()
       }

package/server/views/prototype/init.ejs

@@ -22,7 +22,14 @@
     padding: 0;
     box-sizing: border-box;
 }
-
+img.appicon {
+  width: 40px;
+  height: 40px;
+  margin-right: 10px;
+  padding: 5px;
+  border-radius: 4px;
+  background: white;
+}
 .container {
     max-width: 800px;
     margin: 0 auto;
@@ -42,6 +49,7 @@ h4 {
   font-size: 15px;
   letter-spacing: 0px;
   margin-bottom: 5px;
+  margin-top: 10px;
 }
 
 h2 {
@@ -85,7 +93,7 @@ body.dark .progress-bar .step.active {
 }
 .progress-bar .step.active {
     background: rgba(0,0,0,0.1);
-    color: #ffffff;
+    color: silver;
 }
 
 .progress-bar .step.completed {
@@ -117,11 +125,11 @@ body.dark .radio-group label {
     background: rgba(0,0,0,0.3);
 }
 .radio-group label {
+    background: rgba(0,0,0,0.03);
     display: flex;
     align-items: center;
     margin-bottom: 5px;
     padding: 10px;
-    background: rgba(0,0,0,0.04);
     cursor: pointer;
     transition: all 0.3s ease;
 }
@@ -137,11 +145,12 @@ body.dark .radio-group label {
 }
 
 .radio-group label span {
-    font-weight: 500;
+    font-weight: bold;
     flex: 1;
 }
 
 .radio-group label .description {
+    opacity: 0.7;
     margin-left: 0.5rem;
 }
 
@@ -169,7 +178,7 @@ body.dark .conditional-options {
 .conditional-options {
     margin: 20px 0;
     padding: 1rem;
-    background: rgba(0,0,0,0.1);
+    background: rgba(0,0,0,0.04);
     /*
     border: 1px solid #000000;
     */
@@ -210,7 +219,7 @@ body.dark .conditional-options {
 textarea, input[type="url"], input[type="text"] {
     width: 100%;
     padding: 10px;
-    border: 1px solid #000000;
+    border: none;
     font-family: inherit;
 }
 
@@ -971,11 +980,11 @@ body.dark .appcanvas {
 }
 .command-fields {
   background: rgba(0,0,0,0.04);
+  padding: 20px;
+  margin: 20px 0;
 }
 body.dark .command-fields {
-  padding: 20px;
   background: rgba(0,0,0,0.3);
-  margin: 20px 0;
 }
 </style>
 <link href="/app.css" rel="stylesheet"/>
@@ -1062,19 +1071,25 @@ body.dark .command-fields {
                   <div class="radio-group">
                       <label>
                           <input type="radio" name="projectType" value="nodejs">
+                          <img class='appicon' src="/asset/prototype/system/nodejs/icon.png"/>
                           <span>Node.js</span>
+                          <p class="description">A launcher for a typical node.js project</p>
                       </label>
                       <label>
                           <input type="radio" name="projectType" value="python">
+                          <img class='appicon' src="/asset/prototype/system/python/icon.png"/>
                           <span>Python</span>
+                          <p class='description'>A launcher for a typical python project)</p>
                       </label>
                       <label>
                           <input type="radio" name="projectType" value="empty">
-                          <span>Use AI</span>
+                          <img class='appicon' src="/asset/prototype/system/empty/icon.png"/>
+                          <span>Any</span>
+                          <p class='description'>A minimal launcher you can customize on your own</p>
                       </label>
                   </div>
 
-                  <div class='command-fields'>
+                  <div class='command-fields conditional-options' id="clone-command-fields">
                     <div class="git-url-input">
                         <label for="gitUrl">Git Repository URL:</label>
                         <input type="url" name="gitUrl" id="gitUrl" placeholder="https://github.com/username/repository.git">
@@ -1133,10 +1148,12 @@ body.dark .command-fields {
                   <div class="radio-group">
                       <label>
                           <input type="radio" name="projectType" value="empty">
+                          <img class='appicon' src="/asset/prototype/system/empty/icon.png"/>
                           <span>Empty Project</span>
                       </label>
                       <label>
                           <input type="radio" name="projectType" value="cli">
+                          <img class='appicon' src="/asset/prototype/system/cli/icon.png"/>
                           <span>CLI App Launcher</span>
                       </label>
 
@@ -1184,6 +1201,7 @@ body.dark .command-fields {
 
                       <label>
                           <input type="radio" name="projectType" value="documentation">
+                          <img class='appicon' src="/asset/prototype/system/documentation/icon.png"/>
                           <span>Documentation</span>
                       </label>
 
@@ -1211,10 +1229,12 @@ body.dark .command-fields {
                       </div>
                       <label>
                           <input type="radio" name="projectType" value="nodejs">
+                          <img class='appicon' src="/asset/prototype/system/nodejs/icon.png"/>
                           <span>Node.js</span>
                       </label>
                       <label>
                           <input type="radio" name="projectType" value="python">
+                          <img class='appicon' src="/asset/prototype/system/python/icon.png"/>
                           <span>Python</span>
                       </label>
                   </div>
@@ -1352,6 +1372,12 @@ document.addEventListener('DOMContentLoaded', function() {
 });
 
 function showStep(stepNumber) {
+    console.log(stepNumber)
+    if (stepNumber === 1) {
+      document.querySelectorAll("#step-1 input[type=radio]").forEach((el) => {
+        el.checked = false
+      })
+    }
     // Hide all steps
     document.querySelectorAll('.step-content').forEach(step => {
         step.classList.remove('active');
@@ -1499,6 +1525,9 @@ function handleStartTypeChange(event) {
     document.getElementById('python-options').classList.remove('show');
     document.getElementById('python-options-clone').classList.remove('show');
 
+    // Hide clone command fields
+    document.getElementById('clone-command-fields').classList.remove('show');
+
     if (startType === 'clone') {
         cloneOptions.classList.add('show');
         newOptions.classList.remove('show');
@@ -1532,8 +1561,9 @@ function handleProjectTypeChange(event) {
     // Clear CLI input fields
     clearCliInputs();
 
-    // Update clone fields with defaults based on project type
+    // Show clone command fields when a project type is selected in clone mode
     if (startType === 'clone') {
+        document.getElementById('clone-command-fields').classList.add('show');
         updateCloneDefaults(projectType);
     }
 
@@ -1734,7 +1764,7 @@ async function displayResults(config) {
     }
   }
   socket.run({
-    method: "kernel.bin.init_launcher",
+    method: "kernel.proto.create",
     cwd: "<%-JSON.stringify(cwd).slice(1, -1)%>",
     name: "<%=name%>",
     params: config