pinokiod 8.0.57 → 8.0.60

package/kernel/vault/automatic_scans.js

@@ -41,6 +41,7 @@ class AutomaticScans {
     this.waitingFor = null
     this.listeners = new Set()
     this.appTransitions = new Map()
+    this.globalScanReady = false
   }
 
   log(event, details = {}) {
@@ -134,7 +135,8 @@ class AutomaticScans {
   snapshot() {
     return {
       enabled: !!this.vault.enabled,
-      rows: [...this.entries.values()]
+      global_scan_ready: this.globalScanReady,
+      rows: (this.globalScanReady ? [...this.entries.values()] : [])
         .filter((entry) => !entry.hidden)
         .sort((left, right) =>
           (Number(left.updated_at) || 0) -
@@ -147,13 +149,22 @@ class AutomaticScans {
     }
   }
 
+  async refreshGlobalScanReady() {
+    const ready = typeof this.vault.globalScanReady === "function" &&
+      !!await this.vault.globalScanReady()
+    const changed = ready !== this.globalScanReady
+    this.globalScanReady = ready
+    return changed
+  }
+
   modeFor(app) {
     const setting = this.settings.get(app)
     return setting && setting.mode === "manual" ? "manual" : "automatic"
   }
 
-  broadcast() {
+  broadcast(completion = null) {
     const snapshot = this.snapshot()
+    if (completion) snapshot.completion = completion
     for (const listener of this.listeners) {
       try {
         listener(snapshot)
@@ -235,6 +246,10 @@ class AutomaticScans {
   }
 
   queueApp(app) {
+    if (!this.globalScanReady) {
+      this.log("queue-skipped", { app, reason: "global-scan-required" })
+      return false
+    }
     if (this.modeFor(app) === "manual") {
       this.log("queue-skipped", { app, reason: "manual" })
       return false
@@ -323,6 +338,12 @@ class AutomaticScans {
     this.log("preparing", { app })
     await this.vault.ensureRegistryInitialized()
     if (this.pendingStops.get(app) !== pending) return
+    await this.refreshGlobalScanReady()
+    if (!this.globalScanReady) {
+      this.pendingStops.delete(app)
+      this.log("check-skipped", { app, reason: "global-scan-required" })
+      return
+    }
     await this.hydrate()
     await this.withAppTransition(app, async () => {
       if (this.pendingStops.get(app) !== pending) return
@@ -394,6 +415,11 @@ class AutomaticScans {
     if (!this.hydrated && typeof this.vault.automaticScanStatus === "function") {
       await this.vault.automaticScanStatus()
     }
+    await this.refreshGlobalScanReady()
+    if (!this.globalScanReady) {
+      this.log("check-skipped", { app, reason: "global-scan-required" })
+      return
+    }
     if (this.modeFor(app) === "manual") {
       this.log("check-skipped", { app, reason: "manual" })
       return
@@ -546,14 +572,16 @@ class AutomaticScans {
 
   async drain() {
     if (!this.vault.enabled || !this.vault.registry || this.active) return
+    const entry = [...this.entries.values()].find((item) =>
+      item.state === "checking")
+    if (!entry) return
+    await this.refreshGlobalScanReady()
+    if (!this.globalScanReady) return
     if (this.manualDepth > 0 || this.currentBusyPromise() ||
         this.vault.fileActionProgress) {
       this.waitForBusyWork()
       return
     }
-    const entry = [...this.entries.values()].find((item) =>
-      item.state === "checking")
-    if (!entry) return
     let appAvailable
     try {
       appAvailable = await this.appRootIsAvailable(entry.app)
@@ -617,6 +645,7 @@ class AutomaticScans {
 
   async precheckFinished(active, result, error) {
     const app = active.app
+    let completion = null
     try {
       await this.withAppTransition(app, async () => {
         let reason = active.reason
@@ -661,13 +690,20 @@ class AutomaticScans {
           ? Object.assign({}, this.settings.get(app))
           : null
         try {
-          await this.publishResultNow(app, result)
+          const outcome = await this.publishResultNow(app, result)
+          if (outcome === "empty") {
+            completion = {
+              app,
+              outcome: "no_possible_duplicates"
+            }
+          }
         } catch (publicationError) {
           this.restorePrevious(app)
           throw publicationError
         }
         reason = active.reason
         if (reason) {
+          completion = null
           await this.restorePublishedState(app, entry, previousSetting)
           this.entries.set(app, entry)
           this.log("publication-reverted", { app, reason })
@@ -682,7 +718,7 @@ class AutomaticScans {
       })
     } finally {
       if (this.active === active) this.active = null
-      this.broadcast()
+      this.broadcast(completion)
       this.schedule()
     }
   }
@@ -764,7 +800,7 @@ class AutomaticScans {
         possible_files: possibleFiles,
         acknowledged: acknowledged === result.signature
       })
-      return
+      return "result"
     }
     const acknowledged = (this.settings.get(app) || {})
       .acknowledged_signature
@@ -777,6 +813,7 @@ class AutomaticScans {
     }
     this.entries.delete(app)
     this.log("no-possible-matches", { app })
+    return "empty"
   }
 
   async clearAutomaticState(apps, reason, options = {}) {
@@ -832,6 +869,7 @@ class AutomaticScans {
 
   async scanFinished({ scopeId, result, error }) {
     const complete = !error && result && COMPLETE_PHASES.has(result.outcome)
+    let readinessChanged = false
     try {
       if (complete) {
         await this.hydrate()
@@ -842,7 +880,9 @@ class AutomaticScans {
           { cancelPending: true, states: ["checking", "result"] }
         )
       }
+      if (!scopeId) readinessChanged = await this.refreshGlobalScanReady()
     } finally {
+      if (readinessChanged) this.broadcast()
       this.schedule()
     }
   }
@@ -887,6 +927,16 @@ class AutomaticScans {
       await this.persistMode(app, mode)
       const entry = this.entries.get(app)
       if (entry && entry.state === "paused") this.entries.delete(app)
+      await this.refreshGlobalScanReady()
+      if (!this.globalScanReady) {
+        this.log("mode-changed", {
+          app,
+          mode,
+          check: "global-scan-required"
+        })
+        this.broadcast()
+        return { app, mode }
+      }
       if (!this.appIsRunning(app)) {
         this.log("mode-changed", { app, mode })
         this.queueApp(app)

package/kernel/vault/index.js

@@ -73,6 +73,9 @@ const STATUS_FILTERS = new Set([
 const FOLDER_DISCOVERY_COMPLETE_PHASES = new Set([
   "complete", "completed_with_exclusions"
 ])
+const GLOBAL_SCAN_READY_OUTCOMES = new Set([
+  "complete", "completed_with_exclusions"
+])
 
 const isMissingError = (error) => !!(error &&
   (error.code === "ENOENT" || error.code === "ENOTDIR"))
@@ -672,9 +675,23 @@ class Vault {
       await this.ensureRegistryInitialized()
     }
     await this.automaticScans.hydrate()
+    await this.automaticScans.refreshGlobalScanReady()
     return this.automaticScans.snapshot()
   }
 
+  async globalScanReady() {
+    if (!this.registry) return false
+    const scan = await this.registry.scanFor()
+    if (scan) this.lastScanCache.set("", scan)
+    else this.lastScanCache.delete("")
+    return this.globalScanIsReady(scan)
+  }
+
+  globalScanIsReady(scan = this.lastScanCache.get("")) {
+    return !!(scan && scan.ts &&
+      GLOBAL_SCAN_READY_OUTCOMES.has(scan.outcome))
+  }
+
   async refreshAnchorStores() {
     let config = this.readConfig()
     const candidates = [
@@ -1790,9 +1807,19 @@ class Vault {
         return this.runMutation(() =>
           this.removeExternalSource(payload.source_id))
       case "scan": {
-        if (payload.scope_id && !this.scanSource(payload.scope_id)) {
+        const scanSource = payload.scope_id
+          ? this.scanSource(payload.scope_id)
+          : null
+        if (payload.scope_id && !scanSource) {
           return { error: "That scan location is no longer available." }
         }
+        if (scanSource && scanSource.kind === "app" &&
+            !await this.globalScanReady()) {
+          return {
+            error: "Run an initial scan before scanning individual apps.",
+            code: "global_scan_required"
+          }
+        }
         let threshold = this.sizeThreshold
         if (payload.candidate_size != null) {
           if (!CANDIDATE_SIZE_OPTIONS.includes(payload.candidate_size)) {
@@ -3266,6 +3293,9 @@ class Vault {
     }
 
     const lastScan = await this.scanForScope(scopeId)
+    const globalScanReady = scopeId
+      ? await this.globalScanReady()
+      : this.globalScanIsReady(lastScan)
     const before = lastScan && Number.isFinite(lastScan.bytes_total)
       ? lastScan.bytes_total
       : 0
@@ -3302,6 +3332,7 @@ class Vault {
     const sourceCounts = this.sourceCountMaps(snapshot.scopeRows)
     const result = {
       enabled: true,
+      global_scan_ready: globalScanReady,
       mode: this.mode,
       scan: this.scanStatus(),
       last_scan: lastScan,
@@ -3402,6 +3433,7 @@ class Vault {
   async progressStatus(scopeId = null) {
     const result = {
       enabled: !!this.enabled,
+      global_scan_ready: this.globalScanIsReady(),
       scan: this.scanStatus(),
       file_action: this.fileActionStatus(scopeId),
       last_scan: this.lastScanCache.get(scopeId || "") || null

package/package.json

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

package/server/index.js

@@ -1994,9 +1994,12 @@ class Server {
     if (vault && vault.ready) await vault.ready
     result.vault_enabled = !!(vault && vault.enabled)
     result.vault_automatic_mode = "automatic"
+    result.vault_global_scan_ready = false
     if (result.vault_enabled) {
       try {
         const snapshot = await vault.automaticScanStatus()
+        result.vault_global_scan_ready =
+          snapshot && snapshot.global_scan_ready === true
         const setting = Array.isArray(snapshot && snapshot.settings)
           ? snapshot.settings.find((item) =>
             item && item.app === name)

package/server/public/app-vault-mode.js

@@ -5,14 +5,22 @@
   const app = status.dataset.app || ""
   const tab = status.closest("#save-space-tab")
   const label = status.querySelector("[data-app-vault-mode-label]")
-  const setMode = (value) => {
+  const setState = (value, ready) => {
     const mode = value === "manual" ? "manual" : "automatic"
+    const globalScanReady = ready === true
     status.dataset.mode = mode
+    status.dataset.ready = String(globalScanReady)
     status.hidden = false
-    if (label) label.textContent = mode === "automatic" ? "Auto" : "Manual"
+    if (label) {
+      label.textContent = globalScanReady
+        ? (mode === "automatic" ? "Auto" : "Manual")
+        : "Set up"
+    }
     if (tab) {
       tab.setAttribute("aria-label",
-        `Disk Saver — ${mode === "automatic" ? "Automatic" : "Manual"} checking`)
+        globalScanReady
+          ? `Disk Saver — ${mode === "automatic" ? "Automatic" : "Manual"} checking`
+          : "Disk Saver — Set up required")
     }
   }
   const applySnapshot = (snapshot) => {
@@ -20,10 +28,11 @@
       ? snapshot.settings
       : []
     const setting = settings.find((item) => item && item.app === app)
-    setMode(setting && setting.mode)
+    setState(setting && setting.mode,
+      snapshot && snapshot.global_scan_ready === true)
   }
 
-  setMode(status.dataset.mode)
+  setState(status.dataset.mode, status.dataset.ready === "true")
   if (!app || typeof window.EventSource !== "function") return
 
   const source = new window.EventSource(

package/server/public/layout.js

@@ -866,8 +866,16 @@
         <circle cx="10" cy="10" r="7.5"></circle>
         <path d="M8 7.25v5.5M12 7.25v5.5"></path>
       </svg>`;
+    const COMPLETE_ICON = `
+      <svg viewBox="0 0 20 20" aria-hidden="true">
+        <circle cx="10" cy="10" r="7.5"></circle>
+        <path d="m6.75 10.1 2.1 2.1 4.6-4.65"></path>
+      </svg>`;
+    const COMPLETION_VISIBLE_MS = 4000;
 
     let eventSource = null;
+    let visibleCheckingApps = new Set();
+    const completions = new Map();
 
     function statusText(row) {
       if (row.state === 'paused') {
@@ -912,6 +920,97 @@
       tray.hidden = tray.childElementCount === 0;
     }
 
+    function removeCompletion(app) {
+      const completion = completions.get(app);
+      if (!completion) return;
+      if (completion.timer) window.clearTimeout(completion.timer);
+      completions.delete(app);
+      removeRow(completion.item);
+    }
+
+    function clearCompletions() {
+      [...completions.keys()].forEach(removeCompletion);
+    }
+
+    function scheduleCompletion(completion) {
+      if (completion.paused.size || completion.timer) return;
+      completion.startedAt = Date.now();
+      completion.timer = window.setTimeout(() => {
+        completion.timer = null;
+        removeCompletion(completion.app);
+      }, completion.remaining);
+    }
+
+    function setCompletionPaused(completion, reason, paused) {
+      if (paused) {
+        if (completion.paused.has(reason)) return;
+        if (!completion.paused.size && completion.timer) {
+          completion.remaining = Math.max(0,
+            completion.remaining - (Date.now() - completion.startedAt));
+          window.clearTimeout(completion.timer);
+          completion.timer = null;
+        }
+        completion.paused.add(reason);
+        return;
+      }
+      completion.paused.delete(reason);
+      if (!completion.paused.size) scheduleCompletion(completion);
+    }
+
+    function startCompletion(app) {
+      if (completions.has(app)) return;
+      const item = document.createElement('div');
+      item.className = 'vault-auto-scan-row';
+      item.dataset.state = 'complete';
+
+      const close = document.createElement('button');
+      close.type = 'button';
+      close.className = 'vault-auto-scan-close';
+      close.setAttribute('aria-label',
+        `Dismiss Disk Saver completion for ${app}`);
+      close.title = 'Dismiss';
+      close.textContent = '×';
+
+      const icon = document.createElement('span');
+      icon.className = 'vault-auto-scan-icon';
+      icon.innerHTML = COMPLETE_ICON;
+
+      const copy = document.createElement('span');
+      copy.className = 'vault-auto-scan-copy';
+      const appName = document.createElement('span');
+      appName.className = 'vault-auto-scan-app';
+      appName.textContent = app;
+      appName.title = app;
+      const status = document.createElement('span');
+      status.className = 'vault-auto-scan-status';
+      status.textContent = 'No possible duplicate files found';
+      copy.append(appName, status);
+      item.append(close, icon, copy);
+
+      const completion = {
+        app,
+        item,
+        timer: null,
+        remaining: COMPLETION_VISIBLE_MS,
+        startedAt: 0,
+        paused: new Set()
+      };
+      close.addEventListener('click', () => removeCompletion(app));
+      item.addEventListener('mouseenter', () =>
+        setCompletionPaused(completion, 'pointer', true));
+      item.addEventListener('mouseleave', () =>
+        setCompletionPaused(completion, 'pointer', false));
+      item.addEventListener('focusin', () =>
+        setCompletionPaused(completion, 'focus', true));
+      item.addEventListener('focusout', (event) => {
+        if (!item.contains(event.relatedTarget)) {
+          setCompletionPaused(completion, 'focus', false);
+        }
+      });
+      completions.set(app, completion);
+      scheduleCompletion(completion);
+    }
+
     function automaticSettingsKey(app) {
       return `pinokio:vault:auto-settings:${encodeURIComponent(app)}`;
     }
@@ -968,15 +1067,41 @@
       return opened;
     }
 
-    function render(snapshot) {
+    function render(snapshot, options = {}) {
+      if (!snapshot || snapshot.global_scan_ready !== true) {
+        [...completions.keys()].forEach(removeCompletion);
+        visibleCheckingApps = new Set();
+        tray.replaceChildren();
+        tray.hidden = true;
+        return;
+      }
       const rows = snapshot && Array.isArray(snapshot.rows)
         ? snapshot.rows
         : [];
+      const validRows = rows.filter((row) =>
+        row && typeof row.app === 'string' && row.app);
+      const liveApps = new Set(validRows.map((row) => row.app));
+      [...completions.keys()].forEach((app) => {
+        if (liveApps.has(app)) removeCompletion(app);
+      });
+      const manualApps = new Set(snapshot && Array.isArray(snapshot.settings)
+        ? snapshot.settings.filter((setting) =>
+          setting && setting.mode === 'manual').map((setting) => setting.app)
+        : []);
+      manualApps.forEach(removeCompletion);
+
+      const completion = snapshot && snapshot.completion;
+      if (options.acceptCompletion && completion &&
+          completion.outcome === 'no_possible_duplicates' &&
+          typeof completion.app === 'string' && completion.app &&
+          visibleCheckingApps.has(completion.app) &&
+          !liveApps.has(completion.app) &&
+          !manualApps.has(completion.app)) {
+        startCompletion(completion.app);
+      }
+
       const fragment = document.createDocumentFragment();
-      rows.forEach((row) => {
-        if (!row || typeof row.app !== 'string' || !row.app) {
-          return;
-        }
+      validRows.forEach((row) => {
         const item = document.createElement('div');
         item.className = 'vault-auto-scan-row';
         item.dataset.state = row.state || 'checking';
@@ -988,6 +1113,7 @@
         close.title = 'Dismiss';
         close.textContent = '×';
         close.addEventListener('click', async () => {
+          if (row.state === 'checking') visibleCheckingApps.delete(row.app);
           close.disabled = true;
           try {
             const result = await requestAction(
@@ -1000,6 +1126,9 @@
             removeRow(item);
           } catch (error) {
             console.warn('[Disk Saver] Automatic check dismissal failed', error);
+            if (row.state === 'checking' && item.isConnected) {
+              visibleCheckingApps.add(row.app);
+            }
             close.disabled = false;
           }
         });
@@ -1088,8 +1217,16 @@
         item.append(close, icon, copy, controls);
         fragment.appendChild(item);
       });
+      completions.forEach((completionRow) => {
+        if (!liveApps.has(completionRow.app)) {
+          fragment.appendChild(completionRow.item);
+        }
+      });
       tray.replaceChildren(fragment);
       tray.hidden = tray.childElementCount === 0;
+      visibleCheckingApps = new Set(validRows
+        .filter((row) => row.state === 'checking')
+        .map((row) => row.app));
     }
 
     async function loadState() {
@@ -1119,12 +1256,13 @@
         '/info/vault/automatic-scans/events');
       eventSource.onmessage = (event) => {
         try {
-          render(JSON.parse(event.data));
+          render(JSON.parse(event.data), { acceptCompletion: true });
         } catch (error) {
           console.debug('[Disk Saver] Invalid automatic check state', error);
         }
       };
       eventSource.onerror = () => {
+        clearCompletions();
         loadState();
       };
     }

package/server/public/vault.css

@@ -218,6 +218,31 @@ body[data-vault-mode="app"] .vault-overview {
   letter-spacing: -.025em;
   line-height: 1.15;
 }
+.vault-setup-copy {
+  max-width: 560px;
+  margin: 8px 0 0;
+  color: var(--task-muted);
+  font-size: 12px;
+  line-height: 1.5;
+}
+.vault-body.setup-required .vault-overview {
+  min-height: 260px;
+  flex: 1 1 auto;
+  justify-content: center;
+  gap: 32px;
+  padding: 48px;
+  border-bottom: 0;
+}
+.vault-body.setup-required .vault-metrics.summary {
+  max-width: 620px;
+  flex: 0 1 620px;
+  grid-template-columns: minmax(0, 1fr);
+}
+.vault-body.setup-required .vault-summary-value {
+  margin-top: 8px;
+  font-size: 24px;
+}
+.vault-body.setup-required .vault-summary-side { display: none; }
 .vault-storage-chart {
   width: min(100%, 540px);
   min-width: 0;