Release v0.4.20-beta.4

Author: miragecoa

app/backend/ipc/index.ts

@@ -1072,17 +1072,6 @@ export function registerIpcHandlers(): void {
     return result.canceled ? null : result.filePaths[0]
   })
 
-  // 同一个选择框允许选择单个文件或文件夹，前端据此自动使用正确资源类型。
-  ipcMain.handle('files:pickFileOrFolder', async () => {
-    const result = await dialog.showOpenDialog({
-      title: '选择文件或文件夹',
-      properties: ['openFile', 'openDirectory'],
-    })
-    if (result.canceled || !result.filePaths[0]) return null
-    const filePath = result.filePaths[0]
-    return { path: filePath, isDirectory: statSync(filePath).isDirectory() }
-  })
-
   // 打开图片文件选择对话框（用于设置自定义封面）
   ipcMain.handle('files:pickImage', async () => {
     const result = await dialog.showOpenDialog({

app/backend/preload.ts

@@ -116,7 +116,6 @@ contextBridge.exposeInMainWorld('api', {
     getAppIcon: (filePath: string, force?: boolean): Promise<string | null> => ipcRenderer.invoke('files:getAppIcon', filePath, force),
     saveCover: (resourceId: string, dataUrl: string, userPicked?: boolean): Promise<string | null> => ipcRenderer.invoke('files:saveCover', resourceId, dataUrl, userPicked),
     pickFile: (): Promise<string | null> => ipcRenderer.invoke('files:pickFile'),
-    pickFileOrFolder: (): Promise<{ path: string; isDirectory: boolean } | null> => ipcRenderer.invoke('files:pickFileOrFolder'),
     pickImage: (): Promise<string | null> => ipcRenderer.invoke('files:pickImage'),
     pickFolder: (): Promise<string | null> => ipcRenderer.invoke('files:pickFolder'),
     pickMultipleFiles: (): Promise<string[] | null> => ipcRenderer.invoke('files:pickMultipleFiles'),

app/frontend/src/components/AddResourceModal.vue

@@ -144,7 +144,7 @@
               <div
                 class="drop-zone"
                 :class="{ 'has-file': !!form.file_path, 'drag-over': isDragOver }"
-                @click="pickFileOrFolder"
+                @click="pickFile"
                 @dragover.prevent="isDragOver = true"
                 @dragleave.prevent="isDragOver = false"
                 @drop.prevent="onDrop"
@@ -167,6 +167,14 @@
                   <span class="dz-upload-icon" v-html="uploadIcon" />
                   <span class="dz-text">{{ t('addModal.file.dragHint') }}</span>
                   <span class="dz-hint">{{ t('addModal.file.orBrowse') }}</span>
+                  <div class="file-choice-actions" @click.stop>
+                    <button type="button" class="file-choice-btn" @click="pickFile">
+                      <span v-html="uploadIcon" />{{ t('addModal.file.chooseFile') }}
+                    </button>
+                    <button type="button" class="file-choice-btn" @click="pickFolder">
+                      <span v-html="folderIcon" />{{ t('addModal.file.chooseFolder') }}
+                    </button>
+                  </div>
                 </template>
               </div>
               <div class="path-row">
@@ -176,7 +184,7 @@
                   :placeholder="t('addModal.file.placeholder')"
                   @change="onPathChange"
                 />
-                <button class="browse-btn" @click.stop="pickFileOrFolder" v-html="folderIcon" :title="t('addModal.file.browse')" />
+                <button class="browse-btn" @click.stop="pickFile" v-html="folderIcon" :title="t('addModal.file.browse')" />
               </div>
             </div>
 
@@ -614,9 +622,14 @@ async function createDocument() {
 }
 
 // ── 单个文件操作 ────────────────────────────────────────
-async function pickFileOrFolder() {
-  const selection = await window.api.files.pickFileOrFolder()
-  if (selection) applyPathSelection(selection.path, selection.isDirectory)
+async function pickFile() {
+  const path = await window.api.files.pickFile()
+  if (path) applyPathSelection(path, false)
+}
+
+async function pickFolder() {
+  const path = await window.api.files.pickFolder()
+  if (path) applyPathSelection(path, true)
 }
 
 function onDrop(e: DragEvent) {
@@ -721,7 +734,6 @@ async function submitWebpage() {
   }
 }
 
-// ── 文件夹操作 ──────────────────────────────────────────
 // ── 扫描目录操作 ────────────────────────────────────────
 async function pickScanDir() {
   const path = await window.api.files.pickFolder()
@@ -1111,6 +1123,11 @@ const scanDirIcon   = `<svg viewBox="0 0 24 24" fill="none" stroke="currentColor
   color: var(--text-3);
 }
 
+.file-choice-actions { display: flex; gap: 8px; margin-top: 4px; }
+.file-choice-btn { display: inline-flex; align-items: center; gap: 5px; padding: 6px 9px; border: 1px solid var(--border); border-radius: 5px; background: var(--surface-2); color: var(--text-2); font: inherit; font-size: 12px; cursor: pointer; }
+.file-choice-btn:hover { border-color: var(--accent); color: var(--text); }
+.file-choice-btn :deep(svg) { width: 14px; height: 14px; }
+
 .spinner {
   width: 24px;
   height: 24px;

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

@@ -739,6 +739,8 @@ export default {
       or: 'or',
       orBrowse: 'or click to browse',
       dragHint: 'Drag a file or folder here',
+      chooseFile: 'Choose file',
+      chooseFolder: 'Choose folder',
       titlePlaceholder: 'Resource name...',
       notePlaceholder: 'Optional note...',
       descLabel: 'Description',

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

@@ -739,6 +739,8 @@ export default {
       or: '或',
       orBrowse: '或点击浏览',
       dragHint: '拖入文件或文件夹到此处',
+      chooseFile: '选择文件',
+      chooseFolder: '选择文件夹',
       titlePlaceholder: '资源名称...',
       notePlaceholder: '可选的备注描述...',
       descLabel: '描述',

app/frontend/src/types/api.d.ts

@@ -67,7 +67,6 @@ declare global {
         getAppIcon: (filePath: string) => Promise<string | null>
         saveCover: (resourceId: string, dataUrl: string, userPicked?: boolean) => Promise<string | null>
         pickFile: () => Promise<string | null>
-        pickFileOrFolder: () => Promise<{ path: string; isDirectory: boolean } | null>
         pickImage: () => Promise<string | null>
         pickFolder: () => Promise<string | null>
         pickMultipleFiles: () => Promise<string[] | null>

app/package-lock.json

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

app/package.json

@@ -409,13 +409,12 @@ test('document category can create managed notes and profile documents', () => {
   assert.match(addModal, /class="document-create-body"/)
   assert.match(addModal, /window\.api\.documents\.create/)
   assert.match(addModal, /emit\('document-created'/)
-  assert.match(ipc, /ipcMain\.handle\('files:pickFileOrFolder'/)
-  assert.match(ipc, /properties: \['openFile', 'openDirectory'\]/)
-  assert.match(preload, /pickFileOrFolder: \(\): Promise<\{ path: string; isDirectory: boolean \} \| null>/)
-  assert.match(apiTypes, /pickFileOrFolder: \(\) => Promise<\{ path: string; isDirectory: boolean \} \| null>/)
   assert.match(addModal, /key: 'file' as const,\s+label: t\('addModal\.tabs\.fileOrFolder'\)/)
-  assert.match(addModal, /window\.api\.files\.pickFileOrFolder\(\)/)
-  assert.match(addModal, /applyPathSelection\(selection\.path, selection\.isDirectory\)/)
+  assert.match(addModal, /window\.api\.files\.pickFile\(\)/)
+  assert.match(addModal, /window\.api\.files\.pickFolder\(\)/)
+  assert.match(addModal, /applyPathSelection\(path, false\)/)
+  assert.match(addModal, /applyPathSelection\(path, true\)/)
+  assert.doesNotMatch(ipc, /files:pickFileOrFolder/)
   assert.doesNotMatch(addModal, /key: 'folder' as const/)
   assert.doesNotMatch(addModal, /key: 'scan-sys' as const/)
   assert.doesNotMatch(addModal, /doSystemScan/)