pinokiod 3.19.61 → 3.19.63

package/kernel/api/index.js

@@ -1315,7 +1315,6 @@ class Api {
       // if the path is 
       let relative = path.relative(this.kernel.homedir, request.path)
       let chunks = relative.split(path.sep)
-      console.log({ chunks })
       if (chunks.length == 2) {
         // the script is requesting a uri of the git repo
         // look for pinokio.js

package/kernel/bin/cli.js

@@ -22,7 +22,6 @@ class CLI {
     
     if (exists) {
       let p = this.kernel.which("pinokio")
-      console.log({ p })
       if (p) {
         let res = await this.kernel.exec({
           message: "pinokio version terminal"

package/kernel/bin/index.js

@@ -754,6 +754,8 @@ class Bin {
     //    }
     //  }
     //}
+    await this.kernel.proto.init()
+
     if (this.kernel.shell) {
       this.kernel.shell.reset()
     }

package/kernel/bin/registry.js

@@ -19,7 +19,6 @@ class Registry {
     console.log("matches", matches)
     if (matches && matches.length > 0) {
       let chunks = matches[1].split(/\s+/)
-      console.log("chunks", chunks)
       if (chunks.length === 3) {
         if (Number(chunks[2]) === 1) {
           this._installed = true

package/kernel/prototype.js

@@ -7,6 +7,7 @@ class Proto {
     this.kernel = kernel
   }
   async init() {
+    console.log("Proto init")
     this.items = []
     this.kv = {}
     if (this.kernel.bin.installed && this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")) {
@@ -46,6 +47,7 @@ class Proto {
         })
       }
     }
+    console.log("Proto init done")
   }
   async reset() {
     await fs.promises.rm(this.kernel.path("prototype"), { recursive: true })

package/kernel/util.js

@@ -159,27 +159,32 @@ const exists= (abspath) => {
   return new Promise(r=>fs.access(abspath, fs.constants.F_OK, e => r(!e)))
 }
 const log = async (filepath, str, session) => {
-  try {
-    await fs.promises.mkdir(filepath, { recursive: true })
-  } catch (e) {
-  }
+  if (str && str.trim().length > 0) {
+    try {
+      await fs.promises.mkdir(filepath, { recursive: true })
+    } catch (e) {
+    }
 
-  let output = '';
-  for (let line of str.split('\n')) {
-    line = line.split('\r').pop(); // handle overwriting lines
-    output += line + '\n';
-  }
+    let output = '';
+    for (let line of str.split('\n')) {
+      line = line.split('\r').pop(); // handle overwriting lines
+      output += line + '\n';
+    }
 
-  const pattern = [
-    '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
-    '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-Za-z=><~]))'
-  ].join('|');
-  const regex = new RegExp(pattern, 'gi')
-  let stripped = str.replaceAll(regex, '');
-  let logpath = path.resolve(filepath, session)
-  await fs.promises.writeFile(logpath, stripped)
-  let latest_logpath = path.resolve(filepath, "latest")
-  await fs.promises.writeFile(latest_logpath, stripped)
+    const pattern = [
+      '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
+      '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-Za-z=><~]))'
+    ].join('|');
+    const regex = new RegExp(pattern, 'gi')
+    let stripped = str.replaceAll(regex, '');
+    let logpath = path.resolve(filepath, session)
+    console.log("> write log", logpath)
+    await fs.promises.writeFile(logpath, stripped)
+    let latest_logpath = path.resolve(filepath, "latest")
+    console.log("> write latest log", latest_logpath)
+    await fs.promises.writeFile(latest_logpath, stripped)
+    console.log("> all logs written")
+  }
 }
 const run = (cmd, cwd, kernel) => {
 //  console.log("Util.run", { cmd, cwd })

package/package.json

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

package/server/index.js

@@ -2973,6 +2973,7 @@ class Server {
     }))
 
     this.app.get("/init/:name", ex(async (req, res) => {
+      console.log("Rnder init", req.params.name)
       /*
         option 1: new vs. clone
         - new|clone
@@ -2989,6 +2990,17 @@ class Server {
           - prompt
 
       */
+
+      let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
+        bin: this.kernel.bin.preset("dev"),
+      })
+      if (!requirements_pending && install_required) {
+        res.redirect(`/setup/dev?callback=${req.originalUrl}`)
+        return
+      }
+
+//      console.log("this.kernel.proto.init")
+//      await this.kernel.proto.init()
       res.render("prototype/init", {
         cwd: this.kernel.path("api"),
         name: req.params.name,
@@ -3022,7 +3034,6 @@ class Server {
       })
       */
     }))
-
     this.app.get("/check_router_up", ex(async (req, res) => {
       let response = await this.check_router_up()
       res.json(response)
@@ -3062,7 +3073,6 @@ class Server {
       let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
         bin: this.kernel.bin.preset("connect"),
       })
-      console.log("1", { requirements_pending, install_required })
       if (!requirements_pending && install_required) {
         console.log("REDIRECT", req.params.provider)
         res.redirect("/setup/connect?callback=/connect/" + req.params.provider)
@@ -3627,7 +3637,6 @@ class Server {
       let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
         bin: this.kernel.bin.preset(req.params.name)
       })
-      console.log({ requirements, install_required, requirements_pending })
       res.json({
         requirements,
         install_required,
@@ -5240,7 +5249,6 @@ class Server {
     }))
     this.app.get("/pinokio/requirements_ready", ex((req, res) => {
       let requirements_pending = !this.kernel.bin.installed_initialized
-      console.log({ requirements_pending })
       res.json({ requirements_pending })
     }))
     this.app.get("/check_peer", ex((req, res) => {

package/server/views/prototype/init.ejs

@@ -216,6 +216,9 @@ body.dark .conditional-options {
     display: block;
 }
 
+body.dark textarea, body.dark input[type="url"],  body.dark input[type="text"] {
+  background: white;
+}
 textarea, input[type="url"], input[type="text"] {
     width: 100%;
     padding: 10px;
@@ -1275,7 +1278,7 @@ body.dark .command-fields {
           <div class="step-content" id="step-3">
               <h2>Step 3: AI Prompt (Optional)</h2>
               <p>Enter a prompt to build your app with AI assistance.</p>
-              <blockquote>The prompt will be stored in README.md, which can be used by any AI coding tool to build the app and the launcher.</blockquote>
+              <blockquote>The prompt will be stored in README.md, and ANY AI coding tool will be automatically instructed about the project (Just say "build the app").</blockquote>
               <textarea
                   name="aiPrompt"
                   id="aiPrompt"