pinokiod 7.2.17 → 7.2.18

package/server/public/tasker.js

@@ -0,0 +1,407 @@
+(function(window, document) {
+  "use strict";
+
+  const VARIABLE_FILTER_KEYS = new Set([
+    "var",
+    "vars",
+    "variable",
+    "variables",
+    "require",
+    "requires"
+  ]);
+  const PASSTHROUGH_KEYS = new Set([
+    "tool",
+    "folderName"
+  ]);
+  const TASK_INPUT_NAME_PATTERN = /^[a-zA-Z0-9_][a-zA-Z0-9_.-]*$/;
+
+  function normalizeText(value) {
+    return String(value || "").replace(/\s+/g, " ").trim();
+  }
+
+  function normalizeTaskInputName(value) {
+    const normalized = String(value || "").trim();
+    return TASK_INPUT_NAME_PATTERN.test(normalized) ? normalized : "";
+  }
+
+  function splitVariableList(value) {
+    return String(value || "")
+      .split(/[,\s]+/)
+      .map(normalizeTaskInputName)
+      .filter(Boolean);
+  }
+
+  function getRequiredVariables(params) {
+    const variables = new Set();
+    VARIABLE_FILTER_KEYS.forEach((key) => {
+      params.getAll(key).forEach((value) => {
+        splitVariableList(value).forEach((name) => variables.add(name));
+      });
+    });
+    return Array.from(variables);
+  }
+
+  function getInitialSearchQuery(params) {
+    return (params.get("q") || params.get("search") || "").trim();
+  }
+
+  function getTemplateVariableNames(template) {
+    const names = new Set();
+    const regex = /{{\s*([a-zA-Z0-9_][a-zA-Z0-9_.-]*)\s*}}/g;
+    let match;
+    while ((match = regex.exec(String(template || ""))) !== null) {
+      names.add(match[1]);
+    }
+    return Array.from(names);
+  }
+
+  function getTaskVariableSet(task) {
+    const names = new Set();
+    const inputs = Array.isArray(task && task.inputs) ? task.inputs : [];
+    inputs.forEach((input) => {
+      const name = normalizeTaskInputName(input && input.name);
+      if (name) {
+        names.add(name);
+      }
+    });
+    getTemplateVariableNames(task && task.template).forEach((name) => {
+      names.add(name);
+    });
+    return names;
+  }
+
+  function taskMatchesRequiredVariables(task, requiredVariables) {
+    if (!requiredVariables.length) {
+      return true;
+    }
+    const taskVariables = getTaskVariableSet(task);
+    return requiredVariables.every((name) => taskVariables.has(name));
+  }
+
+  function formatTaskTemplateSummary(task) {
+    const preview = normalizeText((task && (task.template || task.description)) || "");
+    if (!preview) {
+      return "Task";
+    }
+    return preview.length > 150 ? `${preview.slice(0, 147).trimEnd()}...` : preview;
+  }
+
+  function formatRecentUsage(value) {
+    const timestamp = Date.parse(typeof value === "string" ? value : "");
+    if (!Number.isFinite(timestamp)) {
+      return "";
+    }
+    const diffMs = Math.max(0, Date.now() - timestamp);
+    const dayMs = 24 * 60 * 60 * 1000;
+    const diffDays = Math.floor(diffMs / dayMs);
+    if (diffDays === 0) return "Used today";
+    if (diffDays === 1) return "Used yesterday";
+    if (diffDays < 7) return `Used ${diffDays}d ago`;
+    if (diffDays < 30) return `Used ${Math.floor(diffDays / 7)}w ago`;
+    if (diffDays < 365) return `Used ${Math.floor(diffDays / 30)}mo ago`;
+    return `Used ${Math.floor(diffDays / 365)}y ago`;
+  }
+
+  function getTaskHref(task, params) {
+    const id = task && typeof task.id === "string" ? task.id.trim() : "";
+    if (!id) {
+      return "/tasks";
+    }
+
+    const taskVariables = getTaskVariableSet(task);
+    const url = new URL("/task", window.location.origin);
+    url.searchParams.set("id", id);
+
+    params.forEach((value, key) => {
+      if (key.startsWith("input.")) {
+        const inputName = normalizeTaskInputName(key.slice("input.".length));
+        if (inputName && taskVariables.has(inputName)) {
+          url.searchParams.set(`input.${inputName}`, value);
+        }
+        return;
+      }
+      if (PASSTHROUGH_KEYS.has(key) && value) {
+        url.searchParams.set(key, value);
+      }
+    });
+
+    return `${url.pathname}${url.search}`;
+  }
+
+  function getSearchText(task) {
+    const inputs = Array.isArray(task && task.inputs) ? task.inputs : [];
+    return [
+      task && task.id,
+      task && task.ref,
+      task && task.title,
+      task && task.description,
+      task && task.template,
+      task && task.path,
+      task && task.target,
+      ...inputs.flatMap((input) => [
+        input && input.name,
+        input && input.label
+      ])
+    ].filter(Boolean).join(" ").toLowerCase();
+  }
+
+  function createTaskRow(task, params) {
+    const row = document.createElement("a");
+    row.className = "tasker-row";
+    row.href = getTaskHref(task, params);
+    row.tabIndex = -1;
+
+    const icon = document.createElement("span");
+    icon.className = "tasker-row-icon";
+    icon.setAttribute("aria-hidden", "true");
+    const iconGlyph = document.createElement("i");
+    iconGlyph.className = "fa-solid fa-bookmark";
+    icon.appendChild(iconGlyph);
+    row.appendChild(icon);
+
+    const copy = document.createElement("span");
+    copy.className = "tasker-row-copy";
+
+    const label = document.createElement("span");
+    label.className = "tasker-row-label";
+    label.textContent = (task && (task.title || task.id)) || "Untitled task";
+    copy.appendChild(label);
+
+    const meta = document.createElement("span");
+    meta.className = "tasker-row-meta";
+    const metaBits = [formatTaskTemplateSummary(task)];
+    const inputs = Array.isArray(task && task.inputs) ? task.inputs : [];
+    if (inputs.length > 0) {
+      metaBits.push(`${inputs.length} input${inputs.length === 1 ? "" : "s"}`);
+    }
+    const usage = formatRecentUsage(task && task.last_used_at);
+    if (usage) {
+      metaBits.push(usage);
+    }
+    meta.textContent = metaBits.filter(Boolean).join(" - ");
+    copy.appendChild(meta);
+
+    row.appendChild(copy);
+
+    const hint = document.createElement("span");
+    hint.className = "tasker-row-hint";
+    hint.setAttribute("aria-hidden", "true");
+    const hintGlyph = document.createElement("i");
+    hintGlyph.className = "fa-solid fa-chevron-right";
+    hint.appendChild(hintGlyph);
+    row.appendChild(hint);
+
+    return row;
+  }
+
+  function initTasker() {
+    const root = document.querySelector("[data-tasker]");
+    if (!root) {
+      return;
+    }
+
+    const searchInput = root.querySelector("[data-tasker-search]");
+    const clearButton = root.querySelector("[data-tasker-clear]");
+    const status = root.querySelector("[data-tasker-status]");
+    const list = root.querySelector("[data-tasker-list]");
+    const empty = root.querySelector("[data-tasker-empty]");
+    const params = new URLSearchParams(window.location.search);
+    const requiredVariables = getRequiredVariables(params);
+    const initialSearchQuery = getInitialSearchQuery(params);
+    let tasks = [];
+    let sourceTaskCount = 0;
+    let visibleTasks = [];
+    let selectedIndex = -1;
+    let loading = true;
+    let error = "";
+
+    if (searchInput && initialSearchQuery) {
+      searchInput.value = initialSearchQuery;
+    }
+
+    function syncSelectedRow() {
+      if (!list) {
+        return;
+      }
+      const rows = Array.from(list.querySelectorAll(".tasker-row"));
+      rows.forEach((row, index) => {
+        const selected = index === selectedIndex;
+        row.classList.toggle("selected", selected);
+        row.setAttribute("aria-selected", selected ? "true" : "false");
+        if (selected) {
+          row.scrollIntoView({
+            block: "nearest"
+          });
+        }
+      });
+    }
+
+    function selectResult(index) {
+      if (!visibleTasks.length) {
+        selectedIndex = -1;
+        syncSelectedRow();
+        return;
+      }
+      const max = visibleTasks.length - 1;
+      selectedIndex = Math.max(0, Math.min(index, max));
+      syncSelectedRow();
+    }
+
+    function moveSelection(delta) {
+      if (!visibleTasks.length) {
+        return;
+      }
+      if (selectedIndex < 0) {
+        selectResult(delta > 0 ? 0 : visibleTasks.length - 1);
+        return;
+      }
+      const nextIndex = (selectedIndex + delta + visibleTasks.length) % visibleTasks.length;
+      selectResult(nextIndex);
+    }
+
+    function openSelectedResult() {
+      if (!visibleTasks.length || selectedIndex < 0) {
+        return;
+      }
+      const row = list ? list.querySelectorAll(".tasker-row")[selectedIndex] : null;
+      const href = row ? row.getAttribute("href") : "";
+      if (href) {
+        window.location.href = href;
+      }
+    }
+
+    function setStatus(copy) {
+      if (status) {
+        status.textContent = copy || "";
+        status.hidden = !copy;
+      }
+    }
+
+    function render() {
+      if (!list || !empty || !searchInput) {
+        return;
+      }
+
+      const query = searchInput.value.trim().toLowerCase();
+      visibleTasks = query
+        ? tasks.filter((task) => getSearchText(task).includes(query))
+        : tasks.slice();
+      if (visibleTasks.length) {
+        selectedIndex = selectedIndex < 0 ? 0 : Math.min(selectedIndex, visibleTasks.length - 1);
+      } else {
+        selectedIndex = -1;
+      }
+
+      list.innerHTML = "";
+      visibleTasks.forEach((task, index) => {
+        const row = createTaskRow(task, params);
+        row.addEventListener("mouseenter", () => {
+          selectedIndex = index;
+          syncSelectedRow();
+        });
+        list.appendChild(row);
+      });
+      syncSelectedRow();
+
+      const hasRows = visibleTasks.length > 0;
+      list.hidden = !hasRows;
+      empty.hidden = hasRows || loading || Boolean(error);
+
+      if (clearButton) {
+        clearButton.hidden = !query;
+      }
+
+      if (loading) {
+        setStatus("Loading tasks...");
+      } else if (error) {
+        setStatus(error);
+      } else if (!tasks.length) {
+        setStatus("");
+        empty.hidden = false;
+        empty.textContent = requiredVariables.length && sourceTaskCount
+          ? `No tasks match ${requiredVariables.join(", ")}.`
+          : "No saved tasks yet.";
+      } else if (query && !hasRows) {
+        setStatus("");
+        empty.hidden = false;
+        empty.textContent = "No tasks match this search.";
+      } else {
+        const noun = visibleTasks.length === 1 ? "task" : "tasks";
+        setStatus(`${visibleTasks.length} ${noun}`);
+      }
+    }
+
+    async function loadTasks() {
+      loading = true;
+      error = "";
+      render();
+      try {
+        const response = await fetch("/api/tasks", {
+          cache: "no-store"
+        });
+        const payload = await response.json().catch(() => null);
+        if (!response.ok || !payload || !Array.isArray(payload.items)) {
+          throw new Error("Failed to load tasks.");
+        }
+        sourceTaskCount = payload.items.length;
+        tasks = payload.items.filter((task) => taskMatchesRequiredVariables(task, requiredVariables));
+      } catch (loadError) {
+        tasks = [];
+        sourceTaskCount = 0;
+        error = loadError && loadError.message ? loadError.message : "Failed to load tasks.";
+      } finally {
+        loading = false;
+        render();
+      }
+    }
+
+    if (searchInput) {
+      searchInput.addEventListener("input", render);
+      searchInput.addEventListener("keydown", (event) => {
+        if (event.key === "ArrowDown") {
+          event.preventDefault();
+          moveSelection(1);
+          return;
+        }
+        if (event.key === "ArrowUp") {
+          event.preventDefault();
+          moveSelection(-1);
+          return;
+        }
+        if (event.key === "Enter") {
+          event.preventDefault();
+          openSelectedResult();
+          return;
+        }
+        if (event.key === "Home" && (event.metaKey || event.ctrlKey)) {
+          event.preventDefault();
+          selectResult(0);
+          return;
+        }
+        if (event.key === "End" && (event.metaKey || event.ctrlKey)) {
+          event.preventDefault();
+          selectResult(visibleTasks.length - 1);
+        }
+      });
+      window.requestAnimationFrame(() => {
+        searchInput.focus();
+        searchInput.select();
+      });
+    }
+    if (clearButton && searchInput) {
+      clearButton.addEventListener("click", () => {
+        searchInput.value = "";
+        render();
+        searchInput.focus();
+      });
+    }
+
+    loadTasks();
+  }
+
+  if (document.readyState === "loading") {
+    document.addEventListener("DOMContentLoaded", initTasker, { once: true });
+  } else {
+    initTasker();
+  }
+})(window, document);

