pinokiod 8.0.105 → 8.0.106

package/kernel/vault/index.js

@@ -44,6 +44,12 @@ const AUTOMATIC_ACTIONS = new Set([
 ])
 const PERMISSION_DENIED_CODES = new Set(["EACCES", "EPERM"])
 const BUSY_CODES = new Set(["EBUSY"])
+const PUBLIC_FILE_STATUS = {
+  reference: "tracked",
+  duplicate: "duplicate",
+  unavailable: "unavailable",
+  linked: "shared"
+}
 const hardlinkUnavailableCode = (code) =>
   HARDLINK_UNSUPPORTED_CODES.has(code) || PERMISSION_DENIED_CODES.has(code)
 const replacementLockedCode = (code) =>
@@ -197,7 +203,16 @@ const revealInFileManager = (filePath, platform = process.platform) =>
     execFile(command, args, {
       timeout: 10000,
       windowsHide: true
-    }, (error) => error ? reject(error) : resolve())
+    }, (error) => {
+      // Explorer reports a non-zero exit code even when it opens the folder,
+      // so an exit status alone is not a failure on Windows. A missing binary
+      // or a refused spawn still is.
+      if (error && platform === "win32" && Number.isInteger(error.code)) {
+        resolve()
+        return
+      }
+      error ? reject(error) : resolve()
+    })
   })
 
 class Vault {
@@ -1359,8 +1374,10 @@ class Vault {
     if (!entry || entry.unavailable_reason === "stale") {
       return { error: "This file is no longer tracked. Scan again to refresh this view." }
     }
+    // Opening a file manager mutates nothing, so it is allowed for any tracked
+    // path regardless of the scope the request came from.
     const source = this.sourceForPath(entry.path, entry.source_id)
-    if (!source || !this.sourceIsWithinScope(source, scopeId)) {
+    if (!source) {
       return { error: "This file is outside the current location." }
     }
     if (!await this.canonicalPathIsWithinSource(entry.path, source)) {
@@ -1373,7 +1390,10 @@ class Vault {
     try {
       await this.fileManagerLauncher(entry.path)
     } catch (error) {
-      return { error: "The file manager could not open this file." }
+      // Naming the underlying failure is what makes a report actionable; the
+      // generic sentence hid whether the spawn, the binary, or the path failed.
+      const detail = error && error.message ? ` (${error.message})` : ""
+      return { error: `The file manager could not open this file.${detail}` }
     }
     return { revealed: true }
   }
@@ -3253,12 +3273,7 @@ class Vault {
           dev: match.dev,
           ino: match.ino
         }, this.locationForPath(match.path, match.source_id)))
-      const publicStatus = {
-        reference: "tracked",
-        duplicate: "duplicate",
-        unavailable: "unavailable",
-        linked: "shared"
-      }[row.status]
+      const publicStatus = PUBLIC_FILE_STATUS[row.status]
       const result = Object.assign({
         path: row.path,
         hash: row.hash,
@@ -3388,9 +3403,11 @@ class Vault {
     return {
       path: target,
       items: (result.rows || []).map((row) => Object.assign({
-        path: row.path
+        path: row.path,
+        status: PUBLIC_FILE_STATUS[row.status] || null
       }, this.locationForPath(row.path, row.source_id))),
       total: Number(result.total) || 0,
+      deduplicatable: Number(result.duplicateTotal) || 0,
       next_cursor: result.nextCursor || null
     }
   }

package/kernel/vault/registry_core.js

@@ -5691,9 +5691,18 @@ class RegistryCore {
       WHERE ${identityWhere}
         AND ${authorized.where.join(" AND ")}
     `).get(...identityValues, ...authorized.values).count) || 0
+    // Only paths still storing their own copy can free anything.
+    const duplicateTotal = Number(this.database.prepare(`
+      SELECT COUNT(*) AS count
+      FROM files child
+      WHERE ${identityWhere}
+        AND child.status = 'duplicate'
+        AND ${authorized.where.join(" AND ")}
+    `).get(...identityValues, ...authorized.values).count) || 0
     return {
       rows,
       total,
+      duplicateTotal,
       nextCursor: hasMore && last
         ? this.encodeCursor({
             sort: "file-locations",

package/package.json

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

package/server/public/vault.css

@@ -964,6 +964,32 @@ body[data-vault-mode="global"] .vault-explorer {
   outline: 2px solid color-mix(in srgb, var(--task-accent) 55%, transparent);
   outline-offset: 1px;
 }
+.vault-confirm-overlay {
+  position: fixed;
+  z-index: 140;
+  inset: 0;
+  display: grid;
+  place-items: center;
+  padding: 24px;
+  background: color-mix(in srgb, var(--task-text) 34%, transparent);
+}
+.vault-confirm-overlay[hidden] { display: none; }
+.vault-confirm-dialog {
+  width: min(420px, 100%);
+  padding: 18px 20px 16px;
+  border: 1px solid var(--task-border-strong);
+  border-radius: 10px;
+  background: var(--task-panel);
+  box-shadow: 0 22px 70px color-mix(in srgb, var(--task-text) 24%, transparent);
+}
+.vault-confirm-message {
+  margin: 0 0 16px;
+  color: var(--task-text);
+  font-size: 12.5px;
+  line-height: 1.5;
+}
+.vault-confirm-actions { display: flex; justify-content: flex-end; gap: 8px; }
+
 .vault-find-overlay {
   position: fixed;
   z-index: 120;
@@ -2043,9 +2069,40 @@ body.dark .vault-row-action .vault-text-button:hover:not(:disabled) {
   background: color-mix(in srgb, var(--task-soft) 48%, transparent);
 }
 .vault-detail-label { margin-bottom: 5px; color: var(--task-muted); font-size: 10px; font-weight: 650; }
-.vault-location-detail { display: flex; align-items: center; gap: 7px; padding: 2px 0; color: var(--task-text); font-size: 10.5px; }
+.vault-location-detail { display: flex; align-items: center; gap: 7px; min-height: 26px; color: var(--task-text); font-size: 10.5px; }
 .vault-location-detail i { color: var(--task-muted); }
 .vault-location-detail > span { min-width: 0; flex: 1; overflow-wrap: anywhere; }
+.vault-location-detail > .vault-location-path {
+  min-width: 0;
+  flex: 1;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+.vault-location-detail > .vault-location-note {
+  flex: 0 0 auto;
+  margin-left: auto;
+  padding-left: 12px;
+  color: var(--task-muted);
+  white-space: nowrap;
+}
+.vault-location-detail > .vault-location-reveal-placeholder { flex: 0 0 26px; }
+.vault-location-link {
+  appearance: none;
+  padding: 0;
+  border: 0;
+  background: none;
+  color: var(--task-accent);
+  font: inherit;
+  text-align: left;
+  cursor: pointer;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  max-width: 100%;
+}
+.vault-location-link:hover { text-decoration: underline; }
+.vault-location-link i { color: inherit; font-size: 9px; margin-left: 5px; }
 .vault-duplicate-content-group {
   min-height: 52px;
   background: color-mix(in srgb, var(--task-soft) 28%, transparent);

package/server/public/vault.js

@@ -237,6 +237,9 @@ const COPY = {
   loading_copies: "Loading copies…",
   show_more_copies: "Show {count} more copies",
   loading_locations: "Loading locations…",
+  open_in_disk_saver: "Open this file in Disk Saver",
+  open_location_confirm: "Open Disk Saver for {location}?",
+  open_location_accept: "Open",
   show_more_locations: "Show {count} more locations",
   making_separate: "Making file separate",
   make_separate: "Make separate",
@@ -258,7 +261,12 @@ const COPY = {
   separation_cancelled: "Separation cancelled after {count}.",
   select_for_separation: "Select to make separate",
   select_all_on_page: "Select all on this page",
-  identical_contents_at: "Identical contents at",
+  stored_times: "Stored {count} times · {size} each",
+  this_file: "this file",
+  copy_that_stays: "the copy that stays",
+  already_deduplicated: "already deduplicated",
+  not_deduplicated_yet: "not deduplicated yet",
+  cannot_be_deduplicated: "cannot be deduplicated",
   no_files: "No files found",
   no_files_hint: "Run a scan to find files that can be deduplicated. Scanning never links files together or replaces them.",
   scan_waiting: "Waiting for scan results",
@@ -290,6 +298,15 @@ const COPY = {
 }
 
 const SCOPE_ID = document.body.dataset.vaultScope || null
+const FOCUS_GROUP = (() => {
+  const value = new URLSearchParams(window.location.search).get("group")
+  return typeof value === "string" && /^[a-f0-9]{64}$/.test(value.toLowerCase())
+    ? value.toLowerCase()
+    : null
+})()
+// A scoped page hands one content group off to the global page, which opens
+// on it once its first page of duplicate results arrives.
+let focusGroupPending = !!FOCUS_GROUP
 const IS_APP_MODE = document.body.dataset.vaultMode === "app" && !!SCOPE_ID
 const APP_NAME = IS_APP_MODE ? document.body.dataset.vaultApp || "" : ""
 const HOME_PATH = document.body.dataset.vaultHome || ""
@@ -410,12 +427,12 @@ const state = {
   candidateSize: defaultCandidateSize,
   persistedCandidateSize: defaultCandidateSize,
   candidateSizeInitialized: false,
-  view: "all",
+  view: FOCUS_GROUP ? "duplicates" : "all",
   sourceId: SCOPE_ID,
   query: "",
   statusFilter: "all",
-  displayMode: "folders",
-  sizeSort: null,
+  displayMode: FOCUS_GROUP ? "files" : "folders",
+  sizeSort: FOCUS_GROUP ? "desc" : null,
   collapsedSources: new Set(),
   collapsedDirs: new Set(),
   expandedFiles: new Set(),
@@ -609,9 +626,59 @@ const saveCandidateSize = (size) => {
   })
   return candidateSizeSaveTail
 }
+// Small confirm dialog in the workspace's own visual language, so leaving the
+// page never happens through a native browser prompt.
+const confirmLeave = (message, confirmLabel) => new Promise((resolve) => {
+  const overlay = document.createElement("div")
+  overlay.className = "vault-confirm-overlay"
+  overlay.innerHTML = `<section class="vault-confirm-dialog" role="dialog" aria-modal="true"><p class="vault-confirm-message"></p><div class="vault-confirm-actions"><button class="vault-button" type="button" data-confirm-cancel>${esc(COPY.cancel)}</button><button class="vault-button primary" type="button" data-confirm-accept>${esc(confirmLabel)}</button></div></section>`
+  overlay.querySelector(".vault-confirm-message").textContent = message
+  const settle = (value) => {
+    document.removeEventListener("keydown", onKey, true)
+    overlay.remove()
+    resolve(value)
+  }
+  const onKey = (event) => {
+    if (event.key !== "Escape") return
+    event.preventDefault()
+    event.stopPropagation()
+    settle(false)
+  }
+  overlay.addEventListener("click", (event) => {
+    if (event.target === overlay) settle(false)
+    if (event.target.closest("[data-confirm-cancel]")) settle(false)
+    if (event.target.closest("[data-confirm-accept]")) settle(true)
+  })
+  document.addEventListener("keydown", onKey, true)
+  document.body.appendChild(overlay)
+  const accept = overlay.querySelector("[data-confirm-accept]")
+  if (accept) accept.focus()
+})
+
 const openGlobalWorkspace = () => {
   window.parent.location.assign("/vault")
 }
+// Opens a new tab rather than navigating: this workspace can be embedded in an
+// app page, where navigating would either nest a second copy of the interface
+// or drop the user out of the app they were looking at.
+// A copy that belongs to another app opens that app's own workspace, where it
+// can actually be acted on. Anything else — caches, external folders — has no
+// app page, so it opens the global one. Either way the user is leaving this
+// page, so it is confirmed first and the parent window is replaced rather than
+// nesting a second copy of the interface inside this frame.
+const openContentGroup = async (group, kind, label) => {
+  // The label and kind travel with the row: an app workspace cannot look up
+  // sources belonging to other apps, so a lookup here would name every one of
+  // them "unknown" and send them all to the global page.
+  const app = kind === "app" && label ? label : null
+  const name = label || COPY.unknown_location
+  const accepted = await confirmLeave(
+    COPY.open_location_confirm.replace("{location}", name),
+    COPY.open_location_accept)
+  if (!accepted) return
+  const base = app ? `/vault/app/${encodeURIComponent(app)}` : "/vault"
+  window.parent.location.assign(`${base}?group=${encodeURIComponent(group)}`)
+}
 const applyAutomaticScanSnapshot = (snapshot) => {
   if (!IS_APP_MODE || !AUTOMATIC_SUPPORTED) return
   const settings = snapshot && Array.isArray(snapshot.settings)
@@ -703,24 +770,15 @@ const onAutomaticScanMessage = (event) => {
 }
 const sourceById = (id) => (state.data.sources || []).find((source) => source.id === id)
 const sourceChildren = (id) => (state.data.sources || []).filter((source) => source.parent_id === id)
-const sourceIsWithinScope = (sourceId) => {
-  if (!SCOPE_ID) return true
-  const seen = new Set()
-  let source = sourceById(sourceId)
-  while (source && !seen.has(source.id)) {
-    if (source.id === SCOPE_ID) return true
-    seen.add(source.id)
-    source = sourceById(source.parent_id)
-  }
-  return false
-}
 const revealLabel = document.body.dataset.platform === "darwin"
   ? COPY.show_in_finder
   : document.body.dataset.platform === "win32"
     ? COPY.show_in_file_explorer
     : COPY.open_containing_folder
+// Revealing changes nothing, so it is offered for every tracked path, not
+// only the ones the current scope can act on.
 const revealButton = (filePath, sourceId, name) => {
-  if (!filePath || !sourceIsWithinScope(sourceId)) return ""
+  if (!filePath) return ""
   const label = `${revealLabel}: ${name || basename(filePath)}`
   return `<button class="vault-reveal-button" type="button" data-reveal-file="${attr(filePath)}" aria-label="${attr(label)}" title="${attr(revealLabel)}"><i class="fa-regular fa-folder-open" aria-hidden="true"></i></button>`
 }
@@ -1720,13 +1778,37 @@ const fileDetail = (item) => {
     return `<div class="vault-detail"><div class="vault-detail-label error">${esc(locations.error)}</div></div>`
   }
   const total = Math.max(locations.items.length, Number(locations.total) || 0)
-  const label = `${COPY.identical_contents_at} ${countLabel(total, COPY.location, COPY.locations_lower)}`
+  // Copies are byte-identical, so the size is stated once for the group.
+  const label = COPY.stored_times
+    .replace("{count}", total)
+    .replace("{size}", fmt(item.size))
   const remaining = Math.max(0, total - locations.items.length)
   const more = locations.nextCursor
     ? `<div class="vault-location-detail"><button class="vault-text-button" type="button" data-more-file-locations="${attr(item.path)}" ${locations.loading ? "disabled" : ""}>${esc(COPY.show_more_locations.replace("{count}", Math.min(remaining, DUPLICATE_CHILD_PAGE_SIZE)))}</button></div>`
     : ""
-  return `<div class="vault-detail"><div class="vault-detail-label">${esc(label)}</div>${locations.items.map((location) => `
-    <div class="vault-location-detail"><i class="fa-regular fa-file"></i><span>${esc(externalLocation(location) || [location.source_label, location.relative_path].filter(Boolean).join(" / "))}</span>${revealButton(location.path, location.source_id, basename(location.relative_path))}</div>`).join("")}${more}</div>`
+  const body = locations.items.map((location) => {
+    const where = externalLocation(location) ||
+      [location.source_label, location.relative_path].filter(Boolean).join(" / ")
+    const note = location.path === item.path
+      ? COPY.this_file
+      : location.status === "tracked"
+        ? COPY.copy_that_stays
+        : location.status === "shared"
+          ? COPY.already_deduplicated
+          : location.status === "unavailable"
+            ? COPY.cannot_be_deduplicated
+            : COPY.not_deduplicated_yet
+    const outside = SCOPE_ID && item.hash && location.source_id !== SCOPE_ID
+    const text = outside
+      ? `<button class="vault-location-link" type="button" data-open-group="${attr(item.hash)}" data-open-kind="${attr(location.source_kind || "")}" data-open-label="${attr(location.source_label || "")}" title="${attr(COPY.open_in_disk_saver)}">${esc(where)}</button>`
+      : esc(where)
+    // Rows keep identical slots whether or not a reveal button exists, so the
+    // notes form a column and every row is the same height.
+    const reveal = revealButton(
+      location.path, location.source_id, basename(location.relative_path))
+    return `<div class="vault-location-detail"><i class="fa-regular fa-file"></i><span class="vault-location-path" title="${attr(where)}">${text}</span><span class="vault-location-note">${esc(note)}</span>${reveal || `<span class="vault-location-reveal-placeholder"></span>`}</div>`
+  }).join("")
+  return `<div class="vault-detail"><div class="vault-detail-label">${esc(label)}</div>${body}${more}</div>`
 }
 const separateCheckbox = (item) => item.status === "shared"
   ? `<input class="vault-row-checkbox" type="checkbox" data-select-separate="${attr(item.path)}" aria-label="${attr(`${COPY.select_for_separation}: ${basename(item.relative_path)}`)}" ${state.separateAllMatching || state.selectedSeparateFiles.has(item.path) ? "checked" : ""} />`
@@ -2886,6 +2968,9 @@ const loadPagedChildren = async (cache, key, buildUrl, append) => {
     const items = Array.isArray(result.items) ? result.items : []
     current.items = append ? current.items.concat(items) : items
     current.total = Math.max(0, Number(result.total) || 0)
+    // Location lists carry how many copies still cost space; group children
+    // do not, and read as zero.
+    current.deduplicatable = Math.max(0, Number(result.deduplicatable) || 0)
     current.nextCursor = result.next_cursor || null
     current.loaded = true
   } catch (error) {
@@ -2942,6 +3027,12 @@ const applyFullData = (data) => {
     reviewedScan() !== String(data.last_scan.ts) &&
     (shareableDuplicateCount > 0 || data.last_scan.partial)
   settleFolderDiscoveryStart()
+  if (focusGroupPending &&
+      data.inventory && data.inventory.view === "duplicates") {
+    focusGroupPending = false
+    state.expandedDuplicateGroups.add(FOCUS_GROUP)
+    loadDuplicateGroupChildren(FOCUS_GROUP)
+  }
   const publishedScan = data.last_scan ? data.last_scan.ts : null
   if (publishedScan !== state.locationsScanTs) {
     state.locationsScanTs = publishedScan
@@ -3400,6 +3491,13 @@ const closeScanSizeMenu = () => {
 document.addEventListener("click", async (event) => {
   const target = event.target.closest("button")
   if (!target) return
+  if (target.dataset.openGroup) {
+    await openContentGroup(
+      target.dataset.openGroup,
+      target.dataset.openKind,
+      target.dataset.openLabel)
+    return
+  }
   if (target.hasAttribute("data-dismiss-automatic-scan-coachmark")) {
     dismissAutomaticScanCoachmark(true)
     return

package/test/vault-engine.test.js

@@ -1553,7 +1553,7 @@ describe("Save Space engine", () => {
     await close(vault)
   })
 
-  test("revealing a file is scoped to a current registered path", async () => {
+  test("revealing works for any tracked path, whatever the scope", async () => {
     const { home, vault } = await makeVault()
     const pair = await duplicatePair(home, 'model "quoted".bin')
     await vault.sweeper.scan()
@@ -1571,19 +1571,18 @@ describe("Save Space engine", () => {
     }), { revealed: true })
     assert.deepEqual(launched, [pair.first])
 
-    const outside = await vault.perform("reveal", {
+    assert.notEqual(first.source_id, second.source_id)
+    assert.deepEqual(await vault.perform("reveal", {
       scope_id: first.source_id,
       path: pair.second
-    })
-    assert.match(outside.error, /outside the current location/i)
-    assert.notEqual(first.source_id, second.source_id)
-    assert.deepEqual(launched, [pair.first])
+    }), { revealed: true })
+    assert.deepEqual(launched, [pair.first, pair.second])
 
     const untracked = await vault.perform("reveal", {
       path: path.join(home, "api", "first", "missing.bin")
     })
     assert.match(untracked.error, /no longer tracked/i)
-    assert.deepEqual(launched, [pair.first])
+    assert.deepEqual(launched, [pair.first, pair.second])
 
     await close(vault)
   })

package/test/vault-ui.test.js

@@ -160,7 +160,9 @@ const makePage = async (status, options = {}) => {
       runScripts: "outside-only",
       url: appMode
         ? "http://localhost/vault/app/app"
-        : "http://localhost/vault"
+        : `http://localhost/vault${options.focusGroup
+          ? `?group=${options.focusGroup}`
+          : ""}`
     }
   )
   const requests = []
@@ -811,13 +813,19 @@ describe("Save Space interface", () => {
       if (parsed.searchParams.get("locations_path")) {
         return {
           path: parsed.searchParams.get("locations_path"),
-          items: ["first", "second", "third"].map((name) => ({
+          items: [
+            ["duplicate", "duplicate"],
+            ["first", "tracked"],
+            ["third", "shared"]
+          ].map(([name, status]) => ({
             path: `/pinokio/api/app/models/${name}.bin`,
+            status,
             source_id: "app:app",
             source_label: "app",
             relative_path: `models/${name}.bin`
           })),
           total: 3,
+          deduplicatable: 1,
           next_cursor: null
         }
       }
@@ -839,13 +847,18 @@ describe("Save Space interface", () => {
     await waitFor(() => getRequests.some((url) =>
       new URL(url, "http://localhost").searchParams
         .get("locations_path") === "/pinokio/api/app/models/duplicate.bin"))
-    await waitFor(() => document.querySelector(".vault-detail") &&
-      document.querySelector(".vault-detail").textContent.includes("third.bin"))
+    await waitFor(() => document.querySelector(".vault-location-path"))
     const detail = document.querySelector(".vault-detail")
-    assert.match(detail.textContent, /Identical contents at 3 locations/)
-    assert.match(detail.textContent, /first\.bin/)
+    assert.match(detail.textContent, /Stored 3 times · 4\.1 KB each/)
     assert.doesNotMatch(detail.textContent, /sample\.bin/)
     assert.doesNotMatch(detail.textContent, /of 3 locations shown/)
+    const notes = [...detail.querySelectorAll(".vault-location-note")]
+      .map((node) => node.textContent)
+    assert.deepEqual(notes, [
+      "this file",
+      "the copy that stays",
+      "already deduplicated"
+    ])
     await settle()
     dom.window.close()
   })
@@ -888,6 +901,44 @@ describe("Save Space interface", () => {
     dom.window.close()
   })
 
+  test("a scoped page hands one content group to the global page", async () => {
+    const hash = "c".repeat(64)
+    const duplicate = item({
+      path: "/pinokio/api/app/models/duplicate.bin",
+      relative_path: "models/duplicate.bin",
+      status: "duplicate",
+      shareable: true,
+      hash,
+      location_count: 3
+    })
+    const base = fixture([duplicate])
+    base.inventory.source_counts.duplicates["app:app"] = 1
+    base.inventory.shareable_by_source["app:app"] = 1
+    const response = (url) => {
+      const parsed = new URL(url, "http://localhost")
+      if (parsed.searchParams.get("group_hash")) {
+        return { hash, items: [], total: 3, next_cursor: null }
+      }
+      const result = JSON.parse(JSON.stringify(base))
+      result.inventory.view = parsed.searchParams.get("view") || "all"
+      result.items = [duplicate]
+      return result
+    }
+    const { dom, getRequests } = await makePage(response, {
+      focusGroup: hash
+    })
+    const document = dom.window.document
+
+    await waitFor(() => document.querySelector(
+      '[data-view="duplicates"].selected'))
+    assert.ok(document.querySelector('[data-display-mode="files"].selected'))
+    await waitFor(() => getRequests.some((url) =>
+      new URL(url, "http://localhost").searchParams
+        .get("group_hash") === hash))
+    await settle()
+    dom.window.close()
+  })
+
   test("Cannot deduplicate is separate from actionable duplicates", async () => {
     const duplicate = item({
       path: "/pinokio/api/app/models/duplicate.bin",