pinokiod 7.2.8 → 7.2.9

package/server/index.js

@@ -29,7 +29,7 @@ const serveIndex = require('./serveIndex')
 const registerFileRoutes = require('./routes/files')
 const registerAppRoutes = require('./routes/apps')
 const registerWorkspacesRoutes = require('./routes/workspaces')
-const registerDraftImportRoutes = require('./routes/draft_import')
+const { mountFeatures } = require('./features')
 const Git = require("../kernel/git")
 const TerminalApi = require('../kernel/api/terminal')
 
@@ -80,7 +80,6 @@ const { createDesktopEventRouter } = require("./lib/desktop_event_router")
 const { createInjectRouter, resolveInjectList } = require("./lib/inject_router")
 const { createTaskPackageService } = require("./lib/task_packages")
 const { createTaskWorkspaceLinkService } = require("./lib/task_workspace_links")
-const { createDraftService } = require("./lib/drafts")
 const { createWorkspaceRuntimeService } = require("./lib/workspace_runtime")
 const { createWorkspaceCatalogService } = require("./lib/workspace_catalog")
 const { createContentValidationService } = require("./lib/content_validation")
@@ -2870,11 +2869,19 @@ 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")
+            : false
+          const draftWatchCwd = draftWatchEnabled
+            ? (req.query.cwd || path.dirname(filepath))
+            : ""
           const result = {
             portal: this.portal,
             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,
             kill_message,
             callback,
             callback_target,
@@ -8412,23 +8419,20 @@ class Server {
       kernel: this.kernel
     })
     this.workspaceRuntime = workspaceRuntime