package/server/views/d.ejs

@@ -11,13 +11,26 @@
 <link href="/markdown.css" rel="stylesheet"/>
 <link href="/noty.css" rel="stylesheet"/>
 <link href="/style.css" rel="stylesheet"/>
+<link href="/notes.css?v=d-launcher-notes" rel="stylesheet"/>
 <% if (agent === "electron") { %>
   <link href="/electron.css" rel="stylesheet"/>
 <% } %>
 <style>
+html,
+body {
+  height: 100%;
+}
+body {
+  display: flex;
+  flex-direction: column;
+}
 main {
   box-sizing: border-box;
   padding: 0;
+  flex: 1 1 auto;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
   /*
   flex-wrap: wrap;
   */
@@ -258,8 +271,10 @@ body.dark .column-subtitle-link:focus-visible {
 }
 .menu-grid {
   display: grid;
+  flex: 1 1 auto;
   grid-template-columns: repeat(auto-fit, minmax(260px, 1fr));
-  align-items: start;
+  align-items: stretch;
+  min-height: 0;
 }
 .menu-grid.menu-grid--triptych {
   grid-template-columns: repeat(3, minmax(0, 1fr));
@@ -508,6 +523,8 @@ body.dark form.search {
   background: rgba(255,255,255,0.07);
 }
 form.search {
+  flex: 0 0 auto;
+  align-items: center;
   padding: 10px;
   background: #F1F1F1;
 }
@@ -540,7 +557,8 @@ body.dark #update-spec {
 <script src="/nav.js"></script>
 </head>
 <body class='<%=theme%>' data-agent="<%=agent%>">
-<main>
+<main data-pinokio-notes-scope="true">
+<div id="pinokio-notes-slot" class="pinokio-notes-slot" aria-live="polite"></div>
 <form class='search'>
   <input type='search' class="flexible" placeholder='Filter tools'>
 </form>
@@ -739,6 +757,18 @@ body.dark #update-spec {
   <% } %>
 </main>
 <script>
+const pinokioNotePublish = { target: "registry", type: "post" }
+const pinokioNoteParentUrl = <%- JSON.stringify(typeof registry_parent_url !== 'undefined' ? registry_parent_url || '' : '').replace(/</g, '\\u003c') %>
+if (pinokioNoteParentUrl) {
+  pinokioNotePublish.parent = { type: "app", url: pinokioNoteParentUrl }
+}
+window.PinokioNoteContext = {
+  cwd: <%- JSON.stringify(filepath || '').replace(/</g, '\\u003c') %>,
+  publish: pinokioNotePublish
+}
+</script>
+<script src="/notes.js?v=d-launcher-notes"></script>
+<script>
 <% if (retry) { %>
 setTimeout(() => {
   location.href = location.href
@@ -890,6 +920,7 @@ const appendWorkspaceCwd = (value, cwd = workspaceCwd) => {
   try {
     const parsed = new URL(raw, window.location.origin)
     const isPluginLauncher = parsed.pathname.startsWith("/run/plugin/")
+      || parsed.pathname.startsWith("/pinokio/run/plugin/")
       || (parsed.pathname.startsWith("/run/api/") && /\/pinokio\.js$/i.test(parsed.pathname))
     if (parsed.origin !== window.location.origin || !isPluginLauncher) {
       return value

package/server/views/partials/menu.ejs

@@ -18,7 +18,7 @@
             <i class="fa-solid fa-angle-right"></i>
           <% } %>
         </div>
-      <% } else if (item.run) { %>
+      <% } else if (item.run && typeof item.run === 'string') { %>
         <div data-run="<%=item.run%>" data-cwd="<%=item.cwd%>" class='btn header-item frame-link <%=item.display || ""%>'>
           <div class='tab'><%-item.btn%></div>
           <% if (item.arrow) { %>

package/server/views/partials/workspace_row.ejs

@@ -1,17 +1,17 @@
 <%
   const shellCount = workspace.counts && Number.isFinite(workspace.counts.shells) ? workspace.counts.shells : 0;
   const scriptCount = workspace.counts && Number.isFinite(workspace.counts.scripts) ? workspace.counts.scripts : 0;
-  const draftCount = workspace.counts && Number.isFinite(workspace.counts.drafts) ? workspace.counts.drafts : 0;
+  const noteCount = workspace.counts && Number.isFinite(workspace.counts.notes) ? workspace.counts.notes : 0;
   const shellTitles = Array.isArray(workspace.shells) ? workspace.shells.map((shell) => shell.title || shell.id || "").join(" ") : "";
   const scriptTitles = Array.isArray(workspace.scripts) ? workspace.scripts.map((script) => script.title || script.id || "").join(" ") : "";
-  const draft = workspace.draft || null;
-  const draftId = draft && draft.id ? draft.id : `draft-${index}`;
-  const searchText = [workspace.name, workspace.cwd, shellTitles, scriptTitles, draft && draft.title].filter(Boolean).join(" ");
+  const note = workspace.note || null;
+  const noteId = note && note.id ? note.id : `note-${index}`;
+  const searchText = [workspace.name, workspace.cwd, shellTitles, scriptTitles, note && note.title].filter(Boolean).join(" ");
   const modifiedLabel = dateLabel(workspace.modifiedAt);
   const details = [];
   if (shellCount > 0) details.push(plural(shellCount, "terminal"));
   if (scriptCount > 0) details.push(plural(scriptCount, "script"));
-  if (draftCount > 0) details.push(draftCount === 1 ? "Draft ready" : plural(draftCount, "draft"));
+  if (noteCount > 0) details.push(noteCount === 1 ? "Note ready" : plural(noteCount, "note"));
   if (modifiedLabel) details.push(modifiedLabel);
 %>
 <div
@@ -46,15 +46,15 @@
           <button class="btn" type="button" data-open-workspace="<%= workspace.cwd %>" data-workspace-modal-mode="session" title="Start session"><i class="fa-solid fa-play" aria-hidden="true"></i> Start</button>
         <% } %>
         <button class="btn" type="button" data-open-path="<%= workspace.cwd %>" title="Open folder"><i class="fa-solid fa-folder-open" aria-hidden="true"></i> Folder</button>
-        <% if (draft && draft.postPath) { %>
-          <button class="btn" type="button" data-open-path="<%= draft.postPath %>" title="Open draft"><i class="fa-solid fa-file-lines" aria-hidden="true"></i> Draft</button>
-          <% if (draft.excerpt) { %>
-            <button class="btn" type="button" data-preview-toggle="<%= draftId %>"><i class="fa-solid fa-eye" aria-hidden="true"></i> Preview</button>
+        <% if (note && note.notePath) { %>
+          <button class="btn" type="button" data-open-path="<%= note.notePath %>" title="Open note"><i class="fa-solid fa-file-lines" aria-hidden="true"></i> Note</button>
+          <% if (note.excerpt) { %>
+            <button class="btn" type="button" data-preview-toggle="<%= noteId %>"><i class="fa-solid fa-eye" aria-hidden="true"></i> Preview</button>
           <% } %>
         <% } %>
       </div>
-      <% if (draft && draft.excerpt) { %>
-        <div class="workspace-draft-preview" data-preview-panel="<%= draftId %>" hidden><%= draft.excerpt %></div>
+      <% if (note && note.excerpt) { %>
+        <div class="workspace-note-preview" data-preview-panel="<%= noteId %>" hidden><%= note.excerpt %></div>
       <% } %>
     </div>
   </h3>

package/server/views/pre.ejs

@@ -117,7 +117,7 @@ footer a.btn {
     </div>
     <div class='items'>
       <% items.forEach((item) => { %>
-        <% if (item.href) { %>
+        <% if (typeof item.href === "string" && item.href) { %>
           <div class='item'>
             <% if (item.icon) { %>
               <img src="<%=item.icon%>">

package/server/views/task_launch.ejs

@@ -125,16 +125,6 @@
         <div class="task-detail-main">
           <section class="task-section task-prompt-section">
             <pre class="task-code task-prompt-code" data-task-rendered-prompt><%= renderedPrompt %></pre>
-            <div class="task-prompt-actions">
-              <button class="task-button primary task-run-button" type="submit">
-                <i class="fa-solid fa-bolt" aria-hidden="true"></i>
-                <span>Run</span>
-              </button>
-              <p class="task-inline-help">Tool and folder stay local. The permalink tracks only the task inputs.</p>
-              <p class="task-submit-feedback" data-task-submit-feedback aria-live="polite" aria-hidden="true">
-                <span data-task-submit-feedback-text></span>
-              </p>
-            </div>
           </section>
         </div>
 
@@ -164,6 +154,16 @@
                 <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 class="task-run-footer">
+                <button class="task-button primary task-run-button task-run-actions" type="submit">
+                  <i class="fa-solid fa-bolt" aria-hidden="true"></i>
+                  <span>Run</span>
+                </button>
+                <p class="task-inline-help">Tool and folder stay local. The permalink tracks only the task inputs.</p>
+                <p class="task-submit-feedback" data-task-submit-feedback aria-live="polite" aria-hidden="true">
+                  <span data-task-submit-feedback-text></span>
+                </p>
+              </div>
             </div>
           </section>
         </aside>

package/server/views/tasker.ejs

@@ -0,0 +1,40 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Tasker</title>
+  <link href="/css/fontawesome.min.css" rel="stylesheet">
+  <link href="/css/solid.min.css" rel="stylesheet">
+  <link href="/css/brands.min.css" rel="stylesheet">
+  <link href="/noty.css" rel="stylesheet">
+  <link href="/style.css" rel="stylesheet">
+  <link href="/universal-launcher.css" rel="stylesheet">
+  <link href="/tasker.css" rel="stylesheet">
+  <script src="/tasker.js" defer></script>
+  <% if (agent === "electron") { %>
+    <link href="/electron.css" rel="stylesheet"/>
+  <% } %>
+</head>
+<body class="<%= theme %> tasker-page" data-agent="<%= agent %>">
+  <%- include('partials/app_navheader', { agent }) %>
+  <main class="tasker-main" aria-label="Tasker">
+    <section class="tasker-panel" data-tasker>
+      <div class="tasker-search-wrap">
+        <div class="tasker-search-field">
+          <i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
+          <input class="tasker-search-input" type="search" aria-label="Search tasks" placeholder="Search tasks" autocomplete="off" spellcheck="false" data-tasker-search>
+          <button class="tasker-search-clear" type="button" aria-label="Clear search" data-tasker-clear hidden>
+            <i class="fa-solid fa-xmark" aria-hidden="true"></i>
+          </button>
+        </div>
+      </div>
+
+      <div class="tasker-status" role="status" data-tasker-status>Loading tasks...</div>
+      <div class="tasker-list" data-tasker-list hidden></div>
+      <div class="tasker-empty" data-tasker-empty hidden>No tasks found.</div>
+    </section>
+  </main>
+  <%- include('partials/app_common_scripts') %>
+</body>
+</html>