pinokiod 8.0.56 → 8.0.57

package/package.json

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

package/server/index.js

@@ -1993,6 +1993,19 @@ class Server {
     const vault = this.kernel.vault
     if (vault && vault.ready) await vault.ready
     result.vault_enabled = !!(vault && vault.enabled)
+    result.vault_automatic_mode = "automatic"
+    if (result.vault_enabled) {
+      try {
+        const snapshot = await vault.automaticScanStatus()
+        const setting = Array.isArray(snapshot && snapshot.settings)
+          ? snapshot.settings.find((item) =>
+            item && item.app === name)
+          : null
+        result.vault_automatic_mode = setting && setting.mode === "manual"
+          ? "manual"
+          : "automatic"
+      } catch (_) {}
+    }
     if (!registryEnabled) {
       result.pendingSnapshotId = null
     }

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

@@ -0,0 +1,37 @@
+(() => {
+  const status = document.querySelector("[data-app-vault-mode]")
+  if (!status) return
+
+  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 mode = value === "manual" ? "manual" : "automatic"
+    status.dataset.mode = mode
+    status.hidden = false
+    if (label) label.textContent = mode === "automatic" ? "Auto" : "Manual"
+    if (tab) {
+      tab.setAttribute("aria-label",
+        `Disk Saver — ${mode === "automatic" ? "Automatic" : "Manual"} checking`)
+    }
+  }
+  const applySnapshot = (snapshot) => {
+    const settings = snapshot && Array.isArray(snapshot.settings)
+      ? snapshot.settings
+      : []
+    const setting = settings.find((item) => item && item.app === app)
+    setMode(setting && setting.mode)
+  }
+
+  setMode(status.dataset.mode)
+  if (!app || typeof window.EventSource !== "function") return
+
+  const source = new window.EventSource(
+    "/info/vault/automatic-scans/events")
+  source.onmessage = (event) => {
+    try {
+      applySnapshot(JSON.parse(event.data))
+    } catch (_) {}
+  }
+  window.addEventListener("beforeunload", () => source.close(), { once: true })
+})()

package/server/public/vault.js

