pinokiod 7.1.48 → 7.1.49

package/package.json

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

package/server/index.js

@@ -7140,7 +7140,7 @@ class Server {
         return
       }
       const links = await taskWorkspaceLinks.listTaskWorkspaces(task.id, {
-        root: task.config.path,
+        root: getTaskLaunchPath(task.config),
         pruneMissing: true
       })
       const items = links.workspaces.map((workspace) => {
@@ -7938,12 +7938,23 @@ class Server {
       }
       return `${baseName}-${Date.now()}`
     }
-    const getTaskLaunchRoot = (taskConfig) => {
+    const normalizeTaskLaunchPath = (taskPath) => {
+      const normalizedPath = typeof taskPath === "string" ? taskPath.trim() : ""
+      return normalizedPath === "tasks" ? "workspaces" : normalizedPath
+    }
+    const getTaskLaunchPath = (taskConfig) => {
       const validatedTaskConfig = taskPackages.validateTaskConfig(taskConfig)
-      if (validatedTaskConfig.path === "workspaces") {
+      return normalizeTaskLaunchPath(validatedTaskConfig.path)
+    }
+    const usesWorkspaceTaskPath = (taskConfig) => {
+      return getTaskLaunchPath(taskConfig) === "workspaces"
+    }
+    const getTaskLaunchRoot = (taskConfig) => {
+      const launchPath = getTaskLaunchPath(taskConfig)
+      if (launchPath === "workspaces") {
         return path.resolve(getTerminalWorkspacesRoot())
       }
-      return path.resolve(this.kernel.path(validatedTaskConfig.path))
+      return path.resolve(this.kernel.path(launchPath))
     }
     const extractTaskInputValuesFromPayload = (payload) => {
       const legacyValues = taskPackages.extractInputValues(payload)
@@ -8194,7 +8205,7 @@ class Server {
       const shareState = await buildTaskShareState(req, task)
       const taskUi = buildTaskPresentationState(task, shareState)
       const sidebarContext = await buildTaskSidebarContext()
-      const suggestedFolderName = task && task.config && task.config.path === "workspaces"
+      const suggestedFolderName = task && task.config && usesWorkspaceTaskPath(task.config)
         ? ""
         : taskPackages.slugify(task && task.config ? task.config.title : task.id, task && task.id ? task.id : "task")
       const renderedPrompt = taskPackages.applyTemplateValues(task.template, promptValues)
@@ -9460,7 +9471,7 @@ class Server {
       const launchRoot = getTaskLaunchRoot(task.config)
       let folderName = folderNameInput
       if (!folderName) {
-        if (task.config.path === "workspaces") {
+        if (usesWorkspaceTaskPath(task.config)) {
           folderName = await generateTerminalWorkspaceFolderName()
         } else {
           folderName = await suggestTaskFolderName(launchRoot, task.config.title)
@@ -9508,7 +9519,7 @@ class Server {
 	        await persistLauncherPromptContext(targetPath, {
 	          prompt,
 	          includeSpec: true,
-	          includeRequest: task.config.path === "workspaces"
+	          includeRequest: usesWorkspaceTaskPath(task.config)
 	        })
 	      } catch (error) {
 	        await fs.promises.rm(targetPath, { recursive: true, force: true }).catch(() => {})
@@ -9841,7 +9852,7 @@ class Server {
 
         if (workspaceMode === "reuse") {
           const links = await taskWorkspaceLinks.listTaskWorkspaces(task.id, {
-            root: task.config.path,
+            root: getTaskLaunchPath(task.config),
             pruneMissing: true
           })
           workspaceRef = requestedWorkspaceRef
@@ -9882,7 +9893,7 @@ class Server {
           const folderName = requestedWorkspaceName || await suggestTaskFolderName(launchRoot, task.config.title)
           targetPath = await createLauncherTargetFolder(launchRoot, folderName)
           createdTarget = true
-          workspaceRef = taskWorkspaceLinks.createWorkspaceRef(task.config.path, targetPath)
+          workspaceRef = taskWorkspaceLinks.createWorkspaceRef(getTaskLaunchPath(task.config), targetPath)
           if (!workspaceRef) {
             throw new Error("Failed to create workspace link.")
           }

package/server/public/common.js

@@ -4418,4 +4418,109 @@ document.addEventListener("DOMContentLoaded", () => {
     }
   }
 
+  function getTaskPendingCopyByAction(action) {
+    if (action === '/task/install') {
+      return {
+        button: 'Installing...',
+        status: 'Installing the task and reopening this page.'
+      };
+    }
+    if (action === '/task/start') {
+      return {
+        button: 'Launching...',
+        status: 'Preparing the workspace and opening your selected tool.'
+      };
+    }
+    return {
+      button: 'Working...',
+      status: 'Finishing your request.'
+    };
+  }
+
+  function ensureTaskSubmitFeedback(form) {
+    let feedback = form.querySelector('[data-task-submit-feedback]');
+    if (feedback) {
+      return feedback;
+    }
+    feedback = document.createElement('p');
+    feedback.className = 'task-submit-feedback';
+    feedback.setAttribute('data-task-submit-feedback', '');
+    feedback.setAttribute('aria-live', 'polite');
+    feedback.setAttribute('aria-hidden', 'true');
+
+    const feedbackText = document.createElement('span');
+    feedbackText.setAttribute('data-task-submit-feedback-text', '');
+    feedback.appendChild(feedbackText);
+    form.appendChild(feedback);
+    return feedback;
+  }
+
+  function initTaskPendingSubmitFallback() {
+    const forms = Array.from(document.querySelectorAll('form[action="/task/install"], form[action="/task/start"]'));
+    forms.forEach((form) => {
+      if (form.matches('[data-task-pending-form]') || form.dataset.taskPendingBound === 'true') {
+        return;
+      }
+
+      const action = form.getAttribute('action') || '';
+      form.dataset.taskPendingBound = 'true';
+
+      form.addEventListener('submit', (event) => {
+        if (form.dataset.taskSubmitting === 'true') {
+          event.preventDefault();
+          return;
+        }
+
+        const copy = getTaskPendingCopyByAction(action);
+        const submitter = event.submitter && event.submitter.form === form
+          ? event.submitter
+          : form.querySelector('button[type="submit"], input[type="submit"]');
+        const feedback = ensureTaskSubmitFeedback(form);
+        const feedbackText = feedback.querySelector('[data-task-submit-feedback-text]') || feedback;
+
+        event.preventDefault();
+        form.dataset.taskSubmitting = 'true';
+        form.classList.add('is-submitting');
+        form.setAttribute('aria-busy', 'true');
+        document.body.classList.add('task-page-busy');
+
+        if (submitter) {
+          submitter.classList.add('is-busy');
+          submitter.setAttribute('aria-disabled', 'true');
+          if (submitter.tagName === 'BUTTON') {
+            const label = submitter.querySelector('span');
+            if (label) {
+              label.textContent = copy.button;
+            } else {
+              submitter.textContent = copy.button;
+            }
+          } else if (submitter.tagName === 'INPUT') {
+            submitter.value = copy.button;
+          }
+          submitter.disabled = true;
+        }
+
+        Array.from(form.querySelectorAll('button[type="submit"], input[type="submit"]')).forEach((button) => {
+          if (button === submitter) {
+            return;
+          }
+          button.disabled = true;
+          button.setAttribute('aria-disabled', 'true');
+        });
+
+        feedbackText.textContent = copy.status;
+        feedback.classList.add('is-visible');
+        feedback.setAttribute('aria-hidden', 'false');
+
+        window.requestAnimationFrame(() => {
+          window.setTimeout(() => {
+            form.submit();
+          }, 0);
+        });
+      });
+    });
+  }
+
+  initTaskPendingSubmitFallback();
+
 })

package/server/public/task-launcher.css

@@ -1439,6 +1439,28 @@ body.dark .task-badge-warning {
   transition: background 140ms ease, border-color 140ms ease, color 140ms ease;
 }
 
+.task-button.is-busy,
+.task-link-button.is-busy {
+  pointer-events: none;
+}
+
+.task-button.is-busy > i,
+.task-link-button.is-busy > i {
+  display: none;
+}
+
+.task-button.is-busy::before,
+.task-link-button.is-busy::before {
+  content: "";
+  width: 11px;
+  height: 11px;
+  flex: 0 0 auto;
+  border-radius: 999px;
+  border: 1.5px solid currentColor;
+  border-right-color: transparent;
+  animation: task-button-spin 720ms linear infinite;
+}
+
 .task-button:hover,
 .task-link-button:hover {
   background: var(--task-soft);
@@ -1539,6 +1561,29 @@ body.dark .task-link-button.danger {
   margin: 0;
 }
 
+.task-submit-feedback {
+  margin: 0;
+  display: grid;
+  grid-template-rows: 0fr;
+  opacity: 0;
+  color: var(--task-muted);
+  font-size: 12px;
+  line-height: 1.45;
+  transition:
+    grid-template-rows 220ms cubic-bezier(0.25, 1, 0.5, 1),
+    opacity 180ms cubic-bezier(0.25, 1, 0.5, 1);
+}
+
+.task-submit-feedback > span {
+  overflow: hidden;
+  min-height: 0;
+}
+
+.task-submit-feedback.is-visible {
+  grid-template-rows: 1fr;
+  opacity: 1;
+}
+
 .task-button.subtle {
   color: var(--task-muted);
 }
@@ -1569,6 +1614,23 @@ body.dark .task-link-button.danger {
   margin-top: 18px;
 }
 
+.task-install-actions .task-submit-feedback {
+  flex-basis: 100%;
+}
+
+.task-install-actions.is-submitting .task-link-button {
+  pointer-events: none;
+  opacity: 0.55;
+}
+
+.task-prompt-actions .task-submit-feedback {
+  margin-top: 2px;
+}
+
+.task-run-form.is-submitting .task-prompt-code {
+  opacity: 0.82;
+}
+
 .task-section-inline {
   padding-top: 12px;
   padding-bottom: 12px;
@@ -1673,6 +1735,21 @@ body.dark .task-status.error {
   opacity: 0.5;
 }
 
+body.task-page-busy {
+  cursor: progress;
+}
+
+body.task-page-busy .task-button,
+body.task-page-busy .task-link-button {
+  cursor: progress;
+}
+
+@keyframes task-button-spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
 .task-share-section {
   display: grid;
   gap: 8px;
@@ -2783,3 +2860,18 @@ body.dark .plugin-option .option-icon {
     justify-self: end;
   }
 }
+
+@media (prefers-reduced-motion: reduce) {
+  .task-button,
+  .task-link-button,
+  .task-submit-feedback {
+    transition: none;
+  }
+
+  .task-button.is-busy::before,
+  .task-link-button.is-busy::before {
+    animation: none;
+    border-right-color: currentColor;
+    opacity: 0.72;
+  }
+}

package/server/public/task-launcher.js

@@ -748,6 +748,97 @@
     });
   }
 
+  function getTaskPendingCopy(kind) {
+    if (kind === "install") {
+      return {
+        button: "Installing...",
+        status: "Installing the task and reopening this page."
+      };
+    }
+    if (kind === "run") {
+      return {
+        button: "Launching...",
+        status: "Preparing the workspace and opening your selected tool."
+      };
+    }
+    return {
+      button: "Working...",
+      status: "Finishing your request."
+    };
+  }
+
+  function setTaskPendingState(form, submitter, kind) {
+    const copy = getTaskPendingCopy(kind);
+    const primarySubmitter = submitter && submitter.form === form
+      ? submitter
+      : form.querySelector("button[type='submit'], input[type='submit']");
+    const feedback = form.querySelector("[data-task-submit-feedback]");
+    const feedbackText = feedback
+      ? (feedback.querySelector("[data-task-submit-feedback-text]") || feedback)
+      : null;
+
+    form.classList.add("is-submitting");
+    form.setAttribute("aria-busy", "true");
+    document.body.classList.add("task-page-busy");
+
+    if (primarySubmitter) {
+      primarySubmitter.classList.add("is-busy");
+      primarySubmitter.setAttribute("aria-disabled", "true");
+      if (primarySubmitter.tagName === "BUTTON") {
+        const label = primarySubmitter.querySelector("span");
+        if (label) {
+          label.textContent = copy.button;
+        } else {
+          primarySubmitter.textContent = copy.button;
+        }
+      } else if (primarySubmitter.tagName === "INPUT") {
+        primarySubmitter.value = copy.button;
+      }
+      primarySubmitter.disabled = true;
+    }
+
+    Array.from(form.querySelectorAll("button[type='submit'], input[type='submit']")).forEach((button) => {
+      if (button === primarySubmitter) {
+        return;
+      }
+      button.disabled = true;
+      button.setAttribute("aria-disabled", "true");
+    });
+
+    if (feedback && feedbackText) {
+      feedbackText.textContent = copy.status;
+      feedback.classList.add("is-visible");
+      feedback.setAttribute("aria-hidden", "false");
+    }
+  }
+
+  function initTaskPendingForms() {
+    const forms = Array.from(document.querySelectorAll("form[data-task-pending-form]"));
+    forms.forEach((form) => {
+      form.addEventListener("submit", (event) => {
+        if (form.dataset.taskSubmitting === "true") {
+          event.preventDefault();
+          return;
+        }
+
+        const kind = form.getAttribute("data-task-pending-form") || "";
+        const submitter = event.submitter && event.submitter.form === form
+          ? event.submitter
+          : form.querySelector("button[type='submit'], input[type='submit']");
+
+        event.preventDefault();
+        form.dataset.taskSubmitting = "true";
+        setTaskPendingState(form, submitter, kind);
+
+        window.requestAnimationFrame(() => {
+          window.setTimeout(() => {
+            form.submit();
+          }, 0);
+        });
+      });
+    });
+  }
+
   let taskLauncherBooted = false;
 
   function bootTaskLauncher() {
@@ -759,6 +850,7 @@
     initTaskBuilder();
     initTaskLibraryPage();
     initTaskConfirmForms();
+    initTaskPendingForms();
   }
 
   if (document.readyState === "loading") {

package/server/public/universal-launcher.js

@@ -391,6 +391,17 @@
     return 'workspaces';
   }
 
+  function normalizeTaskSelectionPath(taskPath) {
+    return taskPath === 'tasks' ? 'workspaces' : taskPath;
+  }
+
+  function taskMatchesSelectionPath(task, currentPath) {
+    if (!task) {
+      return false;
+    }
+    return normalizeTaskSelectionPath(task.path || '') === (currentPath || '');
+  }
+
   function getIntentNameRelativePath(intent) {
     const normalizedIntent = normalizeIntent(intent);
     if (normalizedIntent === 'create_app') return 'api';
@@ -2108,7 +2119,7 @@
     function getVisibleTasks() {
       const query = state.query.toLowerCase();
       return state.allTasks.filter((task) => {
-        if (!task || task.path !== state.currentPath) {
+        if (!taskMatchesSelectionPath(task, state.currentPath)) {
           return false;
         }
         if (!query) {
@@ -2177,7 +2188,7 @@
     function render() {
       const visibleTasks = getVisibleTasks();
       const selectedTask = getSelectedTask();
-      const hasAvailableTasks = state.allTasks.some((task) => task && task.path === state.currentPath);
+      const hasAvailableTasks = state.allTasks.some((task) => taskMatchesSelectionPath(task, state.currentPath));
       const showingDetails = Boolean(selectedTask);
       const hasVisibleTasks = visibleTasks.length > 0;
       toggle.disabled = false;
@@ -2366,7 +2377,7 @@
       setTasks(tasks) {
         state.allTasks = Array.isArray(tasks) ? tasks.slice() : [];
         const selectedTask = getSelectedTask();
-        if (selectedTask && selectedTask.path !== state.currentPath) {
+        if (!taskMatchesSelectionPath(selectedTask, state.currentPath)) {
           state.selectedTaskId = '';
         }
         render();
@@ -2374,7 +2385,7 @@
       setPath(taskPath) {
         state.currentPath = taskPath || 'workspaces';
         const selectedTask = getSelectedTask();
-        if (selectedTask && selectedTask.path !== state.currentPath) {
+        if (!taskMatchesSelectionPath(selectedTask, state.currentPath)) {
           state.selectedTaskId = '';
         }
         state.query = '';
@@ -2547,7 +2558,7 @@
 
     function getTaskSource() {
       return state.tasks
-        .filter((task) => task && task.path === state.currentPath)
+        .filter((task) => taskMatchesSelectionPath(task, state.currentPath))
         .slice()
         .sort(compareTasksByBrowseOrder);
     }
@@ -3373,7 +3384,7 @@
       setPath(taskPath) {
         const nextPath = taskPath || 'workspaces';
         const task = getSelectedTask();
-        const selectedTaskInvalid = Boolean(task && task.path !== nextPath);
+        const selectedTaskInvalid = Boolean(task && !taskMatchesSelectionPath(task, nextPath));
         if (state.currentPath === nextPath && !selectedTaskInvalid) {
           return;
         }
@@ -3386,7 +3397,7 @@
       setTasks(tasks) {
         state.tasks = Array.isArray(tasks) ? tasks.slice() : [];
         const task = getSelectedTask();
-        if (task && task.path !== state.currentPath) {
+        if (!taskMatchesSelectionPath(task, state.currentPath)) {
           state.selectedTaskId = '';
         }
         render();

package/server/views/task_install.ejs

@@ -13,6 +13,7 @@
   <% if (agent === "electron") { %>
     <link href="/electron.css" rel="stylesheet"/>
   <% } %>
+  <script src="/task-launcher.js" defer></script>
 </head>
 <body class="<%= theme %> task-launcher-page task-page task-install-page" data-agent="<%= agent %>">
   <%- include('partials/app_navheader', { agent }) %>
@@ -63,7 +64,7 @@
         </section>
       <% } %>
 
-      <form class="task-install-actions" method="post" action="/task/install">
+      <form class="task-install-actions" method="post" action="/task/install" data-task-pending-form="install">
         <input type="hidden" name="ref" value="<%= ref %>">
         <input type="hidden" name="returnTo" value="<%= returnTo %>">
         <button class="task-button primary" type="submit">
@@ -71,6 +72,9 @@
           <span>Install and continue</span>
         </button>
         <a class="task-link-button" href="/tasks">Cancel</a>
+        <p class="task-submit-feedback" data-task-submit-feedback aria-live="polite" aria-hidden="true">
+          <span data-task-submit-feedback-text></span>
+        </p>
       </form>
     </div>
   </section>

package/server/views/task_launch.ejs

@@ -17,12 +17,13 @@
   <script src="/task-share.js" defer></script>
 </head>
 <%
-  const runRootCopy = task.config.path === 'api'
+  const effectiveTaskPath = task.config.path === 'tasks' ? 'workspaces' : task.config.path
+  const runRootCopy = effectiveTaskPath === 'api'
     ? 'Creates a new app.'
-    : task.config.path === 'plugin'
+    : effectiveTaskPath === 'plugin'
       ? 'Creates a new plugin.'
       : 'Runs in a new workspace.'
-  const folderMeta = task.config.path === 'workspaces' ? 'Optional' : ''
+  const folderMeta = effectiveTaskPath === 'workspaces' ? 'Optional' : ''
   const headerDescription = task.config.description && !/{{/.test(task.config.description)
     ? task.config.description
     : ''
@@ -114,7 +115,7 @@
         <div class="task-status error"><%= error %></div>
       <% } %>
 
-      <form class="task-run-form task-detail-layout" method="post" action="/task/start">
+      <form class="task-run-form task-detail-layout" method="post" action="/task/start" data-task-pending-form="run">
         <input type="hidden" name="id" value="<%= task.id %>">
 
         <div class="task-detail-main">
@@ -126,6 +127,9 @@
                 <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>