pinokiod 8.0.44 → 8.0.45

package/kernel/vault/index.js

@@ -875,10 +875,26 @@ class Vault {
       return { status: "no-blob" }
     }
     if (!storeStat) return { status: "no-blob" }
-    const targetStat = await fs.promises.lstat(targetPath)
+    let targetStat = await fs.promises.lstat(targetPath)
     if (!storeStat.isFile() || !targetStat.isFile()) return { status: "stale" }
     if (meta.expected && !sameSnapshot(meta.expected, targetStat)) {
-      return { status: "stale" }
+      // Windows metadata operations can change ctime without changing the
+      // file's identity or bytes. Recover only that isolated mismatch by
+      // hashing the target again, then retain the exact pre-rename check below.
+      if (!sameContentState(meta.expected, targetStat)) return { status: "stale" }
+      const before = fileSnapshot(targetStat)
+      let verifiedTarget
+      try {
+        verifiedTarget = await this.hashFile(targetPath)
+      } catch (error) {
+        return { status: "stale" }
+      }
+      const after = await lstatIfPresent(targetPath)
+      if (!sameSnapshot(before, after) ||
+          verifiedTarget.hash !== hash || verifiedTarget.size !== after.size) {
+        return { status: "stale" }
+      }
+      targetStat = after
     }
     if (storeStat.dev !== targetStat.dev) {
       return { status: "unavailable", code: "EXDEV" }

package/package.json

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

package/server/public/vault.css

@@ -234,13 +234,13 @@ body[data-vault-mode="app"] .vault-overview {
   white-space: nowrap;
 }
 .vault-button:hover { background: var(--task-soft); }
-.vault-button.review-primary {
+.vault-button.primary {
   border-color: var(--task-accent-contrast);
   background: var(--task-accent-contrast);
   color: #101828;
   font-weight: 650;
 }
-.vault-button.review-primary:hover {
+.vault-button.primary:hover {
   border-color: color-mix(in srgb, var(--task-accent-contrast) 88%, var(--task-panel));
   background: color-mix(in srgb, var(--task-accent-contrast) 88%, var(--task-panel));
   color: #101828;

package/server/public/vault.js

@@ -142,7 +142,6 @@ const COPY = {
   files: "files",
   location: "location",
   deduplicate: "Deduplicate",
-  deduplicate_all: "Deduplicate all",
   deduplicating: "Deduplicating files",
   deduplicating_file: "Deduplicating file",
   deduplication_progress: "{done} of {total} files",
@@ -468,8 +467,8 @@ const bulkDeduplicationAction = (items) => {
   const candidates = bulkDeduplicationItems(items, selection)
   if (!candidates.length) return ""
   const context = state.sourceId || ""
-  const label = `${COPY.deduplicate_all}: ${countLabel(candidates.length)}`
-  return `<button class="vault-button" type="button" data-deduplicate-all="${selection}" data-deduplicate-context="${attr(context)}" aria-label="${attr(label)}" title="${attr(label)}">${esc(COPY.deduplicate_all)}</button>`
+  const label = `${COPY.deduplicate} ${countLabel(candidates.length)}`
+  return `<button class="vault-button primary" type="button" data-deduplicate-all="${selection}" data-deduplicate-context="${attr(context)}" aria-label="${attr(label)}" title="${attr(label)}">${esc(label)}</button>`
 }
 const batchAction = (source) => {
   if (!source || source.kind === "virtual" || source.kind === "pinokio") return ""
@@ -854,7 +853,7 @@ const renderOverview = () => {
     const opportunity = activeScan
       ? `<span class="vault-summary-state"><i class="fa-solid fa-circle-notch fa-spin"></i>${esc(COPY.scanning)}</span>`
       : pendingBytes
-        ? `<span class="vault-summary-state attention"><i class="fa-regular fa-copy"></i><strong>${esc(COPY.more_can_be_saved.replace("{size}", fmt(pendingBytes)))}</strong></span><button class="vault-button review-primary" type="button" id="btn-review-metric">${esc(COPY.review_files)}</button>`
+        ? `<span class="vault-summary-state attention"><i class="fa-regular fa-copy"></i><strong>${esc(COPY.more_can_be_saved.replace("{size}", fmt(pendingBytes)))}</strong></span>${state.view === "duplicates" ? "" : `<button class="vault-button${state.view === "independent" ? "" : " primary"}" type="button" id="btn-review-metric">${esc(COPY.review_files)}</button>`}`
         : `<span class="vault-summary-state"><i class="fa-regular fa-circle-check"></i>${esc(COPY.nothing_more_to_save)}</span>`
     const freshness = last ? `${COPY.scanned} ${timeAgo(last.ts)}` : COPY.not_scanned
     metrics.innerHTML = `
@@ -994,7 +993,9 @@ const renderResult = () => {
   }
   const info = state.scanResult
   const duplicateLabel = countLabel(info.count, COPY.duplicate.toLowerCase(), COPY.duplicates.toLowerCase())
-  const review = info.count ? `<button class="vault-button review-primary" type="button" id="btn-review-result">${esc(COPY.review)} ${duplicateLabel}<i class="fa-solid fa-chevron-right"></i></button>` : ""
+  const review = info.count && state.view !== "duplicates"
+    ? `<button class="vault-button${state.view === "independent" ? "" : " primary"}" type="button" id="btn-review-result">${esc(COPY.review)} ${duplicateLabel}<i class="fa-solid fa-chevron-right"></i></button>`
+    : ""
   if (info.incomplete) {
     result.className = `vault-result show incomplete${state.scanProblemsOpen ? " expanded" : ""}`
     const unreadableLabel = `${info.inaccessible} ${info.inaccessible === 1 ? COPY.scan_unreadable_path : COPY.scan_unreadable_paths}`

package/test/vault-engine.test.js

@@ -627,6 +627,112 @@ describe('vault engine (phase 1)', () => {
     assert.deepStrictEqual(await fs.promises.readFile(pendingPath), changedContent)
   })
 
+  test('deduplication rehashes a ctime-only snapshot mismatch before converting', async () => {
+    const h = await home()
+    const vault = await makeVault(h)
+    vault.sizeThreshold = 1
+    const content = crypto.randomBytes(4096)
+    await writeFile(path.resolve(h, 'api', 'appA', 'model.bin'), content)
+    await writeFile(path.resolve(h, 'api', 'appB', 'model.bin'), content)
+    await vault.sweeper.scan()
+
+    const [pendingPath, pendingEntry] = [...vault.registry.duplicates][0]
+    const indexed = vault.registry.scanIndex.get(pendingPath)
+    vault.registry.scanIndex.set(pendingPath, Object.assign({}, indexed, {
+      ctime: indexed.ctime - 1
+    }))
+    const realHashFile = vault.hashFile.bind(vault)
+    let targetRehashes = 0
+    vault.hashFile = async (filePath) => {
+      if (path.resolve(filePath) === pendingPath) targetRehashes += 1
+      return realHashFile(filePath)
+    }
+
+    let result
+    try {
+      result = await vault.perform('deduplicate', { scope_id: pendingEntry.source_id })
+    } finally {
+      vault.hashFile = realHashFile
+    }
+
+    assert.strictEqual(targetRehashes, 1)
+    assert.strictEqual(result.converted, 1)
+    assert.strictEqual(result.stale, 0)
+    assert.strictEqual(vault.registry.duplicates.has(pendingPath), false)
+    assert.deepStrictEqual(await fs.promises.readFile(pendingPath), content)
+  })
+
+  test('ctime recovery never converts different bytes with matching identity, size, and mtime', async () => {
+    const h = await home()
+    const vault = await makeVault(h)
+    vault.sizeThreshold = 1
+    const originalContent = Buffer.from('AAAA')
+    const changedContent = Buffer.from('BBBB')
+    await writeFile(path.resolve(h, 'api', 'appA', 'model.bin'), originalContent)
+    await writeFile(path.resolve(h, 'api', 'appB', 'model.bin'), originalContent)
+    await vault.sweeper.scan()
+
+    const [pendingPath, pendingEntry] = [...vault.registry.duplicates][0]
+    const indexed = vault.registry.scanIndex.get(pendingPath)
+    await fs.promises.writeFile(pendingPath, changedContent)
+    const current = await fs.promises.lstat(pendingPath)
+    vault.registry.scanIndex.set(pendingPath, Object.assign({}, indexed, {
+      dev: current.dev,
+      ino: current.ino,
+      size: current.size,
+      mtime: current.mtimeMs,
+      ctime: current.ctimeMs - 1
+    }))
+
+    const result = await vault.perform('deduplicate', { scope_id: pendingEntry.source_id })
+
+    assert.strictEqual(result.converted, 0)
+    assert.strictEqual(result.stale, 1)
+    assert.strictEqual((await fs.promises.stat(pendingPath)).nlink, 1)
+    assert.ok(vault.registry.duplicates.has(pendingPath))
+    assert.deepStrictEqual(await fs.promises.readFile(pendingPath), changedContent)
+  })
+
+  test('ctime recovery never overwrites a file replaced during its verification hash', async () => {
+    const h = await home()
+    const vault = await makeVault(h)
+    vault.sizeThreshold = 1
+    const content = crypto.randomBytes(4096)
+    const replacement = crypto.randomBytes(4096)
+    await writeFile(path.resolve(h, 'api', 'appA', 'model.bin'), content)
+    await writeFile(path.resolve(h, 'api', 'appB', 'model.bin'), content)
+    await vault.sweeper.scan()
+
+    const [pendingPath, pendingEntry] = [...vault.registry.duplicates][0]
+    const indexed = vault.registry.scanIndex.get(pendingPath)
+    vault.registry.scanIndex.set(pendingPath, Object.assign({}, indexed, {
+      ctime: indexed.ctime - 1
+    }))
+    const realHashFile = vault.hashFile.bind(vault)
+    vault.hashFile = async (filePath) => {
+      const result = await realHashFile(filePath)
+      if (path.resolve(filePath) === pendingPath) {
+        const writerPath = `${pendingPath}.writer-replacement`
+        await fs.promises.writeFile(writerPath, replacement)
+        await fs.promises.rename(writerPath, pendingPath)
+      }
+      return result
+    }
+
+    let result
+    try {
+      result = await vault.perform('deduplicate', { scope_id: pendingEntry.source_id })
+    } finally {
+      vault.hashFile = realHashFile
+    }
+
+    assert.strictEqual(result.converted, 0)
+    assert.strictEqual(result.stale, 1)
+    assert.strictEqual((await fs.promises.stat(pendingPath)).nlink, 1)
+    assert.ok(vault.registry.duplicates.has(pendingPath))
+    assert.deepStrictEqual(await fs.promises.readFile(pendingPath), replacement)
+  })
+
   test('deduplication revalidates canonical content before replacing a pending file', async () => {
     const h = await home()
     const vault = await makeVault(h)

package/test/vault-ui.test.js

@@ -993,8 +993,8 @@ describe('vault dashboard backend (phase 4)', () => {
     assert.match(vaultPage, /Number\(data\.bytes_on_disk\)/)
     assert.match(vaultPage, /Number\(data\.pending_bytes\)/)
     assert.match(vaultPage, /id="btn-review-metric"/)
-    assert.match(vaultPage, /\.vault-button\.review-primary \{[\s\S]*?background:\s*var\(--task-accent-contrast\)[\s\S]*?color:\s*#101828/)
-    assert.match(vaultPage, /class="vault-button review-primary" type="button" id="btn-review-result"/)
+    assert.match(vaultPage, /\.vault-button\.primary \{[\s\S]*?background:\s*var\(--task-accent-contrast\)[\s\S]*?color:\s*#101828/)
+    assert.match(vaultPage, /id="btn-review-result"/)
     assert.match(vaultPage, /class='vault-button' id='btn-scan'/)
     assert.match(vaultPage, /id='vault-storage-details'/)
     assert.match(vaultPage, /fmt\(data\.lifetime_bytes_saved\)/)
@@ -1316,7 +1316,7 @@ describe('vault dashboard backend (phase 4)', () => {
     assert.strictEqual(dom.window.document.querySelector('.vault-compare-info').getAttribute('tabindex'), '0')
     assert.match(dom.window.document.querySelector('.vault-summary-side').textContent, /13\.31 GB more can be saved/)
     assert.strictEqual(dom.window.document.getElementById('btn-review-metric').textContent, 'Review files')
-    assert.strictEqual(dom.window.document.getElementById('btn-review-metric').classList.contains('review-primary'), true)
+    assert.strictEqual(dom.window.document.getElementById('btn-review-metric').classList.contains('primary'), true)
     assert.strictEqual(dom.window.document.getElementById('btn-scan').classList.contains('primary'), false)
     assert.match(dom.window.document.getElementById('vault-storage-details').textContent, /Pinokio folder\s*166\.22 GB/)
     assert.match(dom.window.document.getElementById('vault-storage-details').textContent, /Saved by your actions\s*258\.77 GB/)
@@ -1670,15 +1670,18 @@ describe('vault dashboard backend (phase 4)', () => {
 
     try {
       assert.strictEqual(dom.window.document.querySelector('[data-deduplicate-all]'), null)
+      assert.strictEqual(dom.window.document.getElementById('btn-review-metric').classList.contains('primary'), true)
       dom.window.document.querySelector('[data-view="duplicates"]').click()
       let bulk = dom.window.document.querySelector('[data-deduplicate-all="duplicates"]')
-      assert.strictEqual(bulk.textContent, 'Deduplicate all')
+      assert.strictEqual(bulk.textContent, 'Deduplicate 2 files')
+      assert.strictEqual(bulk.classList.contains('primary'), true)
       assert.strictEqual(bulk.dataset.deduplicateContext, 'app:appB')
-      assert.strictEqual(bulk.getAttribute('aria-label'), 'Deduplicate all: 2 files')
+      assert.strictEqual(bulk.getAttribute('aria-label'), 'Deduplicate 2 files')
+      assert.strictEqual(dom.window.document.getElementById('btn-review-metric'), null)
       const search = dom.window.document.getElementById('vault-search')
       search.value = 'one.bin'
       search.dispatchEvent(new dom.window.Event('input', { bubbles: true }))
-      assert.strictEqual(bulk.getAttribute('aria-label'), 'Deduplicate all: 2 files',
+      assert.strictEqual(bulk.getAttribute('aria-label'), 'Deduplicate 2 files',
         'search never silently narrows the bulk action')
       bulk.click()
       await new Promise((resolve) => setTimeout(resolve, 25))
@@ -1690,9 +1693,13 @@ describe('vault dashboard backend (phase 4)', () => {
 
       dom.window.document.querySelector('[data-view="shared"]').click()
       assert.strictEqual(dom.window.document.querySelector('[data-deduplicate-all]'), null)
+      assert.strictEqual(dom.window.document.getElementById('btn-review-metric').classList.contains('primary'), true)
       dom.window.document.querySelector('[data-view="independent"]').click()
       bulk = dom.window.document.querySelector('[data-deduplicate-all="kept-separate"]')
-      assert.strictEqual(bulk.getAttribute('aria-label'), 'Deduplicate all: 2 files')
+      assert.strictEqual(bulk.textContent, 'Deduplicate 2 files')
+      assert.strictEqual(bulk.getAttribute('aria-label'), 'Deduplicate 2 files')
+      assert.strictEqual(bulk.classList.contains('primary'), true)
+      assert.strictEqual(dom.window.document.getElementById('btn-review-metric').classList.contains('primary'), false)
       bulk.click()
       await new Promise((resolve) => setTimeout(resolve, 25))
       const operation = dom.window.document.getElementById('vault-action-state')