@@ -2274,8 +2274,8 @@ const renderOverview = () => {
     : activeScan
       ? `<i class="fa-solid fa-circle-notch fa-spin"></i>${esc(COPY.scanning)}`
     : `<i class="fa-solid fa-rotate"></i>${esc(idleScanLabel)}`
-  const firstGlobalScan = !IS_APP_MODE && !last && !activeScan
-  scanButton.classList.toggle("primary", firstGlobalScan)
+  const firstScan = !last && !activeScan
+  scanButton.classList.toggle("primary", firstScan)
   scanButton.disabled = busyElsewhere || state.scanCancelRequested
   if (state.automaticReviewRequested && !activeScan &&
       !scanButton.disabled) {
@@ -2296,7 +2296,7 @@ const renderOverview = () => {
   if (scanSizeMenu) {
     const scanSizeTrigger = scanSizeMenu.querySelector("summary")
     if (scanSizeTrigger) {
-      scanSizeTrigger.classList.toggle("primary", firstGlobalScan)
+      scanSizeTrigger.classList.toggle("primary", firstScan)
     }
     scanSizeMenu.hidden = activeScan
     if (activeScan) scanSizeMenu.open = false

package/server/views/app.ejs

@@ -4102,6 +4102,48 @@ body.dark .disk-usage {
   flex: 0 0 auto;
   min-width: 0;
 }
+.appcanvas.vertical > aside .menu-actions #save-space-tab {
+  width: 100%;
+  max-width: none;
+  box-sizing: border-box;
+}
+.app-vault-mode {
+  flex: 0 0 auto;
+  margin-left: auto;
+  color: rgba(71, 85, 105, 0.82);
+  font-size: 12px;
+  font-weight: 500;
+  letter-spacing: 0;
+  line-height: 1.2;
+  text-align: right;
+  white-space: nowrap;
+}
+.app-vault-mode[data-mode="automatic"] {
+  color: #b45309;
+}
+body.dark .app-vault-mode {
+  color: rgba(203, 213, 225, 0.74);
+}
+body.dark .app-vault-mode[data-mode="automatic"] {
+  color: #e0a54b;
+}
+.app-vault-mode-chevron,
+.app-autolaunch-chevron {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 10px;
+  flex: 0 0 10px;
+  margin-right: 0;
+  padding: 0;
+  color: var(--pinokio-sidebar-action-muted);
+  font-size: 10px;
+  line-height: 1;
+  box-sizing: border-box;
+}
+.appcanvas > aside .menu-actions .header-item .tab .app-vault-mode-chevron {
+  margin-right: 0;
+}
 .app-autolaunch-row {
   appearance: none;
   display: flex;
@@ -4171,19 +4213,14 @@ body.dark .disk-usage {
 .app-autolaunch-status {
   flex: 0 0 auto;
   color: var(--pinokio-sidebar-action-muted);
-  font-size: 11px;
-  font-weight: 700;
-  letter-spacing: 0.02em;
+  font-size: 12px;
+  font-weight: 500;
+  letter-spacing: 0;
   white-space: nowrap;
 }
 .app-autolaunch-row[data-enabled="true"] .app-autolaunch-status {
   color: rgba(22, 101, 52, 0.95);
 }
-.app-autolaunch-chevron {
-  flex: 0 0 auto;
-  color: var(--pinokio-sidebar-action-muted);
-  font-size: 10px;
-}
 body.dark .app-autolaunch-row {
   background: transparent;
   color: var(--pinokio-sidebar-tab-muted);
@@ -4193,6 +4230,7 @@ body.dark .app-autolaunch.open .app-autolaunch-row {
   background: var(--pinokio-sidebar-tab-hover);
   color: var(--pinokio-sidebar-tab-active-color);
 }
+body.dark .app-vault-mode-chevron,
 body.dark .app-autolaunch-status,
 body.dark .app-autolaunch-chevron {
   color: var(--pinokio-sidebar-action-muted);
@@ -8163,6 +8201,7 @@ body.dark .pinokio-custom-terminal-header {
 <script src="/tippy-bundle.umd.min.js"></script>
 <script src="/tab-link-popover.js"></script>
 <script src="/browser-popout-surface.js"></script>
+<script src="/app-vault-mode.js" defer></script>
 <script>
 (function() {
   try {
@@ -8461,11 +8500,16 @@ body.dark .pinokio-custom-terminal-header {
           </div>
         </button>
         <% if (typeof vault_enabled !== 'undefined' && vault_enabled) { %>
-        <a id='save-space-tab' data-mode="refresh" target="app-vault" href="/vault/app/<%=encodeURIComponent(name)%>" class="btn header-item frame-link" data-index="vault" data-static="retain" data-tab-link-popover="false">
+        <% const vaultAutomaticMode = typeof vault_automatic_mode === 'string' && vault_automatic_mode === 'manual' ? 'manual' : 'automatic' %>
+        <a id='save-space-tab' data-mode="refresh" target="app-vault" href="/vault/app/<%=encodeURIComponent(name)%>" class="btn header-item frame-link" data-index="vault" data-static="retain" data-tab-link-popover="false" aria-label="Disk Saver — <%=vaultAutomaticMode === 'automatic' ? 'Automatic' : 'Manual'%> checking">
           <div class='tab'>
             <i class="fa-solid fa-hard-drive menu-action-leading-icon"></i>
             <div class='display'>Disk Saver</div>
             <div class='flexible'></div>
+            <span class="app-vault-mode" data-app-vault-mode data-app="<%=name%>" data-mode="<%=vaultAutomaticMode%>" aria-hidden="true">
+              <span data-app-vault-mode-label><%=vaultAutomaticMode === 'automatic' ? 'Auto' : 'Manual'%></span>
+            </span>
+            <i class="fa-solid fa-angle-down app-vault-mode-chevron" aria-hidden="true"></i>
           </div>
         </a>
         <% } %>
@@ -8474,7 +8518,7 @@ body.dark .pinokio-custom-terminal-header {
             <button type="button" class="app-autolaunch-row" data-app-autolaunch-button data-enabled="<%= autolaunch_app.autolaunch_enabled ? 'true' : 'false' %>" aria-haspopup="dialog" aria-expanded="false">
               <span class="app-autolaunch-label"><i class="fa-solid fa-power-off"></i><span>Autolaunch</span></span>
               <span class="app-autolaunch-spacer" aria-hidden="true"></span>
-              <span class="app-autolaunch-status" data-app-autolaunch-status><%= autolaunch_app.autolaunch_enabled ? 'ON' : 'OFF' %></span>
+              <span class="app-autolaunch-status" data-app-autolaunch-status><%= autolaunch_app.autolaunch_enabled ? 'On' : 'Off' %></span>
               <i class="fa-solid fa-angle-down app-autolaunch-chevron" aria-hidden="true"></i>
             </button>
             <div class="app-autolaunch-modal hidden" data-app-autolaunch-modal role="dialog" aria-modal="true" aria-label="Autolaunch">

package/server/views/partials/app_autolaunch_modal_helpers.ejs

@@ -169,7 +169,7 @@
   }
   const renderStatus = () => {
     const enabled = !!(state && state.autolaunch_enabled)
-    status.textContent = enabled ? "ON" : "OFF"
+    status.textContent = enabled ? "On" : "Off"
     button.dataset.enabled = enabled ? "true" : "false"
     button.setAttribute("aria-label", `Autolaunch. Start with Pinokio ${enabled ? "On" : "Off"}`)
     switchButton.setAttribute("aria-checked", enabled ? "true" : "false")

package/test/launch-requirements-browser.test.js

@@ -122,7 +122,7 @@ function appAutolaunchMarkup(initialApp) {
     <div class="app-autolaunch" data-app-autolaunch data-app-id="target">
       <button type="button" class="app-autolaunch-row" data-app-autolaunch-button data-enabled="${initialApp.autolaunch_enabled ? "true" : "false"}" aria-haspopup="dialog" aria-expanded="false">
         <span class="app-autolaunch-label">Autolaunch</span>
-        <span class="app-autolaunch-status" data-app-autolaunch-status>${initialApp.autolaunch_enabled ? "ON" : "OFF"}</span>
+        <span class="app-autolaunch-status" data-app-autolaunch-status>${initialApp.autolaunch_enabled ? "On" : "Off"}</span>
       </button>
       <div class="app-autolaunch-modal hidden" data-app-autolaunch-modal role="dialog" aria-modal="true" aria-label="Autolaunch">
         <button type="button" class="app-autolaunch-switch" role="switch" aria-checked="${initialApp.autolaunch_enabled ? "true" : "false"}" data-app-autolaunch-switch aria-label="Start with Pinokio">
@@ -478,7 +478,7 @@ browserTest("browser: selecting a launch script from empty state persists and st
       enabled: false
     })
     assert.equal(await page.isChecked('input[name="app-autolaunch-script"][value="start.js"]'), true)
-    assert.equal((await textContent(page, "[data-app-autolaunch-status]")).trim(), "OFF")
+    assert.equal((await textContent(page, "[data-app-autolaunch-status]")).trim(), "Off")
   })
 })
 
@@ -532,7 +532,7 @@ browserTest("browser: startup toggle from empty selection saves the single eligi
     })
     assert.equal(state.launchRequirementsGets, 0)
     assert.equal(await page.isChecked('input[name="app-autolaunch-script"][value="start.js"]'), true)
-    assert.equal((await textContent(page, "[data-app-autolaunch-status]")).trim(), "ON")
+    assert.equal((await textContent(page, "[data-app-autolaunch-status]")).trim(), "On")
   })
 })
 
@@ -570,7 +570,7 @@ browserTest("browser: startup toggle from empty selection warns when no eligible
       })
 
       assert.equal(state.autolaunchPosts.length, 0, scenario.name)
-      assert.equal((await textContent(page, "[data-app-autolaunch-status]")).trim(), "OFF")
+      assert.equal((await textContent(page, "[data-app-autolaunch-status]")).trim(), "Off")
     })
   }
 })

