pinokiod 8.0.47 → 8.0.48

package/kernel/vault/constants.js

@@ -1,10 +1,10 @@
 const CANDIDATE_SIZE_BASE = process.platform === "win32" ? 1024 : 1000
-const CANDIDATE_SIZE_OPTIONS = [10, 50, 100, 500]
+const CANDIDATE_SIZE_OPTIONS = [1, 10, 50, 100, 500]
   .map((value) => value * CANDIDATE_SIZE_BASE ** 2)
   .concat(CANDIDATE_SIZE_BASE ** 3)
 
 module.exports = {
-  SIZE_THRESHOLD: CANDIDATE_SIZE_OPTIONS[2],
+  SIZE_THRESHOLD: CANDIDATE_SIZE_OPTIONS[3],
   CANDIDATE_SIZE_OPTIONS,
   TMP_SUFFIX: ".pinokio-dedup-tmp",
   SHA256_RE: /^[0-9a-f]{64}$/,

package/package.json

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

package/server/public/vault.css

@@ -912,10 +912,17 @@ body.dark .vault-row-action .vault-text-button:hover:not(:disabled) {
 .vault-empty p { margin: 0; color: var(--task-muted); font-size: 12px; line-height: 1.55; }
 .vault-empty .vault-button { margin-top: 10px; }
 .vault-pane-footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
   padding: 9px var(--vault-inline) 11px;
   color: var(--task-muted);
   font-size: 10.5px;
 }
+.vault-pagination { display: inline-flex; align-items: center; gap: 10px; white-space: nowrap; }
+.vault-pagination .vault-text-button:disabled { cursor: default; }
+.vault-page-range { font-variant-numeric: tabular-nums; }
 .vault-event-kind { font-weight: 570; }
 .vault-event-time { color: var(--task-muted); font-size: 10.5px; }
 .vault-unavailable { color: var(--task-muted); font-size: 11px; }
@@ -943,6 +950,7 @@ body.dark .vault-row-action .vault-text-button:hover:not(:disabled) {
   .vault-result-message { grid-template-columns: 16px minmax(0, 1fr); padding: 9px 0; }
   .vault-result-heading { align-items: flex-start; flex-direction: column; gap: 2px; }
   .vault-result-actions { grid-column: 2; }
+  .vault-pane-footer { align-items: flex-start; flex-direction: column; }
   .vault-result.incomplete .vault-button { margin: 0; }
 }
 @media (pointer: coarse) {

package/server/public/vault.js

@@ -103,6 +103,9 @@ const COPY = {
   display_mode: "Display mode",
   sorted_largest: "sorted largest first",
   sorted_smallest: "sorted smallest first",
+  previous: "Previous",
+  next: "Next",
+  file_pages: "File pages",
   status: "Deduplication status",
   matches: "Matches",
   can_save: "Can save",
@@ -200,9 +203,10 @@ const statusUrl = (progress = false) => {
 const reviewedScanKey = `pinokio:vault:reviewed-scan:${SCOPE_ID || "global"}`
 const candidateSizeKey = "pinokio:vault:candidate-size"
 const candidateSizeBase = document.body.dataset.platform === "win32" ? 1024 : 1000
-const candidateSizeOptions = [10, 50, 100, 500]
+const candidateSizeOptions = [1, 10, 50, 100, 500]
   .map((value) => value * candidateSizeBase ** 2)
   .concat(candidateSizeBase ** 3)
+const PAGE_SIZE = 500
 
 const state = {
   data: null,
@@ -221,7 +225,9 @@ const state = {
   scanProblemsOpen: false,
   feedback: null,
   actionProgress: null,
-  actionRequest: false
+  actionRequest: false,
+  page: 0,
+  pageContext: null
 }
 
 const el = (id) => document.getElementById(id)
@@ -232,7 +238,7 @@ const attr = esc
 const fmt = window.PinokioFormatStorageSize
 const candidateSize = () => {
   const value = Number(el("vault-candidate-size").value)
-  return candidateSizeOptions.includes(value) ? value : candidateSizeOptions[2]
+  return candidateSizeOptions.includes(value) ? value : candidateSizeOptions[3]
 }
 const countLabel = (count, singular = COPY.file, plural = COPY.files) => `${count} ${count === 1 ? singular : plural}`
 const basename = (value) => String(value || "").split(/[\\/]/).filter(Boolean).pop() || ""
@@ -706,8 +712,9 @@ const renderDuplicateGroups = (items) => {
   return [...groups.entries()].sort(sourceSort).map(([sourceId, group]) => {
     const source = sourceById(sourceId)
     const bytes = group.filter((item) => item.shareable).reduce((sum, item) => sum + item.size, 0)
-    const action = source && source.shareable && group.some((item) => item.shareable)
-      ? `<button class="vault-button" type="button" data-deduplicate-scope="${attr(sourceId)}">${esc(COPY.deduplicate)} ${countLabel(group.filter((item) => item.shareable).length)}</button>`
+    const allShareable = scopeDuplicates(sourceId).filter((item) => item.shareable !== false)
+    const action = source && source.shareable && allShareable.length
+      ? `<button class="vault-button" type="button" data-deduplicate-scope="${attr(sourceId)}">${esc(COPY.deduplicate)} ${countLabel(allShareable.length)}</button>`
       : `<span class="vault-unavailable">${esc(COPY.sharing_unavailable)}</span>`
     return `<div class="vault-group-row"><div class="vault-group-main"><div class="vault-group-title"><i class="fa-regular fa-folder"></i><span>${esc(groupTitle(source))}</span></div><div class="vault-group-meta">${countLabel(group.length, COPY.duplicate.toLowerCase(), COPY.duplicates.toLowerCase())} · ${bytes ? fmt(bytes) : COPY.unavailable}</div></div><div class="vault-group-action">${action}</div></div>${[...group].sort((a, b) => compareRows(a, b, (item) => item.relative_path)).map((item) => renderFileRow(item, 0, true)).join("")}`
   }).join("")
@@ -751,10 +758,9 @@ const emptyState = (view) => {
   return `<div class="vault-empty"><div class="vault-empty-inner"><i class="${content[2]}"></i><h3>${esc(content[0])}</h3><p>${esc(content[1])}</p>${view === "duplicates" ? `<button class="vault-button" type="button" data-view="all">${esc(COPY.view_all)}</button>` : view === "all" && !activeScan ? `<button class="vault-button" type="button" id="btn-empty-scan">${esc(scanLabel)}</button>` : ""}</div></div>`
 }
 
-const renderReclaimable = () => {
-  const blobs = state.data.blobs.filter((blob) => blob.orphan)
+const renderReclaimable = (blobs) => {
   if (!blobs.length) return emptyState("reclaimable")
-  return [...blobs].sort((a, b) => compareRows(a, b, (blob) => blob.names[0] ? blob.names[0].path : blob.hash)).map((blob) => `<div class="vault-file-row"><div class="vault-name-cell"><span class="vault-disclosure"></span><i class="fa-regular fa-file vault-name-icon"></i><span class="vault-name-copy"><span class="vault-file-name">${esc(blob.names[0] ? basename(blob.names[0].path) : `${blob.hash.slice(0, 12)}…`)}</span></span></div><span class="vault-size">${fmt(blob.size)}</span><span class="vault-space">${fmt(blob.size)}</span><span class="vault-row-action"><button class="vault-text-button" type="button" data-reclaim="${attr(blob.hash)}">${esc(COPY.reclaim)}</button></span></div>`).join("")
+  return blobs.map((blob) => `<div class="vault-file-row"><div class="vault-name-cell"><span class="vault-disclosure"></span><i class="fa-regular fa-file vault-name-icon"></i><span class="vault-name-copy"><span class="vault-file-name">${esc(blob.names[0] ? basename(blob.names[0].path) : `${blob.hash.slice(0, 12)}…`)}</span></span></div><span class="vault-size">${fmt(blob.size)}</span><span class="vault-space">${fmt(blob.size)}</span><span class="vault-row-action"><button class="vault-text-button" type="button" data-reclaim="${attr(blob.hash)}">${esc(COPY.reclaim)}</button></span></div>`).join("")
 }
 
 const renderActivity = () => {
@@ -794,7 +800,7 @@ const renderTable = (items) => {
   } else if (state.view === "reclaimable") {
     tableClass = "reclaimable"
     headers = [COPY.name, COPY.size, COPY.can_free, ""]
-    body = renderReclaimable()
+    body = renderReclaimable(items)
   } else if (state.view === "activity") {
     tableClass = "activity"
     headers = [COPY.name, COPY.size, COPY.last_scanned, ""]
@@ -815,6 +821,73 @@ const renderTable = (items) => {
   el("vault-table-wrap").innerHTML = `<div class="vault-table ${tableClass}"><div class="vault-columns">${headerMarkup}</div>${body}</div>`
 }
 
+const orderedItems = (items) => {
+  if (state.view === "activity") return items
+  if (state.view === "reclaimable") {
+    return [...items].sort((a, b) => compareRows(a, b,
+      (blob) => blob.names[0] ? blob.names[0].path : blob.hash))
+  }
+  if (state.displayMode === "files" && supportsDisplayMode()) {
+    return [...items].sort((a, b) => compareRows(a, b, flatLocation))
+  }
+  return [...items].sort((a, b) => {
+    const sourceOrder = state.sourceId ? 0 : sourceSort([a.source_id], [b.source_id])
+    return sourceOrder || compareRows(a, b, (item) => item.relative_path || item.path)
+  })
+}
+
+const pagedItems = (items) => {
+  if (state.view === "activity") {
+    return { items, start: 0, end: items.length, total: items.length, pages: 1 }
+  }
+  const context = JSON.stringify([
+    state.view, state.sourceId, state.query, state.statusFilter,
+    state.displayMode, state.sizeSort
+  ])
+  if (context !== state.pageContext) {
+    state.page = 0
+    state.pageContext = context
+  }
+  const ordered = orderedItems(items)
+  const pages = Math.max(1, Math.ceil(ordered.length / PAGE_SIZE))
+  state.page = Math.max(0, Math.min(state.page, pages - 1))
+  const start = state.page * PAGE_SIZE
+  const end = Math.min(start + PAGE_SIZE, ordered.length)
+  return { items: ordered.slice(start, end), start, end, total: ordered.length, pages }
+}
+
+const paneFooterText = (items) => {
+  if (state.displayMode === "files" && supportsDisplayMode()) {
+    const count = state.view === "shared"
+      ? countLabel(items.length, "deduplicated file", "deduplicated files")
+      : state.view === "independent"
+        ? countLabel(items.length, "file kept separate", "files kept separate")
+        : countLabel(items.length)
+    const order = state.sizeSort === "desc"
+      ? COPY.sorted_largest
+      : state.sizeSort === "asc" ? COPY.sorted_smallest : ""
+    return `${count}${order ? ` · ${order}` : ""}`
+  }
+  if (state.view === "duplicates") return COPY.duplicate_note
+  if (state.view === "reclaimable") return COPY.reclaimable_note
+  return COPY.tracked_note.replace("{size}", fmt(candidateSize()))
+}
+
+const renderPaneFooter = (items, page) => {
+  const footer = el("vault-pane-footer")
+  const message = paneFooterText(items)
+  if (page.pages === 1) {
+    footer.textContent = message
+    return
+  }
+  footer.innerHTML = `<span>${esc(message)}</span>
+    <span class="vault-pagination" role="navigation" aria-label="${attr(COPY.file_pages)}">
+      <button class="vault-text-button" type="button" data-page="previous" ${state.page === 0 ? "disabled" : ""}>${esc(COPY.previous)}</button>
+      <span class="vault-page-range">${page.start + 1}–${page.end} of ${page.total}</span>
+      <button class="vault-text-button" type="button" data-page="next" ${state.page === page.pages - 1 ? "disabled" : ""}>${esc(COPY.next)}</button>
+    </span>`
+}
+
 const renderOverview = () => {
   const data = state.data
   const last = data.last_scan
@@ -1131,23 +1204,10 @@ const render = () => {
   renderLocations(items)
   const visible = activeItems(items)
   renderToolbar(visible, items)
-  renderTable(visible)
+  const page = pagedItems(visible)
+  renderTable(page.items)
   renderActionProgress()
-  if (state.displayMode === "files" && supportsDisplayMode()) {
-    const count = state.view === "shared"
-      ? countLabel(visible.length, "deduplicated file", "deduplicated files")
-      : state.view === "independent"
-        ? countLabel(visible.length, "file kept separate", "files kept separate")
-        : countLabel(visible.length)
-    const order = state.sizeSort === "desc" ? COPY.sorted_largest : state.sizeSort === "asc" ? COPY.sorted_smallest : ""
-    el("vault-pane-footer").textContent = `${count}${order ? ` · ${order}` : ""}`
-  } else {
-    el("vault-pane-footer").textContent = state.view === "duplicates"
-      ? COPY.duplicate_note
-      : state.view === "reclaimable"
-        ? COPY.reclaimable_note
-        : COPY.tracked_note.replace("{size}", fmt(candidateSize()))
-  }
+  renderPaneFooter(visible, page)
 }
 
 const scanActive = (scan) => !!(scan && (scan.pending || scan.active || scan.queued > 0))
@@ -1405,6 +1465,10 @@ document.addEventListener("click", async (event) => {
   if (target.id === "btn-dismiss-cloud") {
     try { localStorage.setItem(target.dataset.warningKey, "1") } catch (error) {}
     renderCloudWarning()
+  } else if (target.dataset.page) {
+    state.page += target.dataset.page === "next" ? 1 : -1
+    render()
+    el("vault-table-wrap").scrollTop = 0
   } else if (target.hasAttribute("data-sort-size")) {
     state.sizeSort = state.sizeSort === "desc" ? "asc" : "desc"
     render()
@@ -1597,7 +1661,9 @@ document.addEventListener("input", (event) => {
   state.query = event.target.value
   const items = activeItems(buildItems())
   updateToolbarSummary(items)
-  renderTable(items)
+  const page = pagedItems(items)
+  renderTable(page.items)
+  renderPaneFooter(items, page)
   renderActionProgress()
 })
 document.addEventListener("change", (event) => {
@@ -1617,7 +1683,7 @@ candidateSizeSelect.setAttribute("aria-label", COPY.minimum_file_size)
 candidateSizeSelect.innerHTML = candidateSizeOptions
   .map((size) => `<option value="${size}">${fmt(size)}+</option>`)
   .join("")
-candidateSizeSelect.value = String(candidateSizeOptions[2])
+candidateSizeSelect.value = String(candidateSizeOptions[3])
 try {
   const storedCandidateSize = Number(localStorage.getItem(candidateSizeKey))
   if (candidateSizeOptions.includes(storedCandidateSize)) {

package/test/vault-ui.test.js

@@ -76,12 +76,12 @@ describe('vault dashboard backend (phase 4)', () => {
     }
 
     const accepted = await vault.perform('scan', {
-      candidate_size: CANDIDATE_SIZE_OPTIONS[1]
+      candidate_size: CANDIDATE_SIZE_OPTIONS[0]
     })
     assert.deepStrictEqual(accepted, { started: true })
     assert.deepStrictEqual(startedWith, {
       scopeId: null,
-      sizeThreshold: CANDIDATE_SIZE_OPTIONS[1]
+      sizeThreshold: CANDIDATE_SIZE_OPTIONS[0]
     })
 
     startedWith = null
@@ -1323,7 +1323,7 @@ describe('vault dashboard backend (phase 4)', () => {
     assert.match(dom.window.document.getElementById('btn-scan').textContent, /Scan this app/)
     const candidateSize = dom.window.document.getElementById('vault-candidate-size')
     assert.deepStrictEqual([...candidateSize.options].map((option) => option.textContent),
-      ['10 MB+', '50 MB+', '100 MB+', '500 MB+', '1 GB+'])
+      ['1 MB+', '10 MB+', '50 MB+', '100 MB+', '500 MB+', '1 GB+'])
     assert.strictEqual(candidateSize.value, '100000000')
     candidateSize.value = '50000000'
     candidateSize.dispatchEvent(new dom.window.Event('change', { bubbles: true }))
@@ -1853,6 +1853,94 @@ describe('vault dashboard backend (phase 4)', () => {
     }
   })
 
+  test('large file lists render bounded pages without narrowing Deduplicate all', async () => {
+    const views = path.resolve(__dirname, '..', 'server', 'views')
+    const html = await ejs.renderFile(path.resolve(views, 'vault_app.ejs'), {
+      theme: 'light', platform: 'darwin', agent: 'electron', scope_id: 'app:appB'
+    })
+    const dom = new JSDOM(html, {
+      url: 'http://localhost/vault/app/appB',
+      runScripts: 'dangerously'
+    })
+    const actions = []
+    const duplicates = Array.from({ length: 501 }, (_, index) => {
+      const name = `file-${String(index).padStart(4, '0')}.bin`
+      return {
+        path: `/pinokio/api/appB/${name}`,
+        relative_path: name,
+        source_id: 'app:appB',
+        source_label: 'appB',
+        size: 1024 + index,
+        shareable: true,
+        match: { path: `/pinokio/api/appA/${name}` }
+      }
+    })
+    const status = {
+      enabled: true,
+      mode: 'link',
+      scan: { active: false, pending: false, queued: 0, phase: 'idle', scope_id: null },
+      last_scan: { ts: Date.now(), bytes_total: 1024 * 501 },
+      tracked_bytes: 1024 * 501,
+      effective_bytes: 1024 * 501,
+      shared_bytes: 0,
+      pending_bytes: duplicates.reduce((sum, item) => sum + item.size, 0),
+      activity_error: null,
+      cloud_sync_warning: null,
+      sources: [{
+        id: 'app:appB', kind: 'app', label: 'appB', root: '/pinokio/api/appB',
+        display_path: '/pinokio/api/appB', parent_id: null, available: true, shareable: true
+      }],
+      blobs: [],
+      duplicates,
+      excluded: [],
+      events: [],
+      undo_batches: []
+    }
+    dom.window.fetch = async (url, options = {}) => {
+      if (options.method === 'POST') {
+        actions.push(JSON.parse(options.body))
+        return { ok: true, json: async () => ({ converted: 501, bytes_saved: status.pending_bytes }) }
+      }
+      return { ok: true, json: async () => status }
+    }
+    await runVaultScript(dom)
+    await new Promise((resolve) => setTimeout(resolve, 25))
+
+    dom.window.document.querySelector('[data-view="duplicates"]').click()
+    const rows = () => [...dom.window.document.querySelectorAll('.vault-table.matches .vault-file-row')]
+    let bulk = dom.window.document.querySelector('[data-deduplicate-all="duplicates"]')
+    assert.strictEqual(rows().length, 500)
+    assert.strictEqual(bulk.textContent, 'Deduplicate 501 files')
+    assert.strictEqual(dom.window.document.querySelector('.vault-page-range').textContent, '1–500 of 501')
+    assert.strictEqual(dom.window.document.querySelector('[data-page="previous"]').disabled, true)
+    assert.strictEqual(dom.window.document.querySelector('[data-page="next"]').disabled, false)
+
+    dom.window.document.querySelector('[data-page="next"]').click()
+    assert.strictEqual(rows().length, 1)
+    assert.strictEqual(rows()[0].querySelector('.vault-file-name').textContent, 'file-0500.bin')
+    assert.strictEqual(dom.window.document.querySelector('.vault-page-range').textContent, '501–501 of 501')
+    assert.strictEqual(dom.window.document.querySelector('[data-page="previous"]').disabled, false)
+    assert.strictEqual(dom.window.document.querySelector('[data-page="next"]').disabled, true)
+
+    bulk = dom.window.document.querySelector('[data-deduplicate-all="duplicates"]')
+    assert.strictEqual(bulk.textContent, 'Deduplicate 501 files')
+    bulk.click()
+    await new Promise((resolve) => setTimeout(resolve, 25))
+    assert.deepStrictEqual(actions[0], {
+      action: 'deduplicate',
+      selection: 'duplicates',
+      scope_id: 'app:appB'
+    })
+
+    const search = dom.window.document.getElementById('vault-search')
+    search.value = 'file-0001.bin'
+    search.dispatchEvent(new dom.window.Event('input', { bubbles: true }))
+    assert.strictEqual(rows().length, 1)
+    assert.strictEqual(rows()[0].querySelector('.vault-file-name').textContent, 'file-0001.bin')
+    assert.strictEqual(dom.window.document.querySelector('.vault-pagination'), null)
+    dom.window.close()
+  })
+
   test('app inventory uses explicit sharing actions without ambiguous switches', async () => {
     const views = path.resolve(__dirname, '..', 'server', 'views')
     const html = await ejs.renderFile(path.resolve(views, 'vault_app.ejs'), {