pinokiod 8.0.12 → 8.0.14

package/kernel/path_removal.js

@@ -3,6 +3,7 @@ const path = require("path")
 const { inspectWindowsFileLocks } = require("./windows_restart_manager")
 
 const PATH_REMOVAL_BLOCKED_CODE = "PINOKIO_PATH_REMOVE_BLOCKED"
+const PATH_REMOVAL_PENDING_CODE = "PINOKIO_PATH_REMOVE_PENDING"
 const REMAINING_PREVIEW_LIMIT = 20
 
 class PathRemovalBlockedError extends Error {
@@ -38,7 +39,17 @@ class PathRemovalBlockedError extends Error {
   }
 }
 
+class PathRemovalPendingError extends Error {
+  constructor(target, cause) {
+    super(`Windows still could not remove ${target}.`)
+    this.name = "PathRemovalPendingError"
+    this.code = PATH_REMOVAL_PENDING_CODE
+    this.cause = cause
+  }
+}
+
 const isPathRemovalBlockedError = (error) => !!(error && error.code === PATH_REMOVAL_BLOCKED_CODE)
+const isPathRemovalPendingError = (error) => !!(error && error.code === PATH_REMOVAL_PENDING_CODE)
 
 const collectRemaining = async (target, fsPromises = fs.promises) => {
   const files = []
@@ -87,43 +98,30 @@ const createPathRemover = (dependencies = {}) => {
     const resolvedTarget = path.resolve(target)
     const {
       operation = "Removing files",
+      diagnose = true,
       ...rmOptions
     } = options
-    const trace = (stage, details = "") => {
-      if (platform === "win32") {
-        console.log(`[path removal] ${stage} target=${resolvedTarget}${details ? ` ${details}` : ""}`)
-      }
-    }
 
-    const removeStartedAt = Date.now()
-    trace("rm:start")
     try {
       await fsPromises.rm(resolvedTarget, rmOptions)
-      trace("rm:done", `elapsedMs=${Date.now() - removeStartedAt}`)
       return { removed: true, target: resolvedTarget }
     } catch (error) {
       if (platform !== "win32") {
         throw error
       }
-      trace("rm:failed", `elapsedMs=${Date.now() - removeStartedAt} code=${error && error.code ? error.code : "unknown"}`)
+      if (!diagnose) {
+        throw new PathRemovalPendingError(resolvedTarget, error)
+      }
 
-      const scanStartedAt = Date.now()
-      trace("scan:start")
       const remaining = await collectRemaining(resolvedTarget, fsPromises)
-      trace("scan:done", `elapsedMs=${Date.now() - scanStartedAt} paths=${remaining.paths.length} files=${remaining.files.length}`)
       if (remaining.paths.length === 0) {
         throw error
       }
 
       let inspection = { blockers: [] }
-      const inspectionStartedAt = Date.now()
-      trace("restart-manager:start", `files=${remaining.files.length}`)
       try {
         inspection = await inspectLocks(remaining.files)
-        const blockerCount = Array.isArray(inspection && inspection.blockers) ? inspection.blockers.length : 0
-        trace("restart-manager:done", `elapsedMs=${Date.now() - inspectionStartedAt} blockers=${blockerCount}`)
       } catch (inspectionError) {
-        trace("restart-manager:failed", `elapsedMs=${Date.now() - inspectionStartedAt} message=${inspectionError && inspectionError.message ? inspectionError.message : String(inspectionError)}`)
         console.warn("[path removal] Restart Manager inspection failed", inspectionError)
       }
 
@@ -143,8 +141,10 @@ const removePath = createPathRemover()
 
 module.exports = {
   PATH_REMOVAL_BLOCKED_CODE,
+  PATH_REMOVAL_PENDING_CODE,
   collectRemaining,
   createPathRemover,
   isPathRemovalBlockedError,
+  isPathRemovalPendingError,
   removePath,
 }

package/package.json

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

package/server/index.js

@@ -34,7 +34,7 @@ const Git = require("../kernel/git")
 const TerminalApi = require('../kernel/api/terminal')
 const PluginSources = require("../kernel/plugin_sources")
 const ManagedSkills = require("../kernel/managed_skills")
-const { isPathRemovalBlockedError, removePath } = require("../kernel/path_removal")
+const { isPathRemovalBlockedError, isPathRemovalPendingError, removePath } = require("../kernel/path_removal")
 
 const git = require('isomorphic-git')
 const http = require('isomorphic-git/http/node')
@@ -63,6 +63,40 @@ const ex = fn => (req, res, next) => {
   Promise.resolve(fn(req, res, next)).catch(next);
 };
 
+const isPathInsideRoot = (candidatePath, rootPath) => {
+  const relative = path.relative(rootPath, candidatePath)
+  return relative === "" || (
+    relative !== ".."
+    && !relative.startsWith(`..${path.sep}`)
+    && !path.isAbsolute(relative)
+  )
+}
+
+const resolveAppRemovalPath = async (apiRoot, name) => {
+  if (typeof name !== "string" || !name || name.includes("\0")) {
+    return null
+  }
+  const root = path.resolve(apiRoot)
+  const target = path.resolve(root, name)
+  if (target === root || !isPathInsideRoot(target, root)) {
+    return null
+  }
+  const stat = await fs.promises.lstat(target).catch((error) => {
+    if (error && error.code === "ENOENT") return null
+    throw error
+  })
+  if (stat && !stat.isSymbolicLink()) {
+    const [realRoot, realTarget] = await Promise.all([
+      fs.promises.realpath(root),
+      fs.promises.realpath(target),
+    ])
+    if (realTarget === realRoot || !isPathInsideRoot(realTarget, realRoot)) {
+      return null
+    }
+  }
+  return target
+}
+
 
 
 
@@ -16263,6 +16297,10 @@ class Server {
       console.timeEnd("/p/" + req.params.name + "/" + d)
     }))
     this.app.post("/pinokio/delete", ex(async (req, res) => {
+      if (!privacyFilterCache.isInstallRequestAllowed(req)) {
+        res.status(403).json({ error: "Cross-site deletion is not allowed" })
+        return
+      }
       try {
         if (req.body.type === 'conda-runtime') {
           for (const runtimeName of ["miniconda", "miniforge"]) {
@@ -16270,6 +16308,7 @@ class Server {
             await removePath(runtimePath, {
               recursive: true,
               force: true,
+              diagnose: req.body.background !== true,
               operation: "Updating Miniforge",
             })
           }
@@ -16279,15 +16318,18 @@ class Server {
           await removePath(folderPath, {
             recursive: true,
             force: true,
+            diagnose: req.body.background !== true,
             operation: "Resetting managed tools",
           })
           await fs.promises.mkdir(folderPath, { recursive: true }).catch((e) => { })
+          await this.kernel.bin.refreshInstalled()
           res.json({ success: true })
         } else if (req.body.type === 'cache') {
           let folderPath = this.kernel.path("cache")
           await removePath(folderPath, {
             recursive: true,
             force: true,
+            diagnose: req.body.background !== true,
             operation: "Clearing the Pinokio cache",
           })
           await fs.promises.mkdir(folderPath, { recursive: true }).catch((e) => { })
@@ -16306,10 +16348,15 @@ class Server {
           }
           res.json({ success: true })
         } else if (req.body.name) {
-          let folderPath = this.kernel.path("api", req.body.name)
+          const folderPath = await resolveAppRemovalPath(this.kernel.path("api"), req.body.name)
+          if (!folderPath) {
+            res.status(400).json({ error: "Invalid app deletion path" })
+            return
+          }
           await removePath(folderPath, {
             recursive: true,
             force: true,
+            diagnose: req.body.background !== true,
             operation: `Deleting ${req.body.name}`,
           })
 //          await fs.promises.mkdir(folderPath, { recursive: true }).catch((e) => { })
@@ -16322,6 +16369,10 @@ class Server {
           res.json({ success: true })
         }
       } catch(err) {
+        if (isPathRemovalPendingError(err)) {
+          res.status(423).json({ success: false, pending: true })
+          return
+        }
         if (isPathRemovalBlockedError(err)) {
           res.status(423).json({ success: false, error: err.toJSON() })
           return
@@ -16568,6 +16619,7 @@ class Server {
     this.app.post("/pinokio/install", ex((req, res) => {
       req.session.requirements = req.body.requirements
       req.session.callback = req.body.callback
+      req.session.fresh = req.body.fresh === "1"
       res.redirect("/pinokio/install")
     }))
     this.app.post("/pinokio/install/validate", ex(async (req, res) => {
@@ -16579,8 +16631,10 @@ class Server {
       res.set("Cache-Control", "no-store")
       let requirements = req.session.requirements
       let callback = req.session.callback
+      let fresh = req.session.fresh === true
       req.session.requirements = null
       req.session.callback = null
+      req.session.fresh = null
       res.render("install", {
         logo: this.logo,
         theme: this.theme,
@@ -16589,7 +16643,8 @@ class Server {
         display: ["form"],
 //        query: req.query,
         requirements,
-        callback
+        callback,
+        fresh,
       })
     }))
     this.app.get("/pinokio", ex((req, res) => {

package/server/public/common.js

@@ -82,7 +82,7 @@ const PinokioPathRemoval = (() => {
         : ""
       throw new Error(text || `Request failed (${response.status || "unknown"})`)
     }
-    if (!response.ok && !blockedDetails(payload)) {
+    if (!response.ok && !blockedDetails(payload) && !(payload && payload.pending === true)) {
       const message = payload && payload.error
       throw new Error(typeof message === "string" ? message : `Request failed (${response.status})`)
     }
@@ -121,9 +121,13 @@ const PinokioPathRemoval = (() => {
       const attempt = async (manual = false) => {
         if (retrying || settled || typeof retry !== "function") return false
         retrying = true
-        if (typeof Swal.disableButtons === "function") Swal.disableButtons()
+        if (manual && typeof Swal.disableButtons === "function") Swal.disableButtons()
         try {
-          const result = await retry()
+          const result = await retry(manual)
+          if (settled) return false
+          if (result && result.pending === true) {
+            return false
+          }
           const nextBlocked = blockedDetails(result)
           if (nextBlocked) {
             current = nextBlocked
@@ -138,7 +142,7 @@ const PinokioPathRemoval = (() => {
           return false
         } finally {
           retrying = false
-          if (!settled && typeof Swal.enableButtons === "function") Swal.enableButtons()
+          if (manual && !settled && typeof Swal.enableButtons === "function") Swal.enableButtons()
         }
       }
 
@@ -169,7 +173,7 @@ const PinokioPathRemoval = (() => {
   }
 
   const request = async (requestFactory) => {
-    const execute = async () => parseResponse(await requestFactory())
+    const execute = async (background = false) => parseResponse(await requestFactory(background))
     const initial = await execute()
     const details = blockedDetails(initial)
     if (!details) {
@@ -180,7 +184,7 @@ const PinokioPathRemoval = (() => {
     }
     return show({
       details,
-      retry: execute,
+      retry: (manual) => execute(!manual),
     })
   }
 

package/server/public/task-launcher.css

@@ -1902,16 +1902,6 @@ body.dark .setup-requirement-row.needs-update .setup-requirement-state {
   color: var(--task-muted);
 }
 
-.setup-reset-loading {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  margin-top: 12px;
-  color: var(--task-muted);
-  font-size: 12px;
-  line-height: 1.45;
-}
-
 .setup-state-root {
   min-height: 260px;
   display: flex;

package/server/views/app.ejs

@@ -11866,12 +11866,12 @@ const rerenderMenuSection = (container, html) => {
             actions: "hidden"
           }
         });
-        let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
+        let res = await PinokioPathRemoval.request((background) => fetch("/pinokio/delete", {
           method: "post",
           headers: {
             "Content-Type": "application/json"
           },
-          body: JSON.stringify({ name })
+          body: JSON.stringify({ name, background })
         }))
         console.log("res", res)
         Swal.close()

package/server/views/download.ejs

@@ -231,12 +231,12 @@ document.addEventListener("DOMContentLoaded", async () => {
       if (proceed) {
         document.querySelector(".reset-bin-loading").classList.remove("hidden")
         document.querySelector("#del-bin").classList.add("hidden")
-        let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
+        let res = await PinokioPathRemoval.request((background) => fetch("/pinokio/delete", {
           method: "post",
           headers: {
             "Content-Type": "application/json"
           },
-          body: JSON.stringify({ type: "bin" })
+          body: JSON.stringify({ type: "bin", background })
         }))
         console.log(res)
         document.querySelector(".reset-bin-loading").classList.add("hidden")

package/server/views/editor.ejs

@@ -940,12 +940,12 @@ document.addEventListener("DOMContentLoaded", async () => {
       if (proceed) {
         document.querySelector(".reset-bin-loading").classList.remove("hidden")
         document.querySelector("#del-bin").classList.add("hidden")
-        let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
+        let res = await PinokioPathRemoval.request((background) => fetch("/pinokio/delete", {
           method: "post",
           headers: {
             "Content-Type": "application/json"
           },
-          body: JSON.stringify({ type: "bin" })
+          body: JSON.stringify({ type: "bin", background })
         }))
         console.log(res)
         document.querySelector(".reset-bin-loading").classList.add("hidden")

package/server/views/env_editor.ejs

@@ -447,12 +447,12 @@ document.addEventListener("DOMContentLoaded", async () => {
           }
         })
         try {
-          const res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
+          const res = await PinokioPathRemoval.request((background) => fetch("/pinokio/delete", {
             method: "post",
             headers: {
               "Content-Type": "application/json"
             },
-            body: JSON.stringify({ name: projectName })
+            body: JSON.stringify({ name: projectName, background })
           }))
           Swal.close()
           if (res && res.success) {

package/server/views/file_explorer.ejs

@@ -636,12 +636,12 @@ document.addEventListener("click", async (e) => {
           actions: "hidden"
         }
       });
-      let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
+      let res = await PinokioPathRemoval.request((background) => fetch("/pinokio/delete", {
         method: "post",
         headers: {
           "Content-Type": "application/json"
         },
-        body: JSON.stringify({ name })
+        body: JSON.stringify({ name, background })
       }))
       console.log("res", res)
       Swal.close()

package/server/views/index.ejs

@@ -4031,12 +4031,12 @@ document.addEventListener("click", async (e) => {
           actions: "hidden"
         }
       });
-      let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
+      let res = await PinokioPathRemoval.request((background) => fetch("/pinokio/delete", {
         method: "post",
         headers: {
           "Content-Type": "application/json"
         },
-        body: JSON.stringify({ name })
+        body: JSON.stringify({ name, background })
       }))
       console.log("res", res)
       Swal.close()

package/server/views/install.ejs

@@ -540,6 +540,7 @@ body.install-page #terminal .xterm {
 </div>
 <input id='requirements' type='hidden' value="<%=requirements%>">
 <input id='callback' type='hidden' value="<%=callback%>">
+<input id='fresh' type='hidden' value="<%=fresh ? '1' : '0'%>">
 <script>
 //
 // /install_bin?type=bin&uri=conda
@@ -731,6 +732,43 @@ const navigateToCallback = () => {
   }
   location.href = href
 }
+const prepareFreshInstall = async () => {
+  if (document.querySelector("#fresh").value !== "1") return true
+  try {
+    const result = await PinokioPathRemoval.request((background) => fetch("/pinokio/delete", {
+      method: "post",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ type: "bin", background })
+    }))
+    if (result.cancelled) {
+      navigateToCallback()
+      return false
+    }
+    if (result.error) throw new Error(result.error)
+    return true
+  } catch (error) {
+    ModalInput({
+      title: "Error",
+      type: "modal",
+      description: error && error.message ? error.message : "Unable to reset managed tools."
+    })
+    return false
+  }
+}
+const resumeInstall = () => {
+  const form = document.createElement("form")
+  form.method = "post"
+  form.action = "/pinokio/install"
+  for (const name of ["requirements", "callback"]) {
+    const input = document.createElement("input")
+    input.type = "hidden"
+    input.name = name
+    input.value = document.querySelector(`#${name}`).value
+    form.appendChild(input)
+  }
+  document.body.appendChild(form)
+  form.submit()
+}
 const createTerm = async (_theme) => {
   //const theme = Object.assign({ }, xtermTheme.Terminal_Basic, {
   const theme = Object.assign({ }, _theme, {
@@ -789,6 +827,7 @@ const createTerm = async (_theme) => {
 }
 document.addEventListener("DOMContentLoaded", async () => {
   applyInstallSpinnerVariant(randomInstallSpinnerVariant())
+  if (!await prepareFreshInstall()) return
   const n = new N()
   let socket = new Socket()
   <% if (theme === "dark") { %>
@@ -854,13 +893,13 @@ document.addEventListener("DOMContentLoaded", async () => {
       } else if (packet.type === "path.remove.blocked") {
         const result = await PinokioPathRemoval.show({
           details: packet.data,
-          retry: async () => {
+          retry: async (manual) => {
             const response = await fetch("/pinokio/delete", {
               method: "post",
               headers: {
                 "Content-Type": "application/json"
               },
-              body: JSON.stringify({ type: "conda-runtime" })
+              body: JSON.stringify({ type: "conda-runtime", background: !manual })
             })
             const payload = await response.json()
             const blocked = PinokioPathRemoval.blockedDetails(payload)
@@ -872,7 +911,7 @@ document.addEventListener("DOMContentLoaded", async () => {
           }
         })
         if (result && result.success) {
-          setTimeout(() => window.location.reload(), 0)
+          resumeInstall()
         } else if (result && result.cancelled) {
           navigateToCallback()
         }

package/server/views/net.ejs

@@ -2361,12 +2361,12 @@ document.addEventListener("click", async (e) => {
           actions: "hidden"
         }
       });
-      let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
+      let res = await PinokioPathRemoval.request((background) => fetch("/pinokio/delete", {
         method: "post",
         headers: {
           "Content-Type": "application/json"
         },
-        body: JSON.stringify({ name })
+        body: JSON.stringify({ name, background })
       }))
       console.log("res", res)
       Swal.close()

package/server/views/settings.ejs

@@ -1537,12 +1537,12 @@ document.addEventListener("DOMContentLoaded", async () => {
       if (proceed) {
         document.querySelector(".reset-bin-loading").classList.remove("hidden")
         document.querySelector("#del-bin").classList.add("hidden")
-        let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
+        let res = await PinokioPathRemoval.request((background) => fetch("/pinokio/delete", {
           method: "post",
           headers: {
             "Content-Type": "application/json"
           },
-          body: JSON.stringify({ type: "bin" })
+          body: JSON.stringify({ type: "bin", background })
         }))
         console.log(res)
         document.querySelector(".reset-bin-loading").classList.add("hidden")
@@ -1561,12 +1561,12 @@ document.addEventListener("DOMContentLoaded", async () => {
       if (proceed) {
         document.querySelector(".reset-cache-loading").classList.remove("hidden")
         document.querySelector("#del-cache").classList.add("hidden")
-        let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
+        let res = await PinokioPathRemoval.request((background) => fetch("/pinokio/delete", {
           method: "post",
           headers: {
             "Content-Type": "application/json"
           },
-          body: JSON.stringify({ type: "cache" })
+          body: JSON.stringify({ type: "cache", background })
         }))
         console.log(res)
         document.querySelector(".reset-cache-loading").classList.add("hidden")

package/server/views/setup.ejs

@@ -177,18 +177,18 @@
                     <%= install_required ? 'This uses the same install flow as before.' : 'Pinokio can reopen the same destination without reinstalling anything.' %>
                   </p>
 
+                  <form class="task-hidden" id="fresh-install-form" method="post" action="/pinokio/install">
+                    <input type="hidden" name="requirements" value="<%= JSON.stringify(requirementList) %>">
+                    <input type="hidden" name="callback" value="<%= targetPath %>">
+                    <input type="hidden" name="fresh" value="1">
+                  </form>
                   <div class="setup-secondary-actions">
                     <span class="task-inline-help">Not working?</span>
-                    <button class="task-button" type="button" id="del-bin">
+                    <button class="task-button" type="submit" form="fresh-install-form">
                       <i class="fa-solid fa-trash" aria-hidden="true"></i>
                       <span>Try a fresh install</span>
                     </button>
                   </div>
-
-                  <div class="reset-bin-loading hidden setup-reset-loading">
-                    <i class="fa-solid fa-circle-notch fa-spin" aria-hidden="true"></i>
-                    <span>Stand by. Do not close this window.</span>
-                  </div>
                 </section>
               </div>
             </div>
@@ -383,30 +383,6 @@
         showWaitError(error && error.message ? error.message : "Failed to restart Pinokio")
       }
     <% } %>
-    if (document.querySelector("#del-bin")) {
-      document.querySelector("#del-bin").addEventListener("click", async () => {
-        let proceed = confirm("Are you sure you wish to delete the bin folder?")
-        if (proceed) {
-          document.querySelector(".reset-bin-loading").classList.remove("hidden")
-          document.querySelector("#del-bin").classList.add("hidden")
-          let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
-            method: "post",
-            headers: {
-              "Content-Type": "application/json"
-            },
-            body: JSON.stringify({ type: "bin" })
-          }))
-          document.querySelector(".reset-bin-loading").classList.add("hidden")
-          if (res.cancelled) {
-            document.querySelector("#del-bin").classList.remove("hidden")
-          } else if (res.error) {
-            alert(res.error)
-          } else {
-            document.querySelector("#install-form").submit()
-          }
-        }
-      })
-    }
   })
   </script>
   <%- include('partials/app_common_scripts') %>

package/server/views/terminal.ejs

@@ -3339,12 +3339,12 @@ document.addEventListener("DOMContentLoaded", async () => {
       if (proceed) {
         document.querySelector(".reset-bin-loading").classList.remove("hidden")
         document.querySelector("#del-bin").classList.add("hidden")
-        let res = await PinokioPathRemoval.request(() => fetch("/pinokio/delete", {
+        let res = await PinokioPathRemoval.request((background) => fetch("/pinokio/delete", {
           method: "post",
           headers: {
             "Content-Type": "application/json"
           },
-          body: JSON.stringify({ type: "bin" })
+          body: JSON.stringify({ type: "bin", background })
         }))
         console.log(res)
         document.querySelector(".reset-bin-loading").classList.add("hidden")

package/server/views/tools.ejs

@@ -154,6 +154,9 @@
       justify-items: end;
       min-width: 118px;
     }
+    body.tools-page .tools-reinstall-form {
+      margin: 0;
+    }
     body.tools-page .tools-bundle-status {
       display: inline-flex;
       align-items: center;
@@ -494,6 +497,16 @@
                             <i class="fa-solid fa-download" aria-hidden="true"></i>
                             <span>Install</span>
                           </a>
+                        <% } else { %>
+                          <form class="tools-reinstall-form" method="post" action="/pinokio/install">
+                            <input type="hidden" name="requirements" value="<%= JSON.stringify(bundle.requirements) %>">
+                            <input type="hidden" name="callback" value="/tools">
+                            <input type="hidden" name="fresh" value="1">
+                            <button class="task-link-button" type="submit">
+                              <i class="fa-solid fa-rotate" aria-hidden="true"></i>
+                              <span>Reinstall</span>
+                            </button>
+                          </form>
                         <% } %>
                       </div>
                     </article>

package/test/path-removal-ui.test.js

@@ -2,10 +2,12 @@ const assert = require("node:assert/strict")
 const fs = require("node:fs/promises")
 const path = require("node:path")
 const test = require("node:test")
+const ejs = require("ejs")
 const { JSDOM, VirtualConsole } = require("jsdom")
 
 const repoRoot = path.resolve(__dirname, "..")
 const commonScriptPath = path.join(repoRoot, "server/public/common.js")
+const installViewPath = path.join(repoRoot, "server/views/install.ejs")
 
 async function waitFor(predicate, message = "condition") {
   const deadline = Date.now() + 1000
@@ -196,12 +198,14 @@ test("path-removal request retries automatically without overlapping and resolve
   t.after(() => dom.window.close())
 
   let requestCount = 0
+  const backgroundRequests = []
   let resolveRetry
   const retryResponse = new Promise((resolve) => {
     resolveRetry = resolve
   })
-  const resultPromise = api.request(async () => {
+  const resultPromise = api.request(async (background) => {
     requestCount += 1
+    backgroundRequests.push(background)
     if (requestCount === 1) {
       return response({
         success: false,
@@ -224,8 +228,7 @@ test("path-removal request retries automatically without overlapping and resolve
   state.htmlContainer.querySelector(".pinokio-path-blocker-files").open = true
 
   const firstAttempt = state.runInterval()
-  assert.equal(state.buttonsDisabled, true)
-  assert.equal(state.dismiss(), false, "Stop must be unavailable during an active removal")
+  assert.equal(state.buttonsDisabled, false)
   assert.equal(state.visible, true)
   await state.runInterval()
   assert.equal(requestCount, 2, "a pending retry must suppress overlapping retries")
@@ -250,11 +253,78 @@ test("path-removal request retries automatically without overlapping and resolve
   const result = await resultPromise
   assert.equal(result.ok, true)
   assert.equal(requestCount, 3)
+  assert.deepEqual(backgroundRequests, [false, true, true])
   assert.equal(state.closeCount, 1)
   assert.equal(state.intervals.has(intervalId), false)
   assert.ok(state.clearedIntervals.has(intervalId))
 })
 
+test("background pending response keeps the current blocker without rerendering", async (t) => {
+  const { api, dom, state } = await createHarness()
+  t.after(() => dom.window.close())
+
+  let requestCount = 0
+  const shown = api.request(async () => {
+    requestCount += 1
+    if (requestCount === 1) {
+      return response({
+        error: {
+          code: "PINOKIO_PATH_REMOVE_BLOCKED",
+          operation: "Delete app",
+          blockers: [{ name: "Original blocker", pid: 10 }],
+          remainingCount: 1,
+          remaining: ["C:\\app\\locked.dll"],
+        },
+      })
+    }
+    return response({ success: false, pending: true })
+  })
+
+  await waitFor(() => state.fireOptions, "path-removal modal")
+  await state.runInterval()
+  assert.equal(requestCount, 2)
+  assert.equal(state.visible, true)
+  assert.match(state.htmlContainer.textContent, /Original blocker/)
+
+  state.dismiss()
+  assert.equal((await shown).cancelled, true)
+})
+
+test("Stop remains available during a background retry and ignores its late response", async (t) => {
+  const { api, dom, state } = await createHarness()
+  t.after(() => dom.window.close())
+
+  let resolveRetry
+  const retryResponse = new Promise((resolve) => {
+    resolveRetry = resolve
+  })
+  const shown = api.show({
+    details: {
+      operation: "Delete app",
+      blockers: [{ name: "Original blocker", pid: 10 }],
+      remainingCount: 1,
+      remaining: ["C:\\app\\original.dll"],
+    },
+    retry: async () => await retryResponse,
+  })
+
+  const attempt = state.runInterval()
+  assert.equal(state.buttonsDisabled, false)
+  assert.equal(state.dismiss(), true)
+  resolveRetry({
+    code: "PINOKIO_PATH_REMOVE_BLOCKED",
+    operation: "Delete app",
+    blockers: [{ name: "Late blocker", pid: 20 }],
+    remainingCount: 1,
+    remaining: ["C:\\app\\late.dll"],
+  })
+  await attempt
+
+  assert.equal((await shown).cancelled, true)
+  assert.match(state.htmlContainer.textContent, /Original blocker/)
+  assert.doesNotMatch(state.htmlContainer.textContent, /Late blocker/)
+})
+
 test("manual retry keeps the modal open when blocked and Stop cancels future retries", async (t) => {
   const { api, dom, state } = await createHarness()
   t.after(() => dom.window.close())
@@ -316,3 +386,137 @@ test("manual retry escapes unexpected error messages", async (t) => {
   state.dismiss()
   assert.equal((await shown).cancelled, true)
 })
+
+test("successful runtime cleanup resubmits the interrupted install", async (t) => {
+  const source = await fs.readFile(installViewPath, "utf8")
+  const requirements = '[{"name":"conda"}]'
+  const html = ejs.render(source, {
+    agent: "web",
+    callback: "/tools",
+    fresh: false,
+    requirements,
+    theme: "dark",
+  }, { filename: installViewPath })
+
+  let rpc
+  let submission
+  let submitted
+  const submittedPromise = new Promise((resolve) => { submitted = resolve })
+  const dom = new JSDOM(html, {
+    runScripts: "dangerously",
+    url: "http://localhost/pinokio/install",
+    beforeParse(window) {
+      window.fetch = async () => ({ json: async () => ({ config: {} }) })
+      window.matchMedia = () => ({ matches: false, addEventListener() {}, removeEventListener() {} })
+      window.ResizeObserver = class { observe() {} }
+      window.N = class { Noty() {} }
+      window.Terminal = class {
+        constructor() { this.cols = 80; this.rows = 24 }
+        attachCustomKeyEventHandler() {}
+        focus() {}
+        hasSelection() { return false }
+        loadAddon() {}
+        onData() {}
+        open() {}
+        write() {}
+      }
+      window.FitAddon = { FitAddon: class { fit() {} } }
+      window.WebLinksAddon = { WebLinksAddon: class {} }
+      window.xtermTheme = { FrontEndDelight: {} }
+      window.PinokioTouch = { bindTerminalFocus() {} }
+      window.PinokioPathRemoval = {
+        blockedDetails: () => null,
+        show: async () => ({ success: true }),
+      }
+      window.Socket = class {
+        emit() {}
+        run(request, onpacket) {
+          rpc = request
+          window.setTimeout(() => onpacket({
+            type: "path.remove.blocked",
+            data: { code: "PINOKIO_PATH_REMOVE_BLOCKED" },
+          }), 0)
+        }
+      }
+      window.HTMLFormElement.prototype.submit = function () {
+        submission = {
+          method: this.method,
+          pathname: new URL(this.action).pathname,
+          fields: Object.fromEntries(new window.FormData(this)),
+        }
+        submitted()
+      }
+    },
+  })
+  t.after(() => dom.window.close())
+
+  await submittedPromise
+  assert.equal(rpc.params, requirements)
+  assert.deepEqual(submission, {
+    method: "post",
+    pathname: "/pinokio/install",
+    fields: { requirements, callback: "/tools" },
+  })
+})
+
+test("fresh install removes bin on the install page before starting the installer", async (t) => {
+  const source = await fs.readFile(installViewPath, "utf8")
+  const requirements = '[{"name":"conda"}]'
+  const html = ejs.render(source, {
+    agent: "web",
+    callback: "/tools",
+    fresh: true,
+    requirements,
+    theme: "dark",
+  }, { filename: installViewPath })
+
+  let removal
+  let started
+  const startedPromise = new Promise((resolve) => { started = resolve })
+  const dom = new JSDOM(html, {
+    runScripts: "dangerously",
+    url: "http://localhost/pinokio/install",
+    beforeParse(window) {
+      window.fetch = async (url, options) => {
+        if (url === "/pinokio/delete") {
+          removal = { url, options }
+          return { ok: true, status: 200, json: async () => ({ success: true }) }
+        }
+        return { ok: true, status: 200, json: async () => ({ config: {} }) }
+      }
+      window.matchMedia = () => ({ matches: false, addEventListener() {}, removeEventListener() {} })
+      window.ResizeObserver = class { observe() {} }
+      window.N = class { Noty() {} }
+      window.Terminal = class {
+        constructor() { this.cols = 80; this.rows = 24 }
+        attachCustomKeyEventHandler() {}
+        focus() {}
+        hasSelection() { return false }
+        loadAddon() {}
+        onData() {}
+        open() {}
+        write() {}
+      }
+      window.FitAddon = { FitAddon: class { fit() {} } }
+      window.WebLinksAddon = { WebLinksAddon: class {} }
+      window.xtermTheme = { FrontEndDelight: {} }
+      window.PinokioTouch = { bindTerminalFocus() {} }
+      window.PinokioPathRemoval = {
+        request: async (remove) => (await remove(false)).json(),
+      }
+      window.Socket = class {
+        emit() {}
+        run(request) {
+          assert.ok(removal, "fresh removal must finish before the installer starts")
+          assert.equal(request.params, requirements)
+          started()
+        }
+      }
+    },
+  })
+  t.after(() => dom.window.close())
+
+  await startedPromise
+  assert.equal(removal.url, "/pinokio/delete")
+  assert.deepEqual(JSON.parse(removal.options.body), { type: "bin", background: false })
+})

package/test/path-removal.test.js

@@ -6,6 +6,7 @@ const path = require("path")
 
 const {
   PATH_REMOVAL_BLOCKED_CODE,
+  PATH_REMOVAL_PENDING_CODE,
   collectRemaining,
   createPathRemover,
 } = require("../kernel/path_removal")
@@ -105,6 +106,30 @@ test("removePath reports Windows blockers after partial recursive deletion and s
   assert.equal(await fs.promises.access(root).then(() => true).catch(() => false), false)
 })
 
+test("background retry attempts removal without repeating diagnostics", async () => {
+  let inspected = false
+  let scanned = false
+  const removePath = createPathRemover({
+    platform: "win32",
+    fsPromises: {
+      rm: async () => { throw Object.assign(new Error("busy"), { code: "EPERM" }) },
+      lstat: async () => { scanned = true },
+      readdir: async () => [],
+    },
+    inspectLocks: async () => {
+      inspected = true
+      return { blockers: [] }
+    },
+  })
+
+  await assert.rejects(
+    removePath("C:\\pinokio\\bin", { recursive: true, force: true, diagnose: false }),
+    (error) => error.code === PATH_REMOVAL_PENDING_CODE,
+  )
+  assert.equal(scanned, false)
+  assert.equal(inspected, false)
+})
+
 test("removePath reports and logs an unattributed Windows removal failure without claiming a file lock", async (t) => {
   const root = await fs.promises.mkdtemp(path.join(os.tmpdir(), "pinokio-remove-denied-"))
   t.after(() => fs.promises.rm(root, { recursive: true, force: true }))

package/test/startup-git-index-route.test.js

@@ -420,6 +420,58 @@ if (!serverMode) test('/pinokio/delete refreshes top-level git URI inventory aft
   })
 })
 
+if (!serverMode) test('/pinokio/delete rejects app paths outside the API root', async () => {
+  await withRouteServer(async ({ baseUrl, root, apiRoot }) => {
+    const outside = path.join(root, 'outside')
+    const outsideFile = path.join(outside, 'keep.txt')
+    await fsp.mkdir(outside, { recursive: true })
+    await fsp.writeFile(outsideFile, 'keep')
+
+    for (const name of ['../../outside', outside]) {
+      const result = await fetchJson(baseUrl, '/pinokio/delete', {
+        method: 'POST',
+        body: { name },
+      })
+      assert.equal(result.response.status, 400)
+      assert.equal(result.json.error, 'Invalid app deletion path')
+      await fsp.access(outsideFile)
+    }
+
+    const linked = path.join(apiRoot, 'linked-outside')
+    await fsp.symlink(outside, linked, process.platform === 'win32' ? 'junction' : 'dir')
+    const linkedResult = await fetchJson(baseUrl, '/pinokio/delete', {
+      method: 'POST',
+      body: { name: 'linked-outside/keep.txt' },
+    })
+    assert.equal(linkedResult.response.status, 400)
+    await fsp.access(outsideFile)
+
+    const crossSiteTarget = path.join(apiRoot, 'cross-site-target')
+    await fsp.mkdir(crossSiteTarget)
+    const crossSiteResult = await fetchJson(baseUrl, '/pinokio/delete', {
+      method: 'POST',
+      headers: { 'sec-fetch-site': 'cross-site' },
+      body: { name: 'cross-site-target' },
+    })
+    assert.equal(crossSiteResult.response.status, 403)
+    await fsp.access(crossSiteTarget)
+
+    const sameSiteTarget = path.join(apiRoot, 'same-site-target')
+    await fsp.mkdir(sameSiteTarget)
+    const sameSiteResult = await fetchJson(baseUrl, '/pinokio/delete', {
+      method: 'POST',
+      headers: {
+        host: new URL(baseUrl).host,
+        origin: 'http://localhost:5173',
+        'sec-fetch-site': 'same-site',
+      },
+      body: { name: 'same-site-target' },
+    })
+    assert.equal(sameSiteResult.response.status, 403)
+    await fsp.access(sameSiteTarget)
+  })
+})
+
 if (!serverMode) test('/pinokio/upload move refreshes top-level git URI inventory', async () => {
   await withRouteServer(async ({
     baseUrl,

package/test/tools-reinstall-ui.test.js

@@ -0,0 +1,84 @@
+const assert = require("node:assert/strict")
+const fs = require("node:fs/promises")
+const path = require("node:path")
+const test = require("node:test")
+const ejs = require("ejs")
+const { JSDOM } = require("jsdom")
+
+const viewPath = path.resolve(__dirname, "../server/views/tools.ejs")
+const setupViewPath = path.resolve(__dirname, "../server/views/setup.ejs")
+
+async function renderTools() {
+  const source = await fs.readFile(viewPath, "utf8")
+  return ejs.render(source, {
+    agent: "web",
+    bundles: [{
+      name: "dev",
+      title: "Coding (Essential)",
+      description: "Essential tools",
+      install_required: false,
+      requirements: [{ name: "conda", type: "bin", installed: true }],
+    }],
+    installs: [],
+    pending: false,
+    theme: "dark",
+  }, {
+    filename: viewPath,
+    includer: () => ({ template: "" }),
+  })
+}
+
+test("Tools reinstall immediately submits a fresh install request", async (t) => {
+  const html = await renderTools()
+  let submission
+  const dom = new JSDOM(html, {
+    url: "http://localhost/tools",
+  })
+  t.after(() => dom.window.close())
+
+  const form = dom.window.document.querySelector(".tools-reinstall-form")
+  form.addEventListener("submit", (event) => {
+    event.preventDefault()
+    submission = {
+      action: new URL(form.action).pathname,
+      fields: Object.fromEntries(new dom.window.FormData(form)),
+    }
+  })
+  const button = form.querySelector("button[type=submit]")
+  button.click()
+
+  assert.deepEqual(submission, {
+    action: "/pinokio/install",
+    fields: {
+      requirements: '[{"name":"conda","type":"bin","installed":true}]',
+      callback: "/tools",
+      fresh: "1",
+    },
+  })
+})
+
+test("setup fresh install is a direct form submission", async () => {
+  const source = await fs.readFile(setupViewPath, "utf8")
+  const start = source.indexOf('<form class="task-hidden" id="fresh-install-form"')
+  const end = source.indexOf("</div>", source.indexOf("</button>", start)) + 6
+  const fragment = ejs.render(source.slice(start, end), {
+    requirementList: [{ name: "conda", installed: true }],
+    targetPath: "/tools",
+  })
+  const dom = new JSDOM(fragment, { url: "http://localhost/setup/dev" })
+  const form = dom.window.document.querySelector("#fresh-install-form")
+  let submission
+  form.addEventListener("submit", (event) => {
+    event.preventDefault()
+    submission = Object.fromEntries(new dom.window.FormData(form))
+  })
+  dom.window.document.querySelector('[form="fresh-install-form"]').click()
+
+  assert.deepEqual(submission, {
+    requirements: '[{"name":"conda","installed":true}]',
+    callback: "/tools",
+    fresh: "1",
+  })
+  dom.window.close()
+  assert.doesNotMatch(source, /id="del-bin"|setup-reset-loading/)
+})