package/test/vault-automatic-scan-ui.test.js

@@ -290,3 +290,80 @@ test("the app workspace focuses Scan this app without starting it after Review",
   assert.doesNotMatch(source,
     /automaticReviewRequested[\s\S]{0,200}(post\(|btn-scan\.click)/)
 })
+
+test("the app sidebar mirrors Automatic and Manual Disk Saver modes", async () => {
+  const template = await fs.promises.readFile(
+    path.join(root, "server", "views", "app.ejs"), "utf8")
+  const server = await fs.promises.readFile(
+    path.join(root, "server", "index.js"), "utf8")
+  const script = await fs.promises.readFile(
+    path.join(root, "server", "public", "app-vault-mode.js"), "utf8")
+  const dom = new JSDOM(`<a id="save-space-tab">
+    <span data-app-vault-mode data-app="ComfyUI" data-mode="automatic">
+      <span data-app-vault-mode-label>Auto</span>
+    </span>
+  </a>`, {
+    runScripts: "outside-only",
+    url: "http://localhost/v/ComfyUI"
+  })
+  const eventSources = []
+  dom.window.EventSource = class EventSource {
+    constructor(url) {
+      this.url = url
+      eventSources.push(this)
+    }
+    close() {}
+  }
+
+  dom.window.eval(script)
+  const status = dom.window.document.querySelector("[data-app-vault-mode]")
+  const label = status.querySelector("[data-app-vault-mode-label]")
+  assert.equal(eventSources.length, 1)
+  assert.equal(eventSources[0].url,
+    "/info/vault/automatic-scans/events")
+  assert.equal(status.dataset.mode, "automatic")
+  assert.equal(status.hidden, false)
+  assert.equal(label.textContent, "Auto")
+  assert.equal(dom.window.document.getElementById("save-space-tab")
+    .getAttribute("aria-label"), "Disk Saver — Automatic checking")
+
+  eventSources[0].onmessage({
+    data: JSON.stringify({
+      settings: [{ app: "ComfyUI", mode: "manual" }]
+    })
+  })
+  assert.equal(status.dataset.mode, "manual")
+  assert.equal(status.hidden, false)
+  assert.equal(label.textContent, "Manual")
+  assert.equal(dom.window.document.getElementById("save-space-tab")
+    .getAttribute("aria-label"), "Disk Saver — Manual checking")
+
+  eventSources[0].onmessage({ data: JSON.stringify({ settings: [] }) })
+  assert.equal(status.dataset.mode, "automatic")
+  assert.equal(status.hidden, false)
+  assert.equal(label.textContent, "Auto")
+  assert.match(template, /data-app-vault-mode/)
+  assert.match(template, /app-vault-mode\.js/)
+  assert.match(template,
+    /#save-space-tab\s*\{[^}]*width:\s*100%;[^}]*max-width:\s*none;/s)
+  assert.match(template,
+    /\.app-vault-mode\s*\{[^}]*margin-left:\s*auto;[^}]*font-size:\s*12px;[^}]*font-weight:\s*500;/s)
+  assert.match(template,
+    /\.app-vault-mode-chevron,\s*\.app-autolaunch-chevron\s*\{[^}]*width:\s*10px;[^}]*flex:\s*0 0 10px;/s)
+  assert.doesNotMatch(template,
+    /\.app-vault-mode\s*\{[^}]*(background|border-radius|padding):/s)
+  assert.match(template,
+    /vaultAutomaticMode === 'automatic' \? 'Auto' : 'Manual'/)
+  assert.match(template,
+    /fa-solid fa-angle-down app-vault-mode-chevron/)
+  assert.match(template,
+    /autolaunch_app\.autolaunch_enabled \? 'On' : 'Off'/)
+  assert.match(template,
+    /\.app-autolaunch-status\s*\{[^}]*font-size:\s*12px;[^}]*font-weight:\s*500;[^}]*letter-spacing:\s*0;/s)
+  assert.doesNotMatch(template, /data-app-vault-mode[^>]*hidden/)
+  assert.doesNotMatch(template, /app-vault-mode-dot/)
+  assert.match(server,
+    /result\.vault_automatic_mode = setting && setting\.mode === "manual"/)
+
+  dom.window.close()
+})

package/test/vault-ui.test.js

@@ -2184,6 +2184,26 @@ describe("Save Space interface", () => {
     dom.window.close()
   })
 
+  test("a fresh app workspace makes Scan this app primary", async () => {
+    const status = fixture([], {
+      last_scan: null,
+      bytes_without_sharing: 0,
+      bytes_on_disk: 0,
+      saved_by_sharing: 0,
+      effective_bytes: 0
+    })
+    const { dom } = await makePage(status, {
+      appMode: true,
+      scopeId: "app:app"
+    })
+    const scanButton = dom.window.document.getElementById("btn-scan")
+
+    assert.match(scanButton.textContent, /Scan this app/)
+    assert.equal(scanButton.classList.contains("primary"), true)
+
+    dom.window.close()
+  })
+
   test("app mode uses full-width results without redundant locations", async () => {
     const status = fixture([item()])
     const { dom, requests } = await makePage(status, {