pinokiod 6.0.90 → 6.0.92

package/kernel/bin/brew.js

@@ -5,56 +5,66 @@ const { detectCommandLineTools } = require('./xcode-tools')
 class Brew {
   description = "Wait for an install pop-up, then approve."
   async install(req, ondata) {
-    const installer_url = "https://github.com/cocktailpeanut/bin/releases/download/homebrew/homebrew.zip"
-    //const installer_url = "https://github.com/Homebrew/brew/tarball/master"
-    const installer = "Homebrew.zip"
-
-    ondata({ raw: `downloading installer: ${installer_url}...\r\n` })
-    await this.kernel.bin.download(installer_url, installer, ondata)
-    console.log("## DOWNLOADED")
-
-    console.log("homebrewpath", this.kernel.bin.path("homebrew"))
-    await this.kernel.bin.rm("homebrew", ondata)
-
-    // 2. run the script
-    ondata({ raw: `unzipping installer: ${installer}...\r\n` })
-    await this.kernel.bin.unzip("Homebrew.zip", this.kernel.bin.path(), null, ondata)
-    await this.kernel.bin.rm("Homebrew.zip", ondata)
-
     if (this.kernel.platform === "darwin") {
       const checkingMsg = "> checking xcode command line tools...\r\n"
       console.log(checkingMsg)
       ondata({ raw: checkingMsg })
 
-      const cltStatus = await detectCommandLineTools({
-        exec: (params) => this.kernel.bin.exec(params, () => {})
-      })
+      const cltStatus = await detectCommandLineTools()
 
       if (cltStatus.valid) {
         const msg = `> command line tools detected at ${cltStatus.path} (pkg ${cltStatus.pkgVersion}, xcode-select ${cltStatus.xcodeSelectVersion}). skipping...\r\n`
         console.log(msg)
         ondata({ raw: msg })
+      } else if (needsManualXcodeAction(cltStatus.reason)) {
+        const instruction = manualXcodeActionMessage(cltStatus.reason)
+        const msg = `> ${instruction}\r\n`
+        console.log(msg)
+        ondata({ raw: msg })
+        ondata({
+          blocker: true,
+          html: `<b><i class="fa-solid fa-circle-exclamation"></i> Xcode action required</b><div style="padding-top:8px">${instruction}</div>`
+        }, "notify3")
+        throw new Error(`__PINOKIO_BLOCKER__ ${instruction}`)
       } else {
         const msg = `> ${cltStatus.reason || "command line tools not installed yet."} install the latest xcode build tools...\r\n`
         console.log(msg)
         ondata({ raw: msg })
-        await this._install(req, ondata)
+        await this._install(req, ondata, shouldRemoveCommandLineTools(cltStatus.reason))
       }
     }
+
+    const installer_url = "https://github.com/cocktailpeanut/bin/releases/download/homebrew/homebrew.zip"
+    //const installer_url = "https://github.com/Homebrew/brew/tarball/master"
+    const installer = "Homebrew.zip"
+
+    ondata({ raw: `downloading installer: ${installer_url}...\r\n` })
+    await this.kernel.bin.download(installer_url, installer, ondata)
+    console.log("## DOWNLOADED")
+
+    console.log("homebrewpath", this.kernel.bin.path("homebrew"))
+    await this.kernel.bin.rm("homebrew", ondata)
+
+    // 2. run the script
+    ondata({ raw: `unzipping installer: ${installer}...\r\n` })
+    await this.kernel.bin.unzip("Homebrew.zip", this.kernel.bin.path(), null, ondata)
+    await this.kernel.bin.rm("Homebrew.zip", ondata)
 //
     ondata({ raw: "installing gettext\r\n" })
     await this.kernel.bin.exec({ message: "brew install gettext --force-bottle", conda: { skip: true } }, (stream) => { ondata(stream) })
 //
     ondata({ raw: `Install finished\r\n` })
   }
-  async _install(req, ondata) {
+  async _install(req, ondata, removeExisting = false) {
     // command line tools installed
     const msg = "> installing the latest xcode build tools...\r\n"
     console.log(msg)
     ondata({ raw: msg })
     // not installed or not installed properly
     // install xcode build tools
-    await this.kernel.bin.exec({ sudo: true, conda: { skip: true }, message: "rm -rf /Library/Developer/CommandLineTools" }, (stream) => { ondata(stream) })
+    if (removeExisting) {
+      await this.kernel.bin.exec({ sudo: true, conda: { skip: true }, message: "rm -rf /Library/Developer/CommandLineTools" }, (stream) => { ondata(stream) })
+    }
     let sh_path = path.resolve(this.kernel.homedir, "xcode.sh")
     let src_path = path.resolve(__dirname, "xcode.sh")
     console.log({ sh_path, src_path })
@@ -68,16 +78,10 @@ class Brew {
   }
 
   async installed() {
+    const homebrewExists = await this.kernel.bin.exists("homebrew")
+    const cltStatus = homebrewExists ? await detectCommandLineTools() : { valid: false }
+    this.kernel.bin.brew_installed = homebrewExists && cltStatus.valid
     return this.kernel.bin.brew_installed
-    /*
-    let e = await this.kernel.bin.exists("homebrew")
-
-    let { stdout }= await this.kernel.bin.exec({ message: "xcode-select -p" }, (stream) => { })
-    let e2 = /(.*Library.*Developer.*CommandLineTools.*|.*Xcode.*Developer.*)/gi.test(stdout)
-    console.log({ e, e2, stdout })
-
-    return e && e2
-    */
   }
 
   uninstall(req, ondata) {
@@ -96,4 +100,20 @@ class Brew {
     }
   }
 }
+
+function needsManualXcodeAction(reason) {
+  return reason === "xcode license not accepted" || reason === "xcode first launch is incomplete"
+}
+
+function manualXcodeActionMessage(reason) {
+  if (reason === "xcode license not accepted") {
+    return "xcode license not accepted. open Xcode once and accept the license, then retry"
+  }
+  return "xcode first launch is incomplete. open Xcode once to finish setup, then retry"
+}
+
+function shouldRemoveCommandLineTools(reason) {
+  return typeof reason === "string" && reason.startsWith("command line tools version ") && reason.includes(" is below required ")
+}
+
 module.exports = Brew

package/kernel/bin/index.js

@@ -21,7 +21,6 @@ const LLVM = require('./llvm')
 const VS = require("./vs")
 const Cuda = require("./cuda")
 const Torch = require("./torch")
-const { detectCommandLineTools } = require('./xcode-tools')
 const { buildCondaListFromMeta } = require('./conda-meta')
 const { glob } = require('glob')
 const fakeUa = require('fake-useragent');
@@ -460,14 +459,7 @@ class Bin {
       this.installed.brew = new Set(brew)
 
 
-      // check brew_installed
-      let e = await this.kernel.bin.exists("homebrew")
-      const cltStatus = await detectCommandLineTools({
-        exec: (params) => this.exec(params, () => {})
-      })
-      console.log({ cltStatus })
-      this.brew_installed = e && cltStatus.valid
-
+      this.brew_installed = await this.kernel.bin.exists("homebrew")
       console.log("brew_installed", this.brew_installed)
 
     }
@@ -1036,7 +1028,8 @@ class Bin {
         let r = requirements[i]
         let fingerprint = JSON.stringify(r)
         let installed
-        if (fingerprint in this.requirements_cache) {
+        const canUseCache = r.name !== "brew" || r.type
+        if (canUseCache && fingerprint in this.requirements_cache) {
           let relevant = this.relevant(r)
           requirements[i].relevant = relevant
           if (relevant) {
@@ -1063,7 +1056,9 @@ class Bin {
               requirements[i].dependencies = dependencies
             }
             installed = await this.check_installed(r, dependencies)
-            this.requirements_cache[fingerprint] = installed
+            if (canUseCache) {
+              this.requirements_cache[fingerprint] = installed
+            }
             //if (installed) {
             //  // cache if true
             //  this.requirements_cache[fingerprint] = true

package/kernel/bin/xcode-tools.js

@@ -1,4 +1,5 @@
 const fs = require('fs')
+const { execFile } = require('child_process')
 const semver = require('semver')
 
 const MIN_CLT_VERSION = '13.0'
@@ -13,19 +14,17 @@ const PACKAGE_MATCHERS = [
   /^com\.apple\.pkg\.Xcode$/
 ]
 
-async function detectCommandLineTools({ exec }) {
-  if (typeof exec !== 'function') {
-    throw new Error('detectCommandLineTools requires an exec function')
-  }
-
-  const run = (message) => exec({ message, conda: { skip: true } })
+async function detectCommandLineTools({ exec } = {}) {
+  const run = (typeof exec === 'function')
+    ? (message) => exec({ message, conda: { skip: true } })
+    : (message) => execCommand(message)
 
   let selectResult
   try {
     selectResult = await run('xcode-select -p')
   } catch (err) {
     console.log('[CLT] xcode-select -p failed', err)
-    return { valid: false, reason: 'xcode-select -p failed' }
+    return invalidFromError('xcode-select -p', err, 'xcode-select -p failed')
   }
 
   const developerPath = (selectResult && selectResult.stdout ? selectResult.stdout : '')
@@ -56,7 +55,7 @@ async function detectCommandLineTools({ exec }) {
     clangResult = await run('xcrun --find clang')
   } catch (err) {
     console.log('[CLT] xcrun --find clang failed', err)
-    return { valid: false, reason: 'unable to locate clang via xcrun' }
+    return invalidFromError('xcrun --find clang', err, 'unable to locate clang via xcrun')
   }
 
   const clangStdout = clangResult && clangResult.stdout ? clangResult.stdout : ''
@@ -109,6 +108,42 @@ async function detectCommandLineTools({ exec }) {
   return status
 }
 
+async function execCommand(message) {
+  const tokens = String(message || '').trim().split(/\s+/).filter(Boolean)
+  const file = tokens.shift()
+  if (!file) {
+    throw new Error('missing command')
+  }
+  return new Promise((resolve, reject) => {
+    execFile(file, tokens, {
+      timeout: 8000,
+      maxBuffer: 1024 * 1024,
+    }, (error, stdout, stderr) => {
+      if (error) {
+        error.stdout = stdout
+        error.stderr = stderr
+        reject(error)
+        return
+      }
+      resolve({ stdout })
+    })
+  })
+}
+
+function invalidFromError(command, error, fallbackReason) {
+  const stderr = error && typeof error.stderr === 'string' ? error.stderr : ''
+  if (error && error.killed && error.signal === 'SIGTERM') {
+    return { valid: false, reason: `${command} timed out` }
+  }
+  if (/license agreements/i.test(stderr)) {
+    return { valid: false, reason: 'xcode license not accepted' }
+  }
+  if (/runfirstlaunch|first launch/i.test(stderr)) {
+    return { valid: false, reason: 'xcode first launch is incomplete' }
+  }
+  return { valid: false, reason: fallbackReason }
+}
+
 async function pkgInfoFor(run, pkgId) {
   try {
     const result = await run(`pkgutil --pkg-info=${pkgId}`)

package/kernel/index.js

@@ -1063,9 +1063,6 @@ class Kernel {
             console.warn("Git init error:", err && err.message ? err.message : err)
           })
           this.shell.init().then(async () => {
-            this.bin.check({
-              bin: this.bin.preset("dev"),
-            })
             if (this.envs) {
               this.template.update({
                 env: this.envs,

package/package.json

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

package/server/index.js

@@ -5062,7 +5062,9 @@ class Server {
 
 
     await this.kernel.init({ port: this.port})
-    await Environment.init({}, this.kernel)
+    if (this.kernel.homedir) {
+      await Environment.init({}, this.kernel)
+    }
     this.kernel.server_port = this.port
     this.kernel.peer.start(this.kernel)
 

package/server/views/install.ejs

@@ -260,6 +260,9 @@ document.addEventListener("DOMContentLoaded", async () => {
       } else if (packet.type === "result") {
         resolve() 
       } else if (packet.type === "error") {
+        if (typeof packet.data === "string" && packet.data.includes("__PINOKIO_BLOCKER__")) {
+          return
+        }
         //term.write("\r\n" + packet.data + "\r\n")
         ModalInput({
           title: "Error",
@@ -279,12 +282,16 @@ document.addEventListener("DOMContentLoaded", async () => {
           document.querySelector("#status-screen").innerHTML = packet.data.html
           let audio = new Audio("/chime.mp3")
           audio.play()
-          ModalInput({
+          await ModalInput({
             title: "Notice",
             type: "modal",
             description: packet.data.html,
             confirm: "OK",
           })
+          if (packet.data.blocker) {
+            location.href = document.querySelector("#callback").value
+            return
+          }
         }
       } else if (packet.type === "notify2") {
         console.log("HTML", packet.data)

package/server/views/terminals.ejs

@@ -8232,11 +8232,28 @@ body.dark .swal2-popup.pinokio-diff-modal .pinokio-modal-footer--commit .pinokio
     if (!column) {
       return
     }
-    const terminalId = normalizeTerminalId(column.dataset.sessionTerminalId || "")
-    if (!terminalId) {
+    if (type === "terminal-input") {
       return
     }
-    if (type === "terminal-input") {
+    if (type === "idle") {
+      const workspacePath = normalizeIndex(column.dataset.sessionCwd || "")
+      if (workspacePath) {
+        fetchWorkspaceGitStatus(workspacePath, { force: true }).catch(() => {
+        })
+      }
+      refreshSessionItems({
+        sync: true,
+        query: currentSessionQuery,
+        workspaceKey: workspaceViewState.mode === "sessions" ? workspaceViewState.key : ""
+      }).then((loaded) => {
+        if (loaded || hasAttemptedSessionLoad) {
+          refreshChooserRows({ autoLoad: false })
+        }
+      })
+      return
+    }
+    const terminalId = normalizeTerminalId(column.dataset.sessionTerminalId || "")
+    if (!terminalId) {
       return
     }
     if (type === "stream" || type === "start") {
@@ -8261,18 +8278,6 @@ body.dark .swal2-popup.pinokio-diff-modal .pinokio-modal-footer--commit .pinokio
       }
       return
     }
-    if (type === "idle") {
-      void refreshSessionItems({
-        sync: true,
-        query: currentSessionQuery,
-        workspaceKey: workspaceViewState.mode === "sessions" ? workspaceViewState.key : ""
-      }).then((loaded) => {
-        if (loaded || hasAttemptedSessionLoad) {
-          refreshChooserRows({ autoLoad: false })
-        }
-      })
-      return
-    }
     if (type === "disconnect") {
       const removedTemporary = removeTemporarySessionByTerminalId(terminalId)
       if (removedTemporary) {
@@ -9689,7 +9694,9 @@ body.dark .swal2-popup.pinokio-diff-modal .pinokio-modal-footer--commit .pinokio
     setColumnLayout()
     ensureLayout()
     refreshChooserRows()
-    void refreshSessionItems({
+    fetchWorkspaceGitStatus(targetWorkspaceKey, { force: true }).catch(() => {
+    })
+    refreshSessionItems({
       query: "",
       workspaceKey: targetWorkspaceKey
     }).then((loaded) => {
@@ -10020,6 +10027,10 @@ body.dark .swal2-popup.pinokio-diff-modal .pinokio-modal-footer--commit .pinokio
       )
       topSessionRefreshButton.disabled = true
       try {
+        if (workspaceKey) {
+          fetchWorkspaceGitStatus(workspaceKey, { force: true }).catch(() => {
+          })
+        }
         const refreshed = await refreshSessionItems({
           sync: true,
           limit: getCurrentSessionRefreshLimit(),