-    const drafts = createDraftService({
+    const features = await mountFeatures({
+      app: this.app,
       kernel: this.kernel,
-      taskWorkspaceLinks
+      taskWorkspaceLinks,
+      defaultRegistryUrl: DEFAULT_REGISTRY_URL
     })
+    this.features = features
+    const drafts = features.drafts.service
     this.drafts = drafts
     const workspaceCatalog = createWorkspaceCatalogService({
       kernel: this.kernel,
       workspaceRuntime,
       drafts
     })
-    drafts.start().catch((error) => {
-      console.warn("[drafts] failed to start", error && error.message ? error.message : error)
-    })
-    registerDraftImportRoutes(this.app, {
-      drafts,
-      defaultRegistryUrl: DEFAULT_REGISTRY_URL
-    })
     registerWorkspacesRoutes(this.app, {
       workspaceCatalog,
       composePeerAccessPayload: () => this.composePeerAccessPayload(),
@@ -9870,9 +9874,6 @@ class Server {
           }
           try {
             await taskWorkspaceLinks.touchTaskWorkspace(task.id, workspaceRef)
-            drafts.trackWorkspace({ taskId: task.id, ref: workspaceRef }).catch((error) => {
-              console.warn("[drafts] failed to track workspace", error && error.message ? error.message : error)
-            })
           } catch (error) {
             await taskPackages.deleteTaskPackage(task.id).catch(() => {})
             throw error
@@ -10110,7 +10111,8 @@ class Server {
         }
       }
 
-      const prompt = taskPackages.applyTemplateValues(task.template, filterFilledTaskInputValues(inputValues)).trim()
+      const filledInputValues = filterFilledTaskInputValues(inputValues)
+      const prompt = taskPackages.applyTemplateValues(task.template, filledInputValues).trim()
       if (!prompt) {
         await renderTaskLaunchPage(req, res, task, {
           selectedTool,
@@ -10216,9 +10218,6 @@ class Server {
 	        }
 	        try {
 	          await taskWorkspaceLinks.touchTaskWorkspace(task.id, workspaceRef)
-	          drafts.trackWorkspace({ taskId: task.id, ref: workspaceRef }).catch((error) => {
-	            console.warn("[drafts] failed to track workspace", error && error.message ? error.message : error)
-	          })
 	        } catch (error) {
 	          await renderTaskLaunchPage(req, res, task, {
 	            selectedTool,
@@ -10234,24 +10233,13 @@ class Server {
       params.set("cwd", targetPath)
       params.set("chrome", "full")
       params.set("prompt", prompt)
+      if (filledInputValues.url) {
+        params.set("url", filledInputValues.url)
+      }
       res.redirect(`${pluginHref}?${params.toString()}`)
     })
     this.app.post("/task/start", handleTaskStartRequest)
 
-    this.app.get("/drafts", ex(async (req, res) => {
-      const cwd = typeof req.query.cwd === "string" ? req.query.cwd : ""
-      const items = await drafts.listPending({ cwd })
-      res.json({
-        ok: true,
-        items
-      })
-    }))
-
-    this.app.post("/drafts/:id/dismiss", ex(async (req, res) => {
-      const ok = await drafts.dismiss(req.params.id)
-      res.json({ ok })
-    }))
-
     this.app.get("/home", renderHomePage)
 
     const normalizePathForComparison = (value) => {
@@ -10554,7 +10542,8 @@ class Server {
           return
         }
 
-        const prompt = taskPackages.applyTemplateValues(task.template, filterFilledTaskInputValues(inputValues)).trim()
+        const filledInputValues = filterFilledTaskInputValues(inputValues)
+        const prompt = taskPackages.applyTemplateValues(task.template, filledInputValues).trim()
         if (!prompt) {
           res.status(400).json({
             ok: false,
@@ -10648,15 +10637,15 @@ class Server {
 	        }
 
 	        await taskWorkspaceLinks.touchTaskWorkspace(task.id, workspaceRef)
-	        drafts.trackWorkspace({ taskId: task.id, ref: workspaceRef }).catch((error) => {
-	          console.warn("[drafts] failed to track workspace", error && error.message ? error.message : error)
-	        })
 
         const params = new URLSearchParams()
         params.set("cwd", targetPath)
         params.set("chrome", "full")
         params.set("session", createUniversalLauncherSessionId())
         params.set("prompt", prompt)
+        if (filledInputValues.url) {
+          params.set("url", filledInputValues.url)
+        }
 
         res.json({
           ok: true,

package/server/views/app.ejs

@@ -5222,9 +5222,6 @@ header.navheader .mode-selector .community-mode-toggle {
           <a class='btn mobile-sheet-action' href="/home" aria-label="Home" title="Home">
             <i class="fa-solid fa-house"></i>
           </a>
-          <a class='btn mobile-sheet-action' href="/workspaces" aria-label="Workspaces" title="Workspaces">
-            <i class="fa-solid fa-folder-tree"></i>
-          </a>
           <button type='button' class='btn mobile-sheet-action' data-mobile-proxy="#refresh-page" data-mobile-close-menu="true" aria-label="Refresh" title="Refresh">
             <i class="fa-solid fa-rotate-right"></i>
           </button>
@@ -5291,15 +5288,9 @@ header.navheader .mode-selector .community-mode-toggle {
             </a>
           <%})%>
         </div>
+        <div class='active-nested-path hidden' id='active-nested-path'></div>
       </div>
       <div class='menu-actions'>
-        <a id='workspaces-tab' href="/workspaces" class="btn header-item" data-tippy-content="Workspaces">
-          <div class='tab'>
-            <i class="fa-solid fa-folder-tree menu-action-leading-icon"></i>
-            <div class='display'>Workspaces</div>
-            <div class='flexible'></div>
-          </div>
-        </a>
         <% if (type === 'run') { %>
           <button type='button' id='ask-ai-tab' class="btn header-item" data-static="ask-ai" data-workspace="<%=name%>" data-workspace-cwd="<%=path%>" data-ask-ai-trigger="true" data-tippy-content="Ask AI">
             <div class='tab'>
@@ -5615,9 +5606,6 @@ header.navheader .mode-selector .community-mode-toggle {
       <a class='btn mobile-sheet-action' href="/home" aria-label="Home" title="Home">
         <i class="fa-solid fa-house"></i>
       </a>
-      <a class='btn mobile-sheet-action' href="/workspaces" aria-label="Workspaces" title="Workspaces">
-        <i class="fa-solid fa-folder-tree"></i>
-      </a>
       <button type='button' class='btn mobile-sheet-action' data-mobile-proxy="#refresh-page" data-mobile-close-menu="true" aria-label="Refresh" title="Refresh">
         <i class="fa-solid fa-rotate-right"></i>
       </button>
@@ -7197,6 +7185,7 @@ const rerenderMenuSection = (container, html) => {
     }
 
     if (!target) {
+      activeNestedFocusMenu = null
       syncActiveNestedPath()
       browserPopoutSurface.hide()
       document.querySelector(".container").classList.remove("active")
@@ -7230,6 +7219,7 @@ const rerenderMenuSection = (container, html) => {
       el.classList.remove("selected")
     })
     target.classList.add("selected")
+    activeNestedFocusMenu = null
     syncActiveNestedPath({ selectedLink: target })
     if (skipPersistedSelection && target.hasAttribute('data-default')) {
       ignorePersistedSelection = false
@@ -8065,7 +8055,162 @@ const rerenderMenuSection = (container, html) => {
 
   const getSubmenu = (menu) => getDirectChild(menu, ".submenu")
   const getToggle = (menu) => getDirectChild(menu, ".reveal")
-  const syncActiveNestedPath = () => {}
+  const activeNestedPathRoot = document.getElementById("active-nested-path")
+  const activeNestedProxyMap = new WeakMap()
+  let activeNestedFocusMenu = null
+
+  const getNestedMenuChain = (node) => {
+    if (!node) {
+      return []
+    }
+    let current = node
+    if (!current.classList || !current.classList.contains("nested-menu")) {
+      current = current.closest(".nested-menu")
+    }
+    const chain = []
+    while (current) {
+      chain.unshift(current)
+      current = current.parentElement ? current.parentElement.closest(".nested-menu") : null
+    }
+    return chain
+  }
+
+  const sanitizeActiveNestedProxy = (proxy) => {
+    if (!proxy) {
+      return null
+    }
+    proxy.removeAttribute("id")
+    proxy.classList.remove("frame-link", "selected", "tab-link-popover-host")
+    proxy.classList.add("active-nested-proxy")
+    proxy.setAttribute("data-active-nested-proxy", "true")
+    proxy.querySelectorAll(".tab-link-popover-trigger").forEach((node) => {
+      node.remove()
+    })
+    return proxy
+  }
+
+  const buildActiveNestedProxy = (child, isCurrent) => {
+    if (!child) {
+      return null
+    }
+    let proxy
+    if (child.classList && child.classList.contains("nested-menu")) {
+      const toggle = getToggle(child)
+      if (!toggle) {
+        return null
+      }
+      proxy = toggle.cloneNode(true)
+    } else {
+      proxy = child.cloneNode(true)
+    }
+    sanitizeActiveNestedProxy(proxy)
+    if (child.classList && child.classList.contains("nested-menu")) {
+      const loader = proxy.querySelector(".loader")
+      if (loader) {
+        loader.innerHTML = `<i class="fa-solid ${isCurrent ? "fa-angle-down" : "fa-angle-right"}"></i>`
+      }
+    }
+    proxy.classList.toggle("is-current", Boolean(isCurrent))
+    activeNestedProxyMap.set(proxy, child)
+    return proxy
+  }
+
+  const syncActiveNestedPath = ({ selectedLink = null } = {}) => {
+    if (!activeNestedPathRoot) {
+      return
+    }
+    if (activeNestedFocusMenu && !activeNestedFocusMenu.isConnected) {
+      activeNestedFocusMenu = null
+    }
+    const currentSelectedLink = (selectedLink && selectedLink.isConnected)
+      ? selectedLink
+      : document.querySelector("aside .frame-link.selected")
+    const chain = activeNestedFocusMenu
+      ? getNestedMenuChain(activeNestedFocusMenu)
+      : getNestedMenuChain(currentSelectedLink)
+
+    activeNestedPathRoot.replaceChildren()
+
+    if (!chain.length) {
+      activeNestedPathRoot.classList.add("hidden")
+      if (window.PinokioMenuScrollHints && typeof window.PinokioMenuScrollHints.update === "function") {
+        window.PinokioMenuScrollHints.update()
+      }
+      return
+    }
+
+    chain.forEach((menu, index) => {
+      const submenu = getSubmenu(menu)
+      if (!submenu) {
+        return
+      }
+      const row = document.createElement("div")
+      row.className = "m active-nested-row"
+      row.dataset.activeNestedLevel = String(index)
+      const nextMenu = chain[index + 1] || null
+
+      Array.from(submenu.children).forEach((child) => {
+        let isCurrent = false
+        if (child.classList && child.classList.contains("nested-menu")) {
+          isCurrent = child === nextMenu || (!nextMenu && currentSelectedLink ? child.contains(currentSelectedLink) : false)
+        } else {
+          isCurrent = child === currentSelectedLink
+        }
+        const proxy = buildActiveNestedProxy(child, isCurrent)
+        if (proxy) {
+          row.appendChild(proxy)
+        }
+      })
+
+      if (row.childElementCount > 0) {
+        activeNestedPathRoot.appendChild(row)
+      }
+    })
+
+    if (!activeNestedPathRoot.childElementCount) {
+      activeNestedPathRoot.classList.add("hidden")
+      if (window.PinokioMenuScrollHints && typeof window.PinokioMenuScrollHints.update === "function") {
+        window.PinokioMenuScrollHints.update()
+      }
+      return
+    }
+
+    activeNestedPathRoot.classList.remove("hidden")
+    const currentProxy = activeNestedPathRoot.querySelector(".active-nested-proxy.is-current")
+    if (currentProxy && typeof currentProxy.scrollIntoView === "function") {
+      currentProxy.scrollIntoView({
+        block: "nearest",
+        inline: "nearest"
+      })
+    }
+    if (window.PinokioMenuScrollHints && typeof window.PinokioMenuScrollHints.update === "function") {
+      window.PinokioMenuScrollHints.update()
+    }
+  }
+
+  if (activeNestedPathRoot) {
+    activeNestedPathRoot.addEventListener("click", (event) => {
+      const proxy = event.target.closest("[data-active-nested-proxy='true']")
+      if (!proxy || !activeNestedPathRoot.contains(proxy)) {
+        return
+      }
+      const source = activeNestedProxyMap.get(proxy)
+      if (!source || !source.isConnected) {
+        return
+      }
+      event.preventDefault()
+      event.stopPropagation()
+      if (source.classList && source.classList.contains("nested-menu")) {
+        activeNestedFocusMenu = source
+        syncActiveNestedPath()
+        return
+      }
+      activeNestedFocusMenu = null
+      if (typeof source.click === "function") {
+        source.click()
+      }
+    })
+  }
 
   renderSelection()
 

package/server/views/terminal.ejs

@@ -3086,11 +3086,13 @@ const reloadMemory = async () => {
       </a>
     </div>
   </div>
-  <script>
-    window.PinokioDraftContext = {
-      cwd: <%- JSON.stringify((typeof cwd !== 'undefined' && cwd) ? cwd : '').replace(/</g, '\\u003c') %>
-    };
-  </script>
-  <script src="/drafts.js"></script>
+  <% if (typeof draft_watch_enabled !== 'undefined' && draft_watch_enabled) { %>
+    <script>
+      window.PinokioDraftContext = {
+        cwd: <%- JSON.stringify((typeof draft_watch_cwd !== 'undefined' && draft_watch_cwd) ? draft_watch_cwd : '').replace(/</g, '\\u003c') %>
+      };
+    </script>
+    <script src="/drafts.js"></script>
+  <% } %>
 </body>
 </html>