Release v0.4.18-beta.4

Author: miragecoa

app/backend/db/queries.ts

@@ -266,36 +266,44 @@ function removeOrphanTags(): void {
 /** Removes library records only. Original files on disk are never changed. */
 export function cleanupResources(mode: ResourceCleanupMode): ResourceCleanupResult {
   const db = getDb()
+  const missingResourceIds = getAllResources()
+    .filter(resource => isLocalPath(resource.file_path) && !existsSync(resource.file_path))
+    .map(resource => resource.id)
+  const missingIgnoredPaths = getAllIgnoredPaths()
+    .filter(filePath => isLocalPath(filePath) && !existsSync(filePath))
+
+  const removeMissingResources = () => {
+    if (missingResourceIds.length === 0) return 0
+    const placeholders = missingResourceIds.map(() => '?').join(', ')
+    return db.prepare(`DELETE FROM resources WHERE id IN (${placeholders})`).run(...missingResourceIds).changes
+  }
+  const removeMissingIgnoredPaths = () => {
+    if (missingIgnoredPaths.length === 0) return 0
+    const remove = db.prepare('DELETE FROM ignored_paths WHERE path = ?')
+    for (const filePath of missingIgnoredPaths) remove.run(filePath)
+    return missingIgnoredPaths.length
+  }
 
   if (mode === 'all') {
     return db.transaction(() => {
-      const resources = db.prepare('DELETE FROM resources').run().changes
+      const resources = removeMissingResources()
+      const ignored = removeMissingIgnoredPaths()
       removeOrphanTags()
-      return { resources, ignored: 0 }
+      return { resources, ignored }
     })()
   }
 
   if (mode === 'missing') {
-    const ids = getAllResources()
-      .filter(resource => isLocalPath(resource.file_path) && !existsSync(resource.file_path))
-      .map(resource => resource.id)
-    if (ids.length === 0) return { resources: 0, ignored: 0 }
+    if (missingResourceIds.length === 0) return { resources: 0, ignored: 0 }
     return db.transaction(() => {
-      const placeholders = ids.map(() => '?').join(', ')
-      db.prepare(`DELETE FROM resources WHERE id IN (${placeholders})`).run(...ids)
+      const resources = removeMissingResources()
       removeOrphanTags()
-      return { resources: ids.length, ignored: 0 }
+      return { resources, ignored: 0 }
     })()
   }
 
-  const ignoredPaths = getAllIgnoredPaths()
-    .filter(filePath => isLocalPath(filePath) && !existsSync(filePath))
-  if (ignoredPaths.length === 0) return { resources: 0, ignored: 0 }
-  db.transaction(() => {
-    const remove = db.prepare('DELETE FROM ignored_paths WHERE path = ?')
-    for (const filePath of ignoredPaths) remove.run(filePath)
-  })()
-  return { resources: 0, ignored: ignoredPaths.length }
+  if (missingIgnoredPaths.length === 0) return { resources: 0, ignored: 0 }
+  return { resources: 0, ignored: db.transaction(removeMissingIgnoredPaths)() }
 }
 
 // ── 黑名单目录 ───────────────────────────────────────────

app/frontend/src/App.vue

@@ -82,6 +82,7 @@
       </main>
     </div>
   </div>
+  <ConfirmDialog />
 </template>
 
 <script setup lang="ts">
@@ -97,6 +98,7 @@ import MasonryWindow from './components/MasonryWindow.vue'
 import TipsMarquee from './components/TipsMarquee.vue'
 import { useTips } from './composables/useTips'
 import DropImportWindow from './components/DropImportWindow.vue'
+import ConfirmDialog from './components/ConfirmDialog.vue'
 
 const windowParam = new URLSearchParams(window.location.search).get('window')
 const isMasonryWindow = windowParam === 'masonry'

app/frontend/src/components/ConfirmDialog.vue

@@ -0,0 +1,82 @@
+<template>
+  <Teleport to="body">
+    <Transition name="confirm-fade">
+      <div v-if="pendingConfirm" class="confirm-overlay" @mousedown.self="settleConfirm(false)">
+        <section class="confirm-dialog" role="alertdialog" aria-modal="true" :aria-labelledby="titleId" @keydown.esc.prevent="settleConfirm(false)">
+          <div class="confirm-icon" :class="{ danger: pendingConfirm.danger }" aria-hidden="true">
+            <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M12 9v4"/><path d="M12 17h.01"/><path d="m10.3 3.6-8 14A2 2 0 0 0 4 20.5h16a2 2 0 0 0 1.7-3l-8-14a2 2 0 0 0-3.4 0Z"/></svg>
+          </div>
+          <div class="confirm-copy">
+            <h2 :id="titleId">{{ pendingConfirm.title }}</h2>
+            <p>{{ pendingConfirm.message }}</p>
+          </div>
+          <div class="confirm-actions">
+            <button ref="cancelButton" class="confirm-button secondary" @click="settleConfirm(false)">{{ pendingConfirm.cancelText }}</button>
+            <button class="confirm-button" :class="{ danger: pendingConfirm.danger }" @click="settleConfirm(true)">{{ pendingConfirm.confirmText }}</button>
+          </div>
+        </section>
+      </div>
+    </Transition>
+  </Teleport>
+</template>
+
+<script setup lang="ts">
+import { nextTick, ref, watch } from 'vue'
+import { pendingConfirm, settleConfirm } from '../utils/confirm-dialog'
+
+const cancelButton = ref<HTMLButtonElement | null>(null)
+const titleId = 'app-confirm-dialog-title'
+
+watch(pendingConfirm, async (pending) => {
+  if (!pending) return
+  await nextTick()
+  cancelButton.value?.focus()
+})
+</script>
+
+<style scoped>
+.confirm-overlay {
+  position: fixed;
+  inset: 0;
+  z-index: 3000;
+  display: grid;
+  place-items: center;
+  padding: 24px;
+  background: rgba(5, 5, 16, 0.68);
+  backdrop-filter: blur(4px);
+}
+.confirm-dialog {
+  width: min(100%, 390px);
+  padding: 20px;
+  background: var(--surface-2);
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  box-shadow: 0 20px 48px rgba(0, 0, 0, 0.4);
+  outline: none;
+}
+.confirm-icon {
+  display: grid;
+  width: 32px;
+  height: 32px;
+  place-items: center;
+  border: 1px solid color-mix(in srgb, var(--accent) 48%, transparent);
+  border-radius: 7px;
+  color: var(--accent);
+  background: color-mix(in srgb, var(--accent) 12%, transparent);
+}
+.confirm-icon.danger { color: var(--danger, #ef5350); border-color: color-mix(in srgb, var(--danger, #ef5350) 48%, transparent); background: color-mix(in srgb, var(--danger, #ef5350) 12%, transparent); }
+.confirm-icon svg { width: 17px; height: 17px; }
+.confirm-copy { margin-top: 13px; }
+.confirm-copy h2 { margin: 0; color: var(--text); font-size: 16px; font-weight: 650; }
+.confirm-copy p { margin: 7px 0 0; color: var(--text-2); font-size: 13px; line-height: 1.55; white-space: pre-wrap; }
+.confirm-actions { display: flex; justify-content: flex-end; gap: 8px; margin-top: 20px; }
+.confirm-button { min-width: 76px; padding: 7px 13px; border: 1px solid var(--accent); border-radius: 6px; background: var(--accent); color: #fff; font: inherit; font-size: 13px; cursor: pointer; }
+.confirm-button:hover { filter: brightness(1.08); }
+.confirm-button.secondary { border-color: var(--border); background: var(--surface-3); color: var(--text-2); }
+.confirm-button.secondary:hover { color: var(--text); }
+.confirm-button.danger { border-color: var(--danger, #ef5350); background: var(--danger, #ef5350); }
+.confirm-fade-enter-active, .confirm-fade-leave-active { transition: opacity .14s ease; }
+.confirm-fade-enter-active .confirm-dialog, .confirm-fade-leave-active .confirm-dialog { transition: transform .14s ease; }
+.confirm-fade-enter-from, .confirm-fade-leave-to { opacity: 0; }
+.confirm-fade-enter-from .confirm-dialog, .confirm-fade-leave-to .confirm-dialog { transform: translateY(5px) scale(.985); }
+</style>

app/frontend/src/i18n/locales/en.ts

@@ -251,14 +251,15 @@ export default {
     scanHistory: 'Scan disk',
     scanHistoryTitle: 'Scan disk files / read usage history to batch import',
     cleanup: 'Clean up',
-    cleanupTitle: 'Clean up library records',
-    cleanupAll: 'Clear all',
-    cleanupAllDesc: 'Clear every resource record from the library',
+    confirmTitle: 'Confirm action',
+    cleanupTitle: 'Clean up stale entries',
+    cleanupAll: 'Clean up all',
+    cleanupAllDesc: 'Clean up missing resources and ignored paths',
     cleanupMissing: 'Clear missing resources',
     cleanupMissingDesc: 'Only clear records whose original file is missing',
     cleanupIgnoredMissing: 'Clear missing ignored entries',
     cleanupIgnoredMissingDesc: 'Remove missing paths from the ignored list',
-    cleanupConfirmAll: 'Clear every resource record from the library? Original files on your computer will not be deleted.',
+    cleanupConfirmAll: 'Clean up all missing resources and ignored paths? Original files on your computer will not be deleted.',
     cleanupConfirmMissing: 'Clear all missing resource records? Original files on your computer will not be deleted.',
     cleanupConfirmIgnoredMissing: 'Clear all missing paths from the ignored list?',
     cleanupDone: 'Cleaned {n} items',

app/frontend/src/i18n/locales/zh.ts

@@ -251,14 +251,15 @@ export default {
     scanHistory: '扫描硬盘',
     scanHistoryTitle: '扫描硬盘文件 / 读取使用历史，批量导入资源',
     cleanup: '清理',
-    cleanupTitle: '清理资源库记录',
-    cleanupAll: '全部清理',
-    cleanupAllDesc: '清除资源库中的全部资源记录',
+    confirmTitle: '确认操作',
+    cleanupTitle: '清理失效内容',
+    cleanupAll: '一键清理',
+    cleanupAllDesc: '清理已失效资源和已失效忽略路径',
     cleanupMissing: '清理已失效资源',
     cleanupMissingDesc: '只清除找不到原文件的资源记录',
     cleanupIgnoredMissing: '清理失效的已忽略内容',
     cleanupIgnoredMissingDesc: '从忽略列表移除已不存在的路径',
-    cleanupConfirmAll: '清除资源库中的全部资源记录？电脑中的原文件不会被删除。',
+    cleanupConfirmAll: '清理全部失效资源和失效忽略路径？电脑中的原文件不会被删除。',
     cleanupConfirmMissing: '清除所有已失效资源记录？电脑中的原文件不会被删除。',
     cleanupConfirmIgnoredMissing: '从忽略列表清除所有已失效路径？',
     cleanupDone: '已清理 {n} 项',

app/frontend/src/pages/LibraryPage.vue

@@ -206,9 +206,7 @@
           </button>
           <div class="cleanup-wrap">
             <button class="scan-sys-toolbar-btn cleanup-trigger" @click="showCleanupMenu = !showCleanupMenu" :title="t('library.cleanupTitle')">
-              <span class="btn-icon" v-html="deleteSvg" />
-              <span class="btn-text">{{ t('library.cleanup') }}</span>
-              <svg width="9" height="9" viewBox="0 0 10 10" fill="none" aria-hidden="true"><path d="M2 3.5 5 6.5 8 3.5" stroke="currentColor" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/></svg>
+              <span class="btn-icon" v-html="cleanupSvg" />
             </button>
             <div v-if="showCleanupMenu" class="cleanup-menu">
               <button class="cleanup-menu-item cleanup-menu-item--danger" :disabled="cleanupBusy" @click="runCleanup('all')">
@@ -1822,6 +1820,7 @@ import DropImportModal from '../components/DropImportModal.vue'
 import type { DropItem } from '../components/DropImportModal.vue'
 import ResourceDetailPanel from '../components/ResourceDetailPanel.vue'
 import { match as pinyinMatch } from 'pinyin-pro'
+import { showConfirm } from '../utils/confirm-dialog'
 
 const { t, locale } = useI18n()
 const store = useResourceStore()
@@ -4187,6 +4186,7 @@ const typeSvg         = `<svg viewBox="0 0 24 24" fill="none" stroke="currentCol
 const pathSvg         = `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><path d="M7 10l5 5 5-5"/><path d="M12 15V3"/></svg>`
 const ignoreSvg       = `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8"><circle cx="12" cy="12" r="10"/><line x1="4.93" y1="4.93" x2="19.07" y2="19.07"/></svg>`
 const deleteSvg       = `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/></svg>`
+const cleanupSvg      = `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="m9 11 6-6"/><path d="m5 21 3-3"/><path d="m14 4 3 3"/><path d="m3 7 7 7"/><path d="M5 21h8a3 3 0 0 0 3-3v-5"/></svg>`
 const arrowSvg        = `<svg viewBox="0 0 24 24" width="20" height="20" fill="none" stroke="currentColor" stroke-width="2"><path d="M5 12h14"/><path d="M13 6l6 6-6 6"/></svg>`
 const aiSvg           = `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8"><path d="M12 2l2.4 7.2H22l-6 4.8 2.4 7.2L12 16.4l-6.4 4.8 2.4-7.2-6-4.8h7.6z"/></svg>`
 const scanSysSvg      = `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg>`
@@ -4209,7 +4209,14 @@ async function runCleanup(mode: CleanupMode) {
     missing: 'library.cleanupConfirmMissing',
     ignoredMissing: 'library.cleanupConfirmIgnoredMissing',
   }
-  if (!window.confirm(t(confirmKey[mode]))) return
+  showCleanupMenu.value = false
+  if (!await showConfirm({
+    title: t('library.confirmTitle'),
+    message: t(confirmKey[mode]),
+    confirmText: t('library.confirmBtn'),
+    cancelText: t('library.cancelBtn'),
+    danger: true,
+  })) return
 
   cleanupBusy.value = true
   cleanupNotice.value = ''
@@ -4780,8 +4787,14 @@ async function openLocalNote(resource: Resource, touchUsage = true) {
   noteSurfaceRef.value?.focus()
 }
 
-function closeNoteEditor() {
-  if (noteEditor.dirty && !confirm(t('library.documents.discardConfirm'))) return
+async function closeNoteEditor() {
+  if (noteEditor.dirty && !await showConfirm({
+    title: t('library.confirmTitle'),
+    message: t('library.documents.discardConfirm'),
+    confirmText: t('library.confirmBtn'),
+    cancelText: t('library.cancelBtn'),
+    danger: true,
+  })) return
   noteEditor.show = false
   noteEditor.resource = null
   noteEditor.blocks = []
@@ -5425,7 +5438,7 @@ async function deleteIgnored(filePath: string) {
 .scan-sys-toolbar-btn .btn-icon { width: 16px; height: 16px; }
 
 .cleanup-wrap { position: relative; }
-.cleanup-trigger { gap: 4px; }
+.cleanup-trigger { width: 30px; justify-content: center; padding: 5px; }
 .cleanup-menu {
   position: absolute;
   z-index: 120;

app/frontend/src/pages/SettingsPage.vue

@@ -634,6 +634,7 @@
 <script setup lang="ts">
 import { ref, computed, nextTick, onMounted, onUnmounted, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
+import { showConfirm } from '../utils/confirm-dialog'
 import { useSettingsStore, DARK_THEME, COLOR_PALETTES } from '../stores/settings'
 import type { PaletteId, BrightnessMode } from '../stores/settings'
 
@@ -910,7 +911,13 @@ async function onCreateProfile() {
 async function onDeleteProfile() {
   if (activeProfileId.value === 'default' || profiles.value.length <= 1) return
   const current = profiles.value.find(p => p.id === activeProfileId.value)
-  if (!confirm(t('settings.data.deleteConfirm', { name: current?.name }))) return
+  if (!await showConfirm({
+    title: t('library.confirmTitle'),
+    message: t('settings.data.deleteConfirm', { name: current?.name }),
+    confirmText: t('library.confirmBtn'),
+    cancelText: t('library.cancelBtn'),
+    danger: true,
+  })) return
   await window.api.profiles.delete(activeProfileId.value)
   // 切换到第一个剩余配置
   const remaining = profiles.value.filter(p => p.id !== activeProfileId.value)

app/frontend/src/utils/confirm-dialog.ts

@@ -0,0 +1,29 @@
+import { ref } from 'vue'
+
+export interface ConfirmDialogOptions {
+  title: string
+  message: string
+  confirmText: string
+  cancelText: string
+  danger?: boolean
+}
+
+interface PendingConfirm extends ConfirmDialogOptions {
+  resolve: (accepted: boolean) => void
+}
+
+export const pendingConfirm = ref<PendingConfirm | null>(null)
+
+export function showConfirm(options: ConfirmDialogOptions): Promise<boolean> {
+  if (pendingConfirm.value) pendingConfirm.value.resolve(false)
+  return new Promise(resolve => {
+    pendingConfirm.value = { ...options, resolve }
+  })
+}
+
+export function settleConfirm(accepted: boolean): void {
+  const pending = pendingConfirm.value
+  if (!pending) return
+  pendingConfirm.value = null
+  pending.resolve(accepted)
+}

app/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-cubby",
-  "version": "0.4.18-beta.3",
+  "version": "0.4.18-beta.4",
   "description": "AI小抽屉 - 本地资源自动入库与AI标签",
   "main": "out/main/main.js",
   "scripts": {