pinokiod 7.1.71 → 7.1.73

package/kernel/bin/bluefairy.js

@@ -4,7 +4,7 @@ const semver = require('semver')
 
 class Bluefairy {
   description = "Installs Bluefairy, a standalone package freshness guard."
-  version = ">=0.0.27"
+  version = ">=0.0.28"
 
   packageName() {
     return "bluefairy"
@@ -51,11 +51,15 @@ class Bluefairy {
         path.resolve(binDir, "bluefairy-activate"),
         path.resolve(binDir, "bluefairy-activate.cmd"),
         path.resolve(binDir, "bluefairy-activate.ps1"),
+        path.resolve(binDir, "bluefairy-deactivate"),
+        path.resolve(binDir, "bluefairy-deactivate.cmd"),
+        path.resolve(binDir, "bluefairy-deactivate.ps1"),
       ]
     }
     return [
       path.resolve(binDir, "bluefairy"),
       path.resolve(binDir, "bluefairy-activate"),
+      path.resolve(binDir, "bluefairy-deactivate"),
     ]
   }
 

package/package.json

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

package/server/index.js

@@ -8268,6 +8268,67 @@ class Server {
         Math.random().toString(16).slice(2)
       ].join("-")
     }
+    const prepareUniversalLauncherTarget = async ({ type, name, prompt, tool, uploadToken }) => {
+      const normalizedType = typeof type === "string" ? type.trim().toLowerCase() : ""
+      if (normalizedType !== "ask" && normalizedType !== "create_plugin") {
+        const error = new Error("Unsupported launcher type.")
+        error.status = 400
+        throw error
+      }
+
+      const pluginHref = resolveUniversalLauncherPluginHref(tool)
+      let folderName = typeof name === "string" ? name.trim() : ""
+      if (normalizedType === "ask" && !folderName) {
+        folderName = await generateTerminalWorkspaceFolderName()
+      }
+      if (!folderName) {
+        const error = new Error("Folder name is required.")
+        error.status = 400
+        throw error
+      }
+
+      const rootDir = normalizedType === "ask"
+        ? path.resolve(getTerminalWorkspacesRoot())
+        : path.resolve(this.kernel.path("plugin"))
+      const targetPath = await createLauncherTargetFolder(rootDir, folderName)
+      try {
+        await copyLauncherUploadsToDir(uploadToken, targetPath)
+      } catch (error) {
+        await fs.promises.rm(targetPath, { recursive: true, force: true }).catch(() => {})
+        throw error
+      }
+      try {
+        await bootstrapLauncherInstructionFiles(targetPath)
+      } catch (error) {
+        await fs.promises.rm(targetPath, { recursive: true, force: true }).catch(() => {})
+        throw error
+      }
+      try {
+        await persistLauncherPromptContext(targetPath, {
+          prompt,
+          includeSpec: true,
+          includeRequest: normalizedType === "ask"
+        })
+      } catch (error) {
+        await fs.promises.rm(targetPath, { recursive: true, force: true }).catch(() => {})
+        throw error
+      }
+
+      const params = new URLSearchParams()
+      params.set("cwd", targetPath)
+      params.set("chrome", "full")
+      if (prompt) {
+        params.set("prompt", prompt)
+      }
+
+      return {
+        ok: true,
+        type: normalizedType,
+        name: folderName,
+        cwd: targetPath,
+        url: `${pluginHref}?${params.toString()}`
+      }
+    }
     const prepareUniversalCreateApp = async ({ name, prompt, tool, uploadToken }) => {
       const folderName = typeof name === "string" ? name.trim() : ""
       if (!folderName) {
@@ -8345,6 +8406,44 @@ class Server {
       }
       return `${baseName}-${Date.now()}`
     }
+    const suggestTaskWorkspaceName = async (task) => {
+      const baseName = taskPackages.slugify(
+        task && task.config ? task.config.title : (task && task.id ? task.id : "task"),
+        "task"
+      )
+      let links = { workspaces: [] }
+      try {
+        links = await taskWorkspaceLinks.listTaskWorkspaces(task && task.id ? task.id : "", {
+          root: "workspaces",
+          pruneMissing: true
+        })
+      } catch (_) {
+      }
+      const existingNames = new Set(
+        (Array.isArray(links.workspaces) ? links.workspaces : [])
+          .map((workspace) => {
+            const ref = workspace && typeof workspace.ref === "string" ? workspace.ref.trim() : ""
+            if (!ref) {
+              return ""
+            }
+            const relative = ref.split("/").slice(1).join("/")
+            return relative ? path.posix.basename(relative).toLowerCase() : ""
+          })
+          .filter(Boolean)
+      )
+      let attempt = 0
+      while (attempt < 1000) {
+        const suffix = attempt === 0 ? "" : `-${attempt + 1}`
+        const maxBaseLength = Math.max(1, 80 - suffix.length)
+        const candidateBase = baseName.slice(0, maxBaseLength) || "task"
+        const candidate = `${candidateBase}${suffix}`
+        if (!existingNames.has(candidate.toLowerCase())) {
+          return candidate
+        }
+        attempt += 1
+      }
+      return `${baseName}-${Date.now()}`
+    }
     const getTaskLaunchTarget = (taskConfig) => {
       const validatedTaskConfig = taskPackages.validateTaskConfig(taskConfig)
       return validatedTaskConfig.target
@@ -8656,7 +8755,7 @@ class Server {
       const taskUi = buildTaskPresentationState(task, shareState)
       const sidebarContext = await buildTaskSidebarContext()
       const suggestedFolderName = task && task.config && usesWorkspaceTaskTarget(task.config)
-        ? ""
+        ? await suggestTaskWorkspaceName(task)
         : taskPackages.slugify(task && task.config ? task.config.title : task.id, task && task.id ? task.id : "task")
       const renderedPrompt = taskPackages.applyTemplateValues(task.template, promptValues)
       const protocol = (req.$source && req.$source.protocol) || req.protocol || "http"
@@ -9943,37 +10042,84 @@ class Server {
       }
 
       const pluginHref = resolveUniversalLauncherPluginHref(selectedTool)
+      const launchTarget = getTaskLaunchTarget(task.config)
       const launchRoot = getTaskLaunchRoot(task.config)
       let folderName = folderNameInput
       if (!folderName) {
-        if (usesWorkspaceTaskTarget(task.config)) {
-          folderName = await generateTerminalWorkspaceFolderName()
+        if (launchTarget === "workspaces") {
+          folderName = await suggestTaskWorkspaceName(task)
         } else {
-          folderName = await suggestTaskFolderName(launchRoot, task.config.title)
+          await renderTaskLaunchPage(req, res, task, {
+            selectedTool,
+            inputValues,
+            folderName: "",
+            error: "Folder name is required."
+          })
+          return
         }
       }
 
-      let targetPath
-      try {
-        targetPath = await createLauncherTargetFolder(launchRoot, folderName)
-      } catch (error) {
+      const prompt = taskPackages.applyTemplateValues(task.template, filterFilledTaskInputValues(inputValues)).trim()
+      if (!prompt) {
         await renderTaskLaunchPage(req, res, task, {
           selectedTool,
           inputValues,
           folderName: folderNameInput || folderName,
-          error: error && error.message ? error.message : "Failed to create task folder."
+          error: "The rendered task prompt is empty."
         })
         return
       }
 
-      const prompt = taskPackages.applyTemplateValues(task.template, filterFilledTaskInputValues(inputValues)).trim()
-      if (!prompt) {
-        await fs.promises.rm(targetPath, { recursive: true, force: true }).catch(() => {})
+      if (launchTarget === "api") {
+        try {
+          const payload = await prepareUniversalCreateApp({
+            name: folderName,
+            prompt,
+            tool: selectedTool,
+            uploadToken: ""
+          })
+          res.redirect(payload.url)
+        } catch (error) {
+          await renderTaskLaunchPage(req, res, task, {
+            selectedTool,
+            inputValues,
+            folderName: folderNameInput || folderName,
+            error: error && error.message ? error.message : "Failed to create app."
+          })
+        }
+        return
+      }
+
+      if (launchTarget === "plugin") {
+        try {
+          const payload = await prepareUniversalLauncherTarget({
+            type: "create_plugin",
+            name: folderName,
+            prompt,
+            tool: selectedTool,
+            uploadToken: ""
+          })
+          res.redirect(payload.url)
+        } catch (error) {
+          await renderTaskLaunchPage(req, res, task, {
+            selectedTool,
+            inputValues,
+            folderName: folderNameInput || folderName,
+            error: error && error.message ? error.message : "Failed to initialize task folder."
+          })
+        }
+        return
+      }
+
+      let targetPath
+      try {
+        targetPath = await createLauncherTargetFolder(launchRoot, folderName)
+      } catch (error) {
         await renderTaskLaunchPage(req, res, task, {
           selectedTool,
           inputValues,
           folderName: folderNameInput || folderName,
-          error: "The rendered task prompt is empty."
+          error: error && error.message ? error.message : "Failed to create task folder."
         })
         return
       }
@@ -10006,6 +10152,29 @@ class Server {
 	        })
 	        return
 	      }
+	      if (launchTarget === "workspaces") {
+	        const workspaceRef = taskWorkspaceLinks.createWorkspaceRef("workspaces", targetPath)
+	        if (!workspaceRef) {
+	          await renderTaskLaunchPage(req, res, task, {
+	            selectedTool,
+	            inputValues,
+	            folderName: folderNameInput || folderName,
+	            error: "Failed to remember the created workspace."
+	          })
+	          return
+	        }
+	        try {
+	          await taskWorkspaceLinks.touchTaskWorkspace(task.id, workspaceRef)
+	        } catch (error) {
+	          await renderTaskLaunchPage(req, res, task, {
+	            selectedTool,
+	            inputValues,
+	            folderName: folderNameInput || folderName,
+	            error: error && error.message ? error.message : "Failed to remember the created workspace."
+	          })
+	          return
+	        }
+	      }
 
 	      const params = new URLSearchParams()
       params.set("cwd", targetPath)
@@ -10438,9 +10607,7 @@ class Server {
       try {
         const body = req.body && typeof req.body === "object" ? req.body : {}
         const type = typeof body.type === "string" ? body.type.trim().toLowerCase() : ""
-        const requestedFolderName = typeof body.name === "string" ? body.name.trim() : ""
         const prompt = typeof body.prompt === "string" ? body.prompt.trim() : ""
-        const pluginHref = resolveUniversalLauncherPluginHref(body.tool)
 
         if (type !== "ask" && type !== "create_plugin") {
           res.status(400).json({
@@ -10449,59 +10616,14 @@ class Server {
           })
           return
         }
-        let folderName = requestedFolderName
-        if (type === "ask" && !folderName) {
-          folderName = await generateTerminalWorkspaceFolderName()
-        }
-        if (!folderName) {
-          res.status(400).json({
-            ok: false,
-            error: "Folder name is required."
-          })
-          return
-        }
-
-        const rootDir = type === "ask"
-          ? path.resolve(getTerminalWorkspacesRoot())
-          : path.resolve(this.kernel.path("plugin"))
-        const targetPath = await createLauncherTargetFolder(rootDir, folderName)
-	        try {
-	          await copyLauncherUploadsToDir(body.uploadToken, targetPath)
-	        } catch (error) {
-	          await fs.promises.rm(targetPath, { recursive: true, force: true }).catch(() => {})
-	          throw error
-	        }
-	        try {
-	          await bootstrapLauncherInstructionFiles(targetPath)
-	        } catch (error) {
-	          await fs.promises.rm(targetPath, { recursive: true, force: true }).catch(() => {})
-	          throw error
-	        }
-	        try {
-	          await persistLauncherPromptContext(targetPath, {
-	            prompt,
-	            includeSpec: true,
-	            includeRequest: type === "ask"
-	          })
-	        } catch (error) {
-	          await fs.promises.rm(targetPath, { recursive: true, force: true }).catch(() => {})
-	          throw error
-	        }
-
-	        const params = new URLSearchParams()
-        params.set("cwd", targetPath)
-        params.set("chrome", "full")
-        if (prompt) {
-          params.set("prompt", prompt)
-        }
-
-        res.json({
-          ok: true,
+        const payload = await prepareUniversalLauncherTarget({
           type,
-          name: folderName,
-          cwd: targetPath,
-          url: `${pluginHref}?${params.toString()}`
+          name: typeof body.name === "string" ? body.name : "",
+          prompt,
+          tool: typeof body.tool === "string" ? body.tool : "",
+          uploadToken: typeof body.uploadToken === "string" ? body.uploadToken : ""
         })
+        res.json(payload)
       } catch (error) {
         const status = Number.isInteger(error && error.status) ? error.status : 500
         res.status(status).json({
@@ -12682,7 +12804,7 @@ class Server {
 
       await this.kernel.peer.check_peers()
 
-      let list = this.getPeers()
+      let list = this.kernel.peer.info ? this.getPeers() : []
 
 //      let list = this.getPeerInfo()
       let processes = []
@@ -12695,8 +12817,22 @@ class Server {
           peer = item
         }
       }
+      let peer_info = host && this.kernel.peer.info ? this.kernel.peer.info[host] : null
+      if (!peer_info && req.params.name === this.kernel.peer.name) {
+        try {
+          await this.kernel.peer.refresh_host(this.kernel.peer.host)
+        } catch (e) {
+        }
+        host = this.kernel.peer.host
+        peer_info = this.kernel.peer.info && this.kernel.peer.info[host] ? this.kernel.peer.info[host] : null
+        if (peer_info) {
+          peer = peer_info
+        }
+      }
       try {
-        processes = this.kernel.peer.info[host].router_info
+        if (peer_info) {
+          processes = peer_info.router_info
+        }
         for(let i=0; i<processes.length; i++) {
           if (!processes[i].icon) {
             if (protocol === "https") {
@@ -12709,8 +12845,8 @@ class Server {
         }
       } catch (e) {
       }
-      let installed = this.kernel.peer.info[host].installed
-      let serverless_mapping = this.kernel.peer.info[host].rewrite_mapping
+      let installed = peer_info ? peer_info.installed : []
+      let serverless_mapping = peer_info ? peer_info.rewrite_mapping : {}
       let serverless = Object.keys(serverless_mapping).map((name) => {
         return serverless_mapping[name]
       })
@@ -12719,7 +12855,7 @@ class Server {
         return this.kernel.router.rewrite_mapping[key]
       })
       const peerAccess = await this.composePeerAccessPayload()
-      const allow_dns_creation = req.params.name === this.kernel.peer.name
+      const allow_dns_creation = !!peer_info && req.params.name === this.kernel.peer.name
       res.render("net", {
         static_routes,
         selected_name: req.params.name,
@@ -12732,7 +12868,7 @@ class Server {
         processes,
         installed,
         serverless,
-        error: null,
+        error: peer_info ? null : `Peer "${req.params.name}" is not ready yet. Try again in a moment.`,
         list,
         host,
         peer,

package/server/public/task-launcher.css

@@ -280,15 +280,25 @@ body.task-page .task-shell {
 }
 
 .task-detail-sidebar {
+  position: relative;
   min-width: 0;
   align-self: start;
   margin-top: 0;
-  padding: 2px 0 0 28px;
-  border-left: 1px solid var(--task-border);
+  padding: 2px 0 0 40px;
   border-radius: 0;
   background: transparent;
 }
 
+.task-detail-sidebar::before {
+  content: "";
+  position: absolute;
+  top: 0;
+  bottom: 0;
+  left: 12px;
+  width: 1px;
+  background: var(--task-border);
+}
+
 .task-shell {
   width: min(880px, calc(100vw - 32px));
   margin: 24px auto 40px;
@@ -2758,10 +2768,13 @@ body.dark .plugin-option .option-icon {
   .task-detail-sidebar {
     margin-top: 0;
     padding: 18px 0 0;
-    border-left: 0;
     border-top: 1px solid var(--task-border);
   }
 
+  .task-detail-sidebar::before {
+    display: none;
+  }
+
   .task-shell {
     width: min(100vw - 20px, 100%);
     margin: 12px auto 20px;

package/server/views/task_launch.ejs

@@ -24,6 +24,10 @@
       ? 'Creates a new plugin.'
       : 'Runs in a new workspace.'
   const folderMeta = effectiveTaskTarget === 'workspaces' ? 'Optional' : ''
+  const folderRequired = effectiveTaskTarget !== 'workspaces'
+  const folderPlaceholder = effectiveTaskTarget === 'workspaces'
+    ? (suggestedFolderName || 'auto-generated')
+    : 'Enter folder name, e.g. my-project'
   const headerDescription = task.config.description && !/{{/.test(task.config.description)
     ? task.config.description
     : ''
@@ -157,8 +161,8 @@
               </label>
 
               <label class="task-field">
-                <span class="task-label">Folder<% if (folderMeta) { %><span class="task-label-meta"><%= folderMeta %></span><% } %></span>
-                <input class="task-input" type="text" name="folderName" value="<%= folderName || '' %>" placeholder="<%= suggestedFolderName || 'auto-generated' %>">
+                <span class="task-label">Folder<% if (folderRequired) { %><span class="task-label-required">*</span><% } %><% if (folderMeta) { %><span class="task-label-meta"><%= folderMeta %></span><% } %></span>
+                <input class="task-input" type="text" name="folderName" value="<%= folderName || '' %>" placeholder="<%= folderPlaceholder %>" <%= folderRequired ? 'required' : '' %>>
               </label>
             </div>
           </section>