pinokiod 7.2.17 → 7.2.18

package/server/index.js

@@ -2758,10 +2758,12 @@ class Server {
           } else {
             resolved = runner(this.kernel, this.kernel.info)
           }
-          runnable = resolved && Array.isArray(resolved[actionKey]) && resolved[actionKey].length > 0
+          const action = resolved ? resolved[actionKey] : null
+          runnable = typeof action === "function" || (Array.isArray(action) && action.length > 0)
         } else {
-          runnable = runner && Array.isArray(runner[actionKey]) && runner[actionKey].length > 0
           resolved = runner
+          const action = resolved ? resolved[actionKey] : null
+          runnable = typeof action === "function" || (Array.isArray(action) && action.length > 0)
         }
 
         let template = "terminal"
@@ -2870,10 +2872,10 @@ class Server {
           const protectionPreference = protectionAppId && this.appPreferences && typeof this.appPreferences.getPreference === "function"
             ? await this.appPreferences.getPreference(protectionAppId)
             : null
-          const draftWatchEnabled = this.kernel.watch && typeof this.kernel.watch.hasHandler === "function"
-            ? this.kernel.watch.hasHandler(resolved, "draft")
+          const noteWatchEnabled = this.kernel.watch && typeof this.kernel.watch.hasHandler === "function"
+            ? this.kernel.watch.hasHandler(resolved, "note")
             : false
-          const draftWatchCwd = draftWatchEnabled
+          const noteWatchCwd = noteWatchEnabled
             ? (req.query.cwd || path.dirname(filepath))
             : ""
           const activeProcessWait = this.kernel.activeProcessWaits && this.kernel.activeProcessWaits[filepath]
@@ -2884,8 +2886,8 @@ class Server {
             projectName: (pathComponents.length > 0 ? pathComponents[0] : ''),
             protection_app_id: protectionAppId,
             protection_enabled: protectionPreference ? protectionPreference.protection_enabled !== false : false,
-            draft_watch_enabled: draftWatchEnabled,
-            draft_watch_cwd: draftWatchCwd,
+            note_watch_enabled: noteWatchEnabled,
+            note_watch_cwd: noteWatchCwd,
             active_process_wait: activeProcessWait ? {
               title: activeProcessWait.title,
               description: activeProcessWait.description,
@@ -5311,15 +5313,7 @@ class Server {
     return normalized
   }
   isValidBundledPluginConfig(pluginConfig) {
-    if (!pluginConfig || !Array.isArray(pluginConfig.run)) {
-      return false
-    }
-    for (const key of Object.keys(pluginConfig)) {
-      if (typeof pluginConfig[key] === "function") {
-        return false
-      }
-    }
-    return true
+    return PluginSources.isValidPluginConfig(pluginConfig)
   }
   isPathInsideRootForBundledPlugin(candidatePath, rootPath) {
     const relative = path.relative(rootPath, candidatePath)
@@ -6857,9 +6851,9 @@ class Server {
             cwd: typeof pluginItem.ownerApp.cwd === "string" ? pluginItem.ownerApp.cwd : "",
           }
           : null,
-        hasInstall: Array.isArray(pluginItem?.install),
-        hasUninstall: Array.isArray(pluginItem?.uninstall),
-        hasUpdate: Array.isArray(pluginItem?.update),
+        hasInstall: PluginSources.isAction(pluginItem?.install),
+        hasUninstall: PluginSources.isAction(pluginItem?.uninstall),
+        hasUpdate: PluginSources.isAction(pluginItem?.update),
         category,
         categoryTitle: category === "ide" ? "Desktop Plugin" : "Terminal Plugin",
         categorySubtitle: category === "ide" ? "Launch externally" : "Launch in Pinokio",
@@ -8415,12 +8409,12 @@ class Server {
       defaultRegistryUrl: DEFAULT_REGISTRY_URL
     })
     this.features = features
-    const drafts = features.drafts.service
-    this.drafts = drafts
+    const notes = features.notes.service
+    this.notes = notes
     const workspaceCatalog = createWorkspaceCatalogService({
       kernel: this.kernel,
       workspaceRuntime,
-      drafts
+      notes
     })
     registerWorkspacesRoutes(this.app, {
       workspaceCatalog,
@@ -9744,6 +9738,13 @@ class Server {
       })
     }))
 
+    this.app.get("/tasker", ex(async (req, res) => {
+      res.render("tasker", {
+        theme: this.theme,
+        agent: req.agent,
+      })
+    }))
+
     this.app.get("/tasks/new", ex(async (req, res) => {
       const sourceWorkspace = normalizeTaskBuilderSourceWorkspace(req.query.sourceWorkspaceCwd)
       const lockTargetSelection = req.query.lockTarget === "1" || req.query.lockTarget === "true"
@@ -13415,9 +13416,21 @@ class Server {
 //      }
 //    }))
     this.app.post("/env", ex(async (req, res) => {
-      let fullpath = path.resolve(this.kernel.homedir, req.body.filepath, "ENVIRONMENT")
+      const requestFilepath = typeof req.body.filepath === "string" ? req.body.filepath : ""
+      const requestRoot = path.resolve(this.kernel.homedir, requestFilepath)
+      let fullpath = path.resolve(requestRoot, "ENVIRONMENT")
+      if (!(await this.kernel.exists(fullpath))) {
+        const normalizedFilepath = requestFilepath.replace(/\\/g, "/")
+        const filepathParts = normalizedFilepath.split("/").filter(Boolean)
+        if (filepathParts[0] === "api" && filepathParts[1] && filepathParts.length === 2) {
+          const launcher = await this.kernel.api.launcher(filepathParts[1])
+          if (launcher && launcher.launcher_root) {
+            fullpath = path.resolve(launcher.root, launcher.launcher_root, "ENVIRONMENT")
+          }
+        }
+      }
       let updated = req.body.vals
-      let hosts = req.body.hosts
+      let hosts = req.body.hosts || {}
       await Util.update_env(fullpath, updated)
       const normalizedFilepath = typeof req.body.filepath === "string"
         ? req.body.filepath.replace(/\\/g, "/")
@@ -13570,14 +13583,15 @@ class Server {
     this.app.get("/pre/api/:name", ex(async (req, res) => {
       let launcher = await this.kernel.api.launcher(req.params.name)
       let config = launcher.script
-      if (config && config.pre) {
-        config.pre.forEach((item) => {
-          if (item.icon) {
+      if (config && Array.isArray(config.pre)) {
+        const items = config.pre.filter((item) => item && typeof item === "object")
+        items.forEach((item) => {
+          if (typeof item.icon === "string" && item.icon) {
             item.icon = `/api/${req.params.name}/${item.icon}?raw=true`
           } else {
             item.icon = "/pinokio-black.png"
           }
-          if (!item.href.startsWith("http")) {
+          if (typeof item.href === "string" && item.href && !item.href.startsWith("http")) {
             item.href = path.resolve(this.kernel.homedir, "api", req.params.name, item.href)
           }
         })
@@ -13588,7 +13602,7 @@ class Server {
           theme: this.theme,
           agent: req.agent,
           name: req.params.name,
-          items: config.pre,
+          items,
           env
         })
       } else {
@@ -14074,7 +14088,7 @@ class Server {
               mode = "launch_type.desktop"
             } else if (launchType === "terminal") {
               mode = "launch_type.terminal"
-            } else {
+            } else if (Array.isArray(item.run)) {
               for(let step of item.run) {
                 if (step.method === "exec") {
                   mode = "exec" 
@@ -14089,6 +14103,8 @@ class Server {
                   break
                 }
               }
+            } else if (typeof item.run === "function") {
+              mode = "shell"
             }
             if (mode === "launch_type.desktop" || mode === "exec" || mode === "launch") {
               item.type = "Open"
@@ -14141,6 +14157,20 @@ class Server {
         spec = await fs.promises.readFile(path.resolve(filepath, "SPEC.md"), "utf8")
       } catch (e) {
       }
+      const registryEnabled = await this.isRegistryEnabled().catch(() => false)
+      let registry_parent_url = ""
+      if (registryEnabled) {
+        try {
+          registry_parent_url = await git.getConfig({
+            fs,
+            http,
+            dir: filepath,
+            path: "remote.origin.url"
+          }) || ""
+        } catch (_) {
+          registry_parent_url = ""
+        }
+      }
       res.render("d", {
         filepath,
         spec,
@@ -14151,6 +14181,7 @@ class Server {
         install: this.install,
         agent: req.agent,
         theme: this.theme,
+        registry_parent_url,
         //dynamic: plugin_menu
         dynamic,
       })

package/server/lib/content_validation.js

@@ -147,9 +147,9 @@ function createContentValidationService({ kernel }) {
       absolutePath,
       dir: pluginDir,
       config,
-      hasInstall: Array.isArray(config && config.install),
-      hasUpdate: Array.isArray(config && config.update),
-      hasUninstall: Array.isArray(config && config.uninstall),
+      hasInstall: PluginSources.isAction(config && config.install),
+      hasUpdate: PluginSources.isAction(config && config.update),
+      hasUninstall: PluginSources.isAction(config && config.uninstall),
       image: null,
     }
 
@@ -252,21 +252,32 @@ function createContentValidationService({ kernel }) {
         { file: absolutePath }
       ))
     } else {
-      if (!Array.isArray(config.run)) {
+      if (!PluginSources.isAction(config.run)) {
         errors.push(buildError(
-          "Plugins must define a top-level run array.",
-          "Add `run: [...]` to pinokio.js.",
+          "Plugins must define a top-level run array or function.",
+          "Add `run: [...]` or `run: async (ctx) => [...]` to pinokio.js.",
           { file: absolutePath }
         ))
       }
-      const topLevelFunctionKeys = Object.keys(config).filter((key) => typeof config[key] === "function")
+      const topLevelFunctionKeys = Object.keys(config).filter((key) => {
+        return typeof config[key] === "function" && !PluginSources.ACTION_KEYS.has(key)
+      })
       if (topLevelFunctionKeys.length > 0) {
         errors.push(buildError(
           `Top-level function fields are not supported: ${topLevelFunctionKeys.join(", ")}.`,
-          "Move those functions out of pinokio.js or replace them with data.",
+          "Only action fields such as run, install, uninstall, and update may be functions.",
           { file: absolutePath }
         ))
       }
+      for (const key of PluginSources.ACTION_KEYS) {
+        if (key in config && !PluginSources.isAction(config[key])) {
+          errors.push(buildError(
+            `Plugin action ${key} must be an array or function.`,
+            `Set ${key} to an array or async function returning an array.`,
+            { file: absolutePath }
+          ))
+        }
+      }
       if (normalizedPath.startsWith("/plugin/")) {
         const declaredPath = typeof config.path === "string" ? config.path.trim() : ""
         if (declaredPath !== "plugin") {

package/server/lib/workspace_catalog.js

@@ -52,13 +52,13 @@ function sortWorkspaces(items, sort) {
   return sorted
 }
 
-function newestDraft(drafts) {
-  return [...drafts].sort((a, b) => {
+function newestNote(notes) {
+  return [...notes].sort((a, b) => {
     return (new Date(b.updatedAt || 0).getTime() || 0) - (new Date(a.updatedAt || 0).getTime() || 0)
   })[0] || null
 }
 
-function createWorkspaceCatalogService({ kernel, workspaceRuntime, drafts }) {
+function createWorkspaceCatalogService({ kernel, workspaceRuntime, notes }) {
   async function list(options = {}) {
     const sort = normalizeSortMode(options.sort)
     const root = path.resolve(kernel.path("workspaces"))
@@ -71,14 +71,14 @@ function createWorkspaceCatalogService({ kernel, workspaceRuntime, drafts }) {
       liveByPath.set(normalizePathKey(group.cwd), group)
     }
 
-    const draftByPath = new Map()
-    const pendingDrafts = drafts ? await drafts.listPending({}).catch(() => []) : []
-    for (const draft of pendingDrafts) {
-      if (!draft.cwd) continue
-      const key = normalizePathKey(draft.cwd)
-      const list = draftByPath.get(key) || []
-      list.push(draft)
-      draftByPath.set(key, list)
+    const noteByPath = new Map()
+    const pendingNotes = notes ? await notes.listPending({}).catch(() => []) : []
+    for (const note of pendingNotes) {
+      if (!note.cwd) continue
+      const key = normalizePathKey(note.cwd)
+      const list = noteByPath.get(key) || []
+      list.push(note)
+      noteByPath.set(key, list)
     }
 
     const folders = entries.filter((entry) => entry.isDirectory())
@@ -91,13 +91,13 @@ function createWorkspaceCatalogService({ kernel, workspaceRuntime, drafts }) {
       const live = liveByPath.get(key)
       const shells = live?.shells || []
       const scripts = live?.scripts || []
-      const workspaceDrafts = draftByPath.get(key) || []
-      const draft = newestDraft(workspaceDrafts)
+      const workspaceNotes = noteByPath.get(key) || []
+      const note = newestNote(workspaceNotes)
       const modifiedAtMs = stats?.mtimeMs || 0
       const lastOpenedAtMs = latestTimestamp([
         modifiedAtMs,
         ...shells.map((shell) => shell.start_time),
-        ...workspaceDrafts.map((item) => item.updatedAt),
+        ...workspaceNotes.map((item) => item.updatedAt),
       ])
       const primaryShell = shells.length === 1 ? shells[0] : null
       const primaryScript = scripts.length === 1 ? scripts[0] : null
@@ -116,12 +116,12 @@ function createWorkspaceCatalogService({ kernel, workspaceRuntime, drafts }) {
         counts: {
           shells: shells.length,
           scripts: scripts.length,
-          drafts: workspaceDrafts.length,
+          notes: workspaceNotes.length,
         },
         shells,
         scripts,
-        draft,
-        draftReady: Boolean(draft),
+        note,
+        noteReady: Boolean(note),
         primaryUrl: primaryScript?.url || primaryShell?.url || null,
         launchUrl: toRoutePath(cwd),
       })
@@ -140,7 +140,7 @@ function createWorkspaceCatalogService({ kernel, workspaceRuntime, drafts }) {
         total: items.length,
         running: running.length,
         offline: offline.length,
-        drafts: items.filter((item) => item.draftReady).length,
+        notes: items.filter((item) => item.noteReady).length,
       },
     }
   }

package/server/public/task-launcher.css

@@ -1575,11 +1575,19 @@ body.dark .task-link-button.danger {
 }
 
 .task-run-footer {
-  margin-top: 14px;
+  display: grid;
+  gap: 8px;
+  margin-top: 2px;
+  padding-top: 14px;
+  border-top: 1px solid var(--task-border);
 }
 
-.task-run-actions {
+.task-run-actions,
+.task-run-footer .task-run-button {
   margin: 0;
+  width: 100%;
+  min-height: 38px;
+  font-size: 12px;
 }
 
 .task-submit-feedback {
@@ -1856,7 +1864,7 @@ body.dark .task-link-button.danger {
   opacity: 0.55;
 }
 
-.task-prompt-actions .task-submit-feedback {
+.task-run-footer .task-submit-feedback {
   margin-top: 2px;
 }
 

package/server/public/tasker.css

@@ -0,0 +1,336 @@
+body.tasker-page {
+  --tasker-bg: #f5f6f8;
+  --tasker-panel: #ffffff;
+  --tasker-row: #f8fafc;
+  --tasker-row-hover: #f1f5f9;
+  --tasker-row-selected: #e8edf4;
+  --tasker-control: #ffffff;
+  --tasker-icon-bg: #ffffff;
+  --tasker-icon-selected-bg: #f8fafc;
+  --tasker-border: rgba(15, 23, 42, 0.1);
+  --tasker-border-strong: rgba(15, 23, 42, 0.18);
+  --tasker-text: rgba(15, 23, 42, 0.9);
+  --tasker-text-strong: rgba(15, 23, 42, 0.98);
+  --tasker-muted: rgba(71, 85, 105, 0.78);
+  --tasker-muted-strong: rgba(51, 65, 85, 0.82);
+  --tasker-focus: rgba(15, 23, 42, 0.1);
+  --tasker-focus-border: rgba(15, 23, 42, 0.28);
+  --tasker-clear-hover: rgba(15, 23, 42, 0.06);
+  --tasker-selection-bar: rgba(15, 23, 42, 0.48);
+  --tasker-shadow: 0 28px 80px rgba(15, 23, 42, 0.12);
+  min-height: 100vh;
+  margin: 0;
+  background: var(--tasker-bg);
+  color: var(--tasker-text);
+  font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+  font-size: 14px;
+  display: block;
+}
+
+body.dark.tasker-page {
+  --tasker-bg: #050607;
+  --tasker-panel: #0d0d0f;
+  --tasker-row: #141416;
+  --tasker-row-hover: #18181b;
+  --tasker-row-selected: #202024;
+  --tasker-control: #111114;
+  --tasker-icon-bg: #08090b;
+  --tasker-icon-selected-bg: #0c0d10;
+  --tasker-border: rgba(255, 255, 255, 0.09);
+  --tasker-border-strong: rgba(255, 255, 255, 0.18);
+  --tasker-text: rgba(255, 255, 255, 0.88);
+  --tasker-text-strong: rgba(255, 255, 255, 0.96);
+  --tasker-muted: rgba(255, 255, 255, 0.48);
+  --tasker-muted-strong: rgba(255, 255, 255, 0.62);
+  --tasker-focus: rgba(255, 255, 255, 0.14);
+  --tasker-focus-border: rgba(255, 255, 255, 0.24);
+  --tasker-clear-hover: rgba(255, 255, 255, 0.06);
+  --tasker-selection-bar: rgba(255, 255, 255, 0.64);
+  --tasker-shadow: 0 32px 90px rgba(0, 0, 0, 0.42);
+}
+
+body.tasker-page .tasker-main {
+  min-height: calc(100vh - 44px);
+  box-sizing: border-box;
+  display: grid;
+  place-items: center;
+  padding: 32px 16px;
+}
+
+.tasker-panel {
+  width: min(760px, calc(100vw - 32px));
+  max-height: min(660px, calc(100vh - 96px));
+  box-sizing: border-box;
+  display: grid;
+  grid-template-rows: auto auto minmax(0, 1fr);
+  overflow: hidden;
+  padding: 14px;
+  border: 1px solid var(--tasker-border);
+  border-radius: 8px;
+  background: var(--tasker-panel);
+  box-shadow: var(--tasker-shadow);
+}
+
+.tasker-search-wrap {
+  padding: 0 0 14px;
+}
+
+.tasker-search-field {
+  min-height: 42px;
+  box-sizing: border-box;
+  display: grid;
+  grid-template-columns: auto minmax(0, 1fr) auto;
+  align-items: center;
+  gap: 10px;
+  padding: 0 12px;
+  border: 1px solid var(--tasker-border-strong);
+  border-radius: 7px;
+  background: var(--tasker-control);
+}
+
+.tasker-search-field:focus-within {
+  border-color: var(--tasker-focus-border);
+  box-shadow: 0 0 0 3px var(--tasker-focus);
+}
+
+.tasker-search-field > i {
+  color: var(--tasker-muted);
+  font-size: 13px;
+}
+
+.tasker-search-input {
+  width: 100%;
+  min-width: 0;
+  min-height: 40px;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  background: transparent;
+  color: var(--tasker-text);
+  font: inherit;
+  font-size: 14px;
+  line-height: 1.4;
+}
+
+.tasker-search-input::placeholder {
+  color: var(--tasker-muted);
+}
+
+.tasker-search-input::-webkit-search-cancel-button {
+  appearance: none;
+  -webkit-appearance: none;
+}
+
+.tasker-search-clear {
+  appearance: none;
+  width: 28px;
+  height: 28px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border: 0;
+  border-radius: 6px;
+  background: transparent;
+  color: var(--tasker-muted);
+  cursor: pointer;
+}
+
+.tasker-search-clear:hover,
+.tasker-search-clear:focus-visible {
+  background: var(--tasker-clear-hover);
+  color: var(--tasker-text);
+  outline: none;
+}
+
+.tasker-search-clear[hidden] {
+  display: none !important;
+}
+
+.tasker-status {
+  padding: 0 2px 12px;
+  color: var(--tasker-muted-strong);
+  font-size: 12px;
+  font-weight: 750;
+  line-height: 1.2;
+  letter-spacing: 0;
+  text-transform: uppercase;
+}
+
+.tasker-status[hidden] {
+  display: none !important;
+}
+
+.tasker-list {
+  min-height: 0;
+  display: grid;
+  gap: 0;
+  overflow: auto;
+  border: 1px solid var(--tasker-border);
+  border-radius: 7px;
+  background: var(--tasker-row);
+}
+
+.tasker-list[hidden] {
+  display: none !important;
+}
+
+.tasker-row {
+  position: relative;
+  width: 100%;
+  min-width: 0;
+  box-sizing: border-box;
+  display: grid;
+  grid-template-columns: auto minmax(0, 1fr) auto;
+  align-items: center;
+  gap: 13px;
+  padding: 15px 14px;
+  border-bottom: 1px solid var(--tasker-border);
+  background: var(--tasker-row);
+  color: var(--tasker-text);
+  text-align: left;
+  text-decoration: none;
+}
+
+.tasker-row:last-child {
+  border-bottom: 0;
+}
+
+.tasker-row:hover,
+.tasker-row:focus-visible {
+  background: var(--tasker-row-hover);
+  color: var(--tasker-text);
+  outline: none;
+}
+
+.tasker-row.selected {
+  background: var(--tasker-row-selected);
+  color: var(--tasker-text);
+  outline: none;
+}
+
+.tasker-row.selected::before {
+  content: "";
+  position: absolute;
+  top: 12px;
+  bottom: 12px;
+  left: 0;
+  width: 3px;
+  border-radius: 0 3px 3px 0;
+  background: var(--tasker-selection-bar);
+}
+
+.tasker-row.selected .tasker-row-icon {
+  border-color: var(--tasker-border-strong);
+  background: var(--tasker-icon-selected-bg);
+  color: var(--tasker-text-strong);
+}
+
+.tasker-row.selected .tasker-row-label {
+  color: var(--tasker-text-strong);
+}
+
+.tasker-row.selected .tasker-row-meta {
+  color: var(--tasker-muted-strong);
+}
+
+.tasker-row-icon {
+  width: 29px;
+  height: 29px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid var(--tasker-border);
+  border-radius: 7px;
+  background: var(--tasker-icon-bg);
+  color: var(--tasker-muted-strong);
+  font-size: 12px;
+}
+
+.tasker-row-copy {
+  min-width: 0;
+  display: grid;
+  gap: 3px;
+}
+
+.tasker-row-label {
+  min-width: 0;
+  overflow: hidden;
+  color: var(--tasker-text);
+  font-size: 15px;
+  font-weight: 750;
+  line-height: 1.25;
+  letter-spacing: 0;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.tasker-row-meta {
+  min-width: 0;
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  color: var(--tasker-muted);
+  font-size: 13px;
+  font-weight: 600;
+  line-height: 1.38;
+}
+
+.tasker-row-hint {
+  color: var(--tasker-muted);
+  font-size: 11px;
+  opacity: 0;
+}
+
+.tasker-row:hover .tasker-row-hint,
+.tasker-row:focus-visible .tasker-row-hint,
+.tasker-row.selected .tasker-row-hint {
+  opacity: 1;
+}
+
+.tasker-empty {
+  padding: 18px 14px;
+  border: 1px solid var(--tasker-border);
+  border-radius: 7px;
+  background: var(--tasker-row);
+  color: var(--tasker-muted);
+  font-size: 13px;
+  line-height: 1.45;
+  text-align: center;
+}
+
+.tasker-empty[hidden] {
+  display: none !important;
+}
+
+@media (max-width: 768px) {
+  body.tasker-page {
+    display: block !important;
+  }
+
+  body.tasker-page .tasker-main {
+    align-items: start;
+    padding: 16px 10px 24px;
+  }
+
+  .tasker-panel {
+    width: min(100%, calc(100vw - 20px));
+    max-height: none;
+  }
+}
+
+@media (max-width: 520px) {
+  .tasker-panel {
+    padding: 10px;
+  }
+
+  .tasker-row {
+    grid-template-columns: minmax(0, 1fr) auto;
+    gap: 8px;
+    padding: 13px 12px;
+  }
+
+  .tasker-row-icon {
+    display: none;
+  }
+}