fix import button bug and prevent backup overwriting during import #1024
Conversation
|
Note Other AI code review bot(s) detectedCodeRabbit has detected other AI code review bot(s) in this pull request and will avoid duplicating their findings in the review comments. This may lead to a less comprehensive review. WalkthroughAdds conversation counting to the import flow: importFromSync now cancels pending backup timers, queries the backup DB or DataImporter to compute an imported count, returns that count, and the renderer passes it to i18n messages. Several locale strings and related types/store were updated to include count. Changes
Sequence Diagram(s)sequenceDiagram
participant Renderer as Renderer (UI)
participant Presenter as SyncPresenter
participant BackupDB as Backup DB (read-only)
participant Importer as DataImporter
participant Store as SyncStore
Note over Renderer,Presenter: User triggers import dialog → confirms import
Renderer->>Presenter: importFromSync(importMode)
Presenter->>Presenter: cancelPendingBackupTimer()
alt importMode == OVERWRITE
Presenter->>BackupDB: open read-only DB, count conversations
BackupDB-->>Presenter: totalInBackup
Presenter-->>Renderer: { success, message, count: totalInBackup }
else importMode == INCREMENT
Presenter->>Importer: perform import
Importer-->>Presenter: { success, message, importedCount }
Presenter-->>Renderer: { success, message, count: importedCount }
end
Renderer->>Store: set importResult (includes count)
Renderer->>Renderer: display t(sync.import.success, { count })
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Poem
Pre-merge checks and finishing touches✅ Passed checks (3 passed)
✨ Finishing touches
🧪 Generate unit tests (beta)
📜 Recent review detailsConfiguration used: CodeRabbit UI Review profile: CHILL Plan: Pro 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
|
@codex review |
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (4)
src/renderer/src/i18n/fr-FR/sync.json (1)
3-3: Translation works correctly; consider vue-i18n pluralization for polish.The message properly includes the
{count}placeholder and will function correctly. The "(s)" notation is a simplified approach to pluralization.For enhanced i18n support, consider using vue-i18n's pluralization features:
- "importComplete": "{count} conversation(s) importée(s) avec succès. Cliquez sur OK pour redémarrer l'application." + "importComplete": "{count} conversation importée avec succès. | {count} conversations importées avec succès. Cliquez sur OK pour redémarrer l'application."The pipe
|syntax enables proper singular/plural handling based on count.src/renderer/src/i18n/en-US/sync.json (1)
3-3: Translation works correctly; consider vue-i18n pluralization for polish.The message properly includes the
{count}placeholder and will function correctly. The "(s)" notation is a simplified approach to pluralization.For enhanced i18n support, consider using vue-i18n's pluralization features:
- "importComplete": "Successfully imported {count} conversation(s). The application will now restart." + "importComplete": "Successfully imported {count} conversation. | Successfully imported {count} conversations. The application will now restart."The pipe
|syntax enables proper singular/plural handling (e.g., "1 conversation" vs "2 conversations").src/renderer/src/i18n/pt-BR/sync.json (1)
3-3: Consider using vue-i18n pluralization syntax instead of "(s)" notation.The current translation uses "(s)" as a workaround for singular/plural forms. Vue-i18n supports proper pluralization using pipe syntax. For Portuguese, consider:
"importComplete": "nenhuma conversa importada | {count} conversa importada com sucesso | {count} conversas importadas com sucesso. O aplicativo será reiniciado agora."This provides better localization with proper singular (1), exact zero (0), and plural (2+) forms.
src/renderer/src/i18n/ru-RU/sync.json (1)
3-3: Russian pluralization requires three forms for proper grammar.Russian has complex pluralization rules:
- 1, 21, 31, etc.: "диалог" (nominative singular)
- 2-4, 22-24, etc.: "диалога" (genitive singular)
- 0, 5-20, 25-30, etc.: "диалогов" (genitive plural)
Consider using vue-i18n pluralization:
"importComplete": "{count} диалог успешно импортирован | {count} диалога успешно импортировано | {count} диалогов успешно импортировано. Нажмите OK для перезапуска приложения."
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (14)
src/main/presenter/syncPresenter/index.ts(4 hunks)src/renderer/settings/components/DataSettings.vue(2 hunks)src/renderer/src/i18n/en-US/sync.json(1 hunks)src/renderer/src/i18n/fa-IR/sync.json(1 hunks)src/renderer/src/i18n/fr-FR/sync.json(1 hunks)src/renderer/src/i18n/ja-JP/sync.json(1 hunks)src/renderer/src/i18n/ko-KR/sync.json(1 hunks)src/renderer/src/i18n/pt-BR/sync.json(1 hunks)src/renderer/src/i18n/ru-RU/sync.json(1 hunks)src/renderer/src/i18n/zh-CN/sync.json(1 hunks)src/renderer/src/i18n/zh-HK/sync.json(1 hunks)src/renderer/src/i18n/zh-TW/sync.json(1 hunks)src/renderer/src/stores/sync.ts(1 hunks)src/shared/types/presenters/legacy.presenters.d.ts(1 hunks)
🧰 Additional context used
📓 Path-based instructions (24)
**/*.{js,jsx,ts,tsx}
📄 CodeRabbit inference engine (.cursor/rules/development-setup.mdc)
**/*.{js,jsx,ts,tsx}: 使用 OxLint 进行代码检查
Log和注释使用英文书写
Files:
src/renderer/src/stores/sync.tssrc/shared/types/presenters/legacy.presenters.d.tssrc/main/presenter/syncPresenter/index.ts
src/{main,renderer}/**/*.ts
📄 CodeRabbit inference engine (.cursor/rules/electron-best-practices.mdc)
src/{main,renderer}/**/*.ts: Use context isolation for improved security
Implement proper inter-process communication (IPC) patterns
Optimize application startup time with lazy loading
Implement proper error handling and logging for debugging
Files:
src/renderer/src/stores/sync.tssrc/main/presenter/syncPresenter/index.ts
**/*.{ts,tsx}
📄 CodeRabbit inference engine (.cursor/rules/error-logging.mdc)
**/*.{ts,tsx}: 始终使用 try-catch 处理可能的错误
提供有意义的错误信息
记录详细的错误日志
优雅降级处理
日志应包含时间戳、日志级别、错误代码、错误描述、堆栈跟踪（如适用）、相关上下文信息
日志级别应包括 ERROR、WARN、INFO、DEBUG
不要吞掉错误
提供用户友好的错误信息
实现错误重试机制
避免记录敏感信息
使用结构化日志
设置适当的日志级别
Files:
src/renderer/src/stores/sync.tssrc/shared/types/presenters/legacy.presenters.d.tssrc/main/presenter/syncPresenter/index.ts
src/renderer/src/**/*
📄 CodeRabbit inference engine (.cursor/rules/i18n.mdc)
src/renderer/src/**/*: All user-facing strings must use i18n keys (avoid hardcoded user-visible text in code)
Use the 'vue-i18n' framework for all internationalization in the renderer
Ensure all user-visible text in the renderer uses the translation system
Files:
src/renderer/src/stores/sync.tssrc/renderer/src/i18n/zh-HK/sync.jsonsrc/renderer/src/i18n/ja-JP/sync.jsonsrc/renderer/src/i18n/fa-IR/sync.jsonsrc/renderer/src/i18n/ko-KR/sync.jsonsrc/renderer/src/i18n/zh-TW/sync.jsonsrc/renderer/src/i18n/pt-BR/sync.jsonsrc/renderer/src/i18n/en-US/sync.jsonsrc/renderer/src/i18n/zh-CN/sync.jsonsrc/renderer/src/i18n/ru-RU/sync.jsonsrc/renderer/src/i18n/fr-FR/sync.json
src/renderer/src/stores/**/*.{vue,ts,tsx,js,jsx}
📄 CodeRabbit inference engine (.cursor/rules/pinia-best-practices.mdc)
src/renderer/src/stores/**/*.{vue,ts,tsx,js,jsx}: Use modules to organize related state and actions
Implement proper state persistence for maintaining data across sessions
Use getters for computed state properties
Utilize actions for side effects and asynchronous operations
Keep the store focused on global state, not component-specific data
Files:
src/renderer/src/stores/sync.ts
src/renderer/**/*.{vue,ts,js,tsx,jsx}
📄 CodeRabbit inference engine (.cursor/rules/project-structure.mdc)
渲染进程代码放在
src/renderer
Files:
src/renderer/src/stores/sync.tssrc/renderer/settings/components/DataSettings.vue
src/renderer/src/**/*.{vue,ts,tsx,js,jsx}
📄 CodeRabbit inference engine (.cursor/rules/vue-best-practices.mdc)
src/renderer/src/**/*.{vue,ts,tsx,js,jsx}: Use the Composition API for better code organization and reusability
Implement proper state management with Pinia
Utilize Vue Router for navigation and route management
Leverage Vue's built-in reactivity system for efficient data handling
Files:
src/renderer/src/stores/sync.ts
src/renderer/**/*.{ts,tsx,vue}
📄 CodeRabbit inference engine (.cursor/rules/vue-shadcn.mdc)
src/renderer/**/*.{ts,tsx,vue}: Use descriptive variable names with auxiliary verbs (e.g., isLoading, hasError).
Use TypeScript for all code; prefer types over interfaces.
Avoid enums; use const objects instead.
Use arrow functions for methods and computed properties.
Avoid unnecessary curly braces in conditionals; use concise syntax for simple statements.
Files:
src/renderer/src/stores/sync.tssrc/renderer/settings/components/DataSettings.vue
src/renderer/**/*.{vue,ts}
📄 CodeRabbit inference engine (.cursor/rules/vue-shadcn.mdc)
Implement lazy loading for routes and components.
Files:
src/renderer/src/stores/sync.tssrc/renderer/settings/components/DataSettings.vue
src/renderer/**/*.{ts,vue}
📄 CodeRabbit inference engine (.cursor/rules/vue-shadcn.mdc)
src/renderer/**/*.{ts,vue}: Use useFetch and useAsyncData for data fetching.
Implement SEO best practices using Nuxt's useHead and useSeoMeta.Use Pinia for frontend state management (do not introduce alternative state libraries)
Files:
src/renderer/src/stores/sync.tssrc/renderer/settings/components/DataSettings.vue
**/*.{ts,tsx,js,vue}
📄 CodeRabbit inference engine (CLAUDE.md)
Use English for all logs and comments
Files:
src/renderer/src/stores/sync.tssrc/shared/types/presenters/legacy.presenters.d.tssrc/main/presenter/syncPresenter/index.tssrc/renderer/settings/components/DataSettings.vue
**/*.{ts,tsx,vue}
📄 CodeRabbit inference engine (CLAUDE.md)
Enable and adhere to strict TypeScript typing (avoid implicit any, prefer precise types)
Use PascalCase for TypeScript types and classes
Files:
src/renderer/src/stores/sync.tssrc/shared/types/presenters/legacy.presenters.d.tssrc/main/presenter/syncPresenter/index.tssrc/renderer/settings/components/DataSettings.vue
src/renderer/src/**
📄 CodeRabbit inference engine (AGENTS.md)
Place Vue 3 app source under src/renderer/src (components, stores, views, i18n, lib)
Files:
src/renderer/src/stores/sync.tssrc/renderer/src/i18n/zh-HK/sync.jsonsrc/renderer/src/i18n/ja-JP/sync.jsonsrc/renderer/src/i18n/fa-IR/sync.jsonsrc/renderer/src/i18n/ko-KR/sync.jsonsrc/renderer/src/i18n/zh-TW/sync.jsonsrc/renderer/src/i18n/pt-BR/sync.jsonsrc/renderer/src/i18n/en-US/sync.jsonsrc/renderer/src/i18n/zh-CN/sync.jsonsrc/renderer/src/i18n/ru-RU/sync.jsonsrc/renderer/src/i18n/fr-FR/sync.json
src/renderer/src/**/*.{vue,ts}
📄 CodeRabbit inference engine (AGENTS.md)
All user-facing strings must use vue-i18n ($t/keys) rather than hardcoded literals
Files:
src/renderer/src/stores/sync.ts
**/*.{ts,tsx,js,jsx,vue,css,scss,md,json,yml,yaml}
📄 CodeRabbit inference engine (AGENTS.md)
Prettier style: single quotes, no semicolons, print width 100; run pnpm run format
Files:
src/renderer/src/stores/sync.tssrc/shared/types/presenters/legacy.presenters.d.tssrc/renderer/src/i18n/zh-HK/sync.jsonsrc/renderer/src/i18n/ja-JP/sync.jsonsrc/renderer/src/i18n/fa-IR/sync.jsonsrc/renderer/src/i18n/ko-KR/sync.jsonsrc/renderer/src/i18n/zh-TW/sync.jsonsrc/renderer/src/i18n/pt-BR/sync.jsonsrc/renderer/src/i18n/en-US/sync.jsonsrc/main/presenter/syncPresenter/index.tssrc/renderer/src/i18n/zh-CN/sync.jsonsrc/renderer/src/i18n/ru-RU/sync.jsonsrc/renderer/settings/components/DataSettings.vuesrc/renderer/src/i18n/fr-FR/sync.json
**/*.{ts,tsx,js,jsx,vue}
📄 CodeRabbit inference engine (AGENTS.md)
**/*.{ts,tsx,js,jsx,vue}: Use OxLint for JS/TS code; keep lint clean
Use camelCase for variables and functions
Use SCREAMING_SNAKE_CASE for constants
Files:
src/renderer/src/stores/sync.tssrc/shared/types/presenters/legacy.presenters.d.tssrc/main/presenter/syncPresenter/index.tssrc/renderer/settings/components/DataSettings.vue
src/shared/**/*.{ts,tsx,d.ts}
📄 CodeRabbit inference engine (.cursor/rules/project-structure.mdc)
共享类型定义放在
shared目录
Files:
src/shared/types/presenters/legacy.presenters.d.ts
src/shared/**/*.ts
📄 CodeRabbit inference engine (CLAUDE.md)
Place shared types, utilities, constants, and IPC contract definitions under src/shared/
Files:
src/shared/types/presenters/legacy.presenters.d.ts
src/shared/**
📄 CodeRabbit inference engine (AGENTS.md)
Put shared TypeScript types and utilities under src/shared
Files:
src/shared/types/presenters/legacy.presenters.d.ts
src/renderer/src/i18n/**/*.{ts,json,yml,yaml}
📄 CodeRabbit inference engine (AGENTS.md)
Store i18n resources under src/renderer/src/i18n
Files:
src/renderer/src/i18n/zh-HK/sync.jsonsrc/renderer/src/i18n/ja-JP/sync.jsonsrc/renderer/src/i18n/fa-IR/sync.jsonsrc/renderer/src/i18n/ko-KR/sync.jsonsrc/renderer/src/i18n/zh-TW/sync.jsonsrc/renderer/src/i18n/pt-BR/sync.jsonsrc/renderer/src/i18n/en-US/sync.jsonsrc/renderer/src/i18n/zh-CN/sync.jsonsrc/renderer/src/i18n/ru-RU/sync.jsonsrc/renderer/src/i18n/fr-FR/sync.json
src/main/**/*.ts
📄 CodeRabbit inference engine (.cursor/rules/electron-best-practices.mdc)
Use Electron's built-in APIs for file system and native dialogs
Files:
src/main/presenter/syncPresenter/index.ts
src/main/**/*.{ts,js,tsx,jsx}
📄 CodeRabbit inference engine (.cursor/rules/project-structure.mdc)
主进程代码放在
src/main
Files:
src/main/presenter/syncPresenter/index.ts
src/main/presenter/**/*.ts
📄 CodeRabbit inference engine (AGENTS.md)
Place Electron main-process presenters under src/main/presenter/ (Window, Tab, Thread, Mcp, Config, LLMProvider)
Files:
src/main/presenter/syncPresenter/index.ts
src/renderer/**/*.vue
📄 CodeRabbit inference engine (AGENTS.md)
Name Vue component files in PascalCase (e.g., ChatInput.vue)
Files:
src/renderer/settings/components/DataSettings.vue
🧬 Code graph analysis (1)
src/main/presenter/syncPresenter/index.ts (1)
src/main/presenter/sqlitePresenter/importData.ts (1)
DataImporter(9-452)
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (1)
- GitHub Check: build-check (x64)
🔇 Additional comments (14)
src/renderer/src/i18n/zh-HK/sync.json (1)
3-3: LGTM! Translation correctly includes count placeholder.The success message properly incorporates the
{count}placeholder for displaying the number of imported conversations. The Traditional Chinese translation is grammatically correct and uses the appropriate counter word "個".src/renderer/src/i18n/zh-TW/sync.json (1)
3-3: LGTM! Translation correctly includes count placeholder.The success message properly incorporates the
{count}placeholder. The Taiwan Traditional Chinese translation is accurate and uses regionally appropriate terminology ("匯入" for import, "應用程式" for application).src/renderer/src/i18n/ja-JP/sync.json (1)
3-3: LGTM! Translation correctly includes count placeholder.The success message properly incorporates the
{count}placeholder. The Japanese translation uses the appropriate counter word "件" for conversations and follows natural Japanese sentence structure.src/renderer/src/i18n/zh-CN/sync.json (1)
3-3: LGTM! Translation correctly includes count placeholder.The success message properly incorporates the
{count}placeholder. The Simplified Chinese translation is accurate and uses the appropriate counter word "个".src/renderer/src/i18n/fa-IR/sync.json (1)
3-3: LGTM! Translation correctly includes count placeholder.The success message properly incorporates the
{count}placeholder. The Persian translation reads naturally and will work correctly with vue-i18n's interpolation system.src/renderer/src/stores/sync.ts (1)
13-13: LGTM! Type extension correctly supports count field.The
importResulttype is properly extended to include an optionalcountfield, enabling the UI to display the number of imported conversations. The change is backward-compatible and aligns with the updated presenter return type.src/renderer/settings/components/DataSettings.vue (2)
70-70: LGTM! Proper component composition.Removing the explicit click handler and letting
DialogTriggermanage dialog state is the correct pattern for this UI component library.
217-221: LGTM! Good defensive programming with count fallback.The translation call properly passes the count parameter with a safe fallback to 0, enabling pluralization support in the i18n messages.
src/renderer/src/i18n/ko-KR/sync.json (1)
3-3: LGTM! Korean translation is grammatically correct.Korean doesn't require pluralization changes, and the counter word "개" is properly used for conversations regardless of count.
src/shared/types/presenters/legacy.presenters.d.ts (1)
1342-1344: LGTM! Type signature correctly extended.The addition of the optional
count?: numberfield properly reflects the enhanced import functionality and maintains backward compatibility.src/main/presenter/syncPresenter/index.ts (4)
4-4: LGTM! Appropriate import for backup database queries.The import enables read-only queries on the backup database to count conversations before import, which aligns with the PR objective to track imported conversation counts.
Based on learnings.
126-130: Critical fix: Prevents backup/import race condition.Canceling the pending backup timer before import is essential to prevent the backup process from overwriting the sync folder files while import is reading them, which could lead to data corruption or loss.
194-203: LGTM! Import count logic is correct for both modes.The count tracking properly differentiates between:
- OVERWRITE mode: Uses total backup count since all conversations are imported
- INCREMENT mode: Uses actual imported count from
importData(), which skips existing conversationsThe logging at line 201 provides helpful context showing both imported and total counts.
249-249: LGTM! Success response includes imported count.The count is properly returned to enable the UI to display the number of imported conversations with correct pluralization.
| // Count conversations in backup db first (before any modifications) | ||
| const backupDb = new Database(dbBackupPath) | ||
| backupDb.pragma('journal_mode = WAL') | ||
| const totalInBackup = backupDb | ||
| .prepare('SELECT COUNT(*) as count FROM conversations') | ||
| .get() as { count: number } | ||
| backupDb.close() | ||
|
|
There was a problem hiding this comment.
🧩 Analysis chain
Verify backup database encryption handling.
The backup database is opened without checking if it requires an encryption password. If the source database uses SQLCipher encryption, the backup will also be encrypted and require the password to read.
Additionally, consider wrapping the database operations in a try-finally block to ensure the connection is closed even if the query fails:
let importedCount = 0
try {
// Count conversations in backup db first (before any modifications)
- const backupDb = new Database(dbBackupPath)
- backupDb.pragma('journal_mode = WAL')
- const totalInBackup = backupDb
- .prepare('SELECT COUNT(*) as count FROM conversations')
- .get() as { count: number }
- backupDb.close()
+ let backupDb: Database.Database | null = null
+ try {
+ backupDb = new Database(dbBackupPath)
+ backupDb.pragma('journal_mode = WAL')
+ const totalInBackup = backupDb
+ .prepare('SELECT COUNT(*) as count FROM conversations')
+ .get() as { count: number }
+
+ // Continue with import logic...
+ } finally {
+ if (backupDb) {
+ backupDb.close()
+ }
+ }🏁 Script executed:
#!/bin/bash
# Check if encryption is used in the database backup/restore flow
rg -n "cipher|encrypt|password" src/main/presenter/syncPresenter/ -A 2 -B 2Length of output: 455
---
🏁 Script executed:
```shell
#!/bin/bash
# Look at full function context around lines 186-193
sed -n '170,210p' src/main/presenter/syncPresenter/index.ts
Length of output: 1674
🏁 Script executed:
#!/bin/bash
# Search for db.key() calls and encryption setup
rg -n "\.key\(|db\.pragma.*key" src/main/presenter/syncPresenter/Length of output: 0
🏁 Script executed:
#!/bin/bash
# Search for where backup is created/copied
rg -n "backup|dbBackupPath" src/main/presenter/syncPresenter/ -B 2 -A 2Length of output: 6262
---
🏁 Script executed:
```shell
#!/bin/bash
# Get complete try-catch-finally block structure around lines 185-240
sed -n '184,250p' src/main/presenter/syncPresenter/index.ts
Length of output: 2748
🏁 Script executed:
#!/bin/bash
# Search for where main database is initialized and how encryption is set
rg -n "new Database|this\.DB_PATH|ISQLitePresenter" src/main/presenter/syncPresenter/ -B 2 -A 3Length of output: 5138
🏁 Script executed:
#!/bin/bash
# Search for where backup database is created from main database
rg -n "backup|Backup" src/main/presenter/syncPresenter/ -B 3 -A 5 | head -80Length of output: 5499
---
🏁 Script executed:
```shell
#!/bin/bash
# Get catch block and complete error handling structure
sed -n '250,280p' src/main/presenter/syncPresenter/index.ts
Length of output: 993
🏁 Script executed:
#!/bin/bash
# Find ISQLitePresenter implementation and how database is initialized with encryption
find src -name "*sqlitePresenter*" -o -name "*sqlite*" | grep -v node_modules | head -20Length of output: 34
🏁 Script executed:
#!/bin/bash
# Look for database initialization with key/encryption in sqlite presenter
rg -n "\.key\(|pragma.*key|new Database" src/main/presenter/sqlitePresenter/ -B 2 -A 2 | head -50Length of output: 3023
---
🏁 Script executed:
```shell
#!/bin/bash
# Search for where password is obtained and how sqlitePresenter is initialized
rg -n "password|encryption|sqlitePresenter\s*=" src/main/presenter/ -B 2 -A 2 | grep -A 5 -B 5 "password" | head -60
Length of output: 4363
🏁 Script executed:
#!/bin/bash
# Check how sqlitePresenter is constructed - look for constructor/initialization
rg -n "constructor|new.*Presenter|configPresenter" src/main/presenter/syncPresenter/index.ts -B 1 -A 5 | head -30Length of output: 1167
🏁 Script executed:
#!/bin/bash
# Look for where password/encryption info comes from in the config
rg -n "password|cipher|encrypt" src/shared/presenter/ -B 1 -A 1 2>/dev/null | head -40Length of output: 0
Critical: Missing error handling for database connection and encryption key required for backup access.
Two critical issues found:
-
Resource leak:
backupDb.close()at line 192 is inside the try block but not wrapped in a finally block. If the query at lines 189-191 throws an error, the database connection is never closed. The connection should be guaranteed to close using try-finally. -
Encryption mismatch: The backup database is a file copy of the encrypted main database (created via
fs.copyFileSync(this.DB_PATH, ...)), but it's opened without providing the encryption key. The main database uses SQLCipher encryption when a password is provided (seen insqlitePresenter/index.tslines 45-48), which means the backup will also be encrypted. However,SyncPresenterdoesn't have access to the password—it only receives theISQLitePresenterinterface. This will cause the backup import to fail when encryption is enabled. Similarly,DataImporter(instantiated at line 199) opens databases without passwords.
Required fixes:
- Wrap database operations in try-finally to ensure
backupDb.close()always executes - Pass encryption password to backup database opening and to
DataImporterconstructor to support encrypted backups
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| let importedCount = 0 | ||
| try { | ||
| // Count conversations in backup db first (before any modifications) | ||
| const backupDb = new Database(dbBackupPath) | ||
| backupDb.pragma('journal_mode = WAL') | ||
| const totalInBackup = backupDb | ||
| .prepare('SELECT COUNT(*) as count FROM conversations') | ||
| .get() as { count: number } |
There was a problem hiding this comment.
Avoid read-write opening of backup DB when only counting rows
The new count logic opens the backup file with better-sqlite3 and switches it to WAL mode before the import. This call requires write permission and modifies the backup file even when the user selects overwrite mode just to copy the file. If a user brings in a backup located on a read‑only medium (USB stick, cloud folder synced as read-only, etc.), new Database(dbBackupPath) or the journal_mode = WAL pragma will throw SQLITE_READONLY, causing the whole import to fail even though simply copying the file used to work. Consider opening the database in read‑only mode and skipping the WAL pragma (or skipping the count entirely for overwrite) so read-only backups remain importable.
Useful? React with 👍 / 👎.
* style(settings): format about page link handler (#1016) * style(ollama): format model config handlers (#1018) * fix: think content scroll issue (#1023) * fix: remove shimmer for think content * chore: update screen shot and fix scroll issue * chore: update markdown renderer * fix: import button bug and prevent backup overwriting during import (#1024) * fix(sync): fix import button bug and prevent backup overwriting during import * fix(sync): fix import button bug and prevent backup overwriting during import * fix(sync): fix import button bug and prevent backup overwriting during import * refactor(messageList): refactor message list ui components (#1026) * feat: remove new thread button, add clean button. * refactor(messageList): refactor message list ui components * feat: add configurable fields for chat settings - Introduced ConfigFieldHeader component for consistent field headers. - Added ConfigInputField, ConfigSelectField, ConfigSliderField, and ConfigSwitchField components for various input types. - Created types for field configurations in types.ts to standardize field definitions. - Implemented useChatConfigFields composable to manage field configurations dynamically. - Added useModelCapabilities and useModelTypeDetection composables for handling model-specific capabilities and requirements. - Developed useSearchConfig and useThinkingBudget composables for managing search and budget configurations. * feat: implement input history management in prompt input - Added `useInputHistory` composable for managing input history and navigation. - Implemented methods for setting, clearing, and confirming history placeholders. - Integrated arrow key navigation for browsing through input history. feat: enhance mention data handling in prompt input - Created `useMentionData` composable to aggregate mention data from selected files and MCP resources. - Implemented watchers to update mention data based on selected files, MCP resources, tools, and prompts. feat: manage prompt input configuration with store synchronization - Developed `usePromptInputConfig` composable for managing model configuration. - Implemented bidirectional sync between local config and chat store. - Added debounced watcher to reduce updates and improve performance. feat: streamline TipTap editor operations in prompt input - Introduced `usePromptInputEditor` composable for managing TipTap editor lifecycle and content transformation. - Implemented methods for handling mentions, pasting content, and clearing editor content. feat: handle file operations in prompt input - Created `usePromptInputFiles` composable for managing file selection, paste, and drag-drop operations. - Implemented methods for processing files, handling dropped files, and clearing selected files. feat: manage rate limit status in prompt input - Developed `useRateLimitStatus` composable for displaying and polling rate limit status. - Implemented methods for handling rate limit events and computing status icons, classes, and tooltips. * refactor(artifacts): migrate component logic to composables and update documentation - Refactor ArtifactDialog.vue to use composables for view mode, viewport size, code editor, and export functionality - Simplify HTMLArtifact.vue by removing drag-resize logic and using fixed viewport dimensions - Clean up MermaidArtifact.vue styling and structure - Update component refactoring guide to reflect new patterns and best practices - Adjust prompt input composable to allow delayed editor initialization - Update internationalization files for new responsive label * fix(lint): unused variables * fix(format): format code * CodeRabbit Generated Unit Tests: Add renderer unit tests for components and composables * feat: implement input history management in chat input component - Added `useInputHistory` composable for managing input history and placeholder navigation. - Implemented methods for setting, clearing, and confirming history placeholders. - Integrated arrow key navigation for cycling through input history. feat: enhance mention data handling in chat input - Created `useMentionData` composable to manage mention data aggregation. - Implemented watchers for selected files and MCP resources/tools/prompts to update mention data. feat: manage prompt input configuration and synchronization - Developed `usePromptInputConfig` composable for managing model configuration. - Implemented bidirectional sync between local config refs and chat store. - Added debounced watcher to reduce updates to the store. feat: manage prompt input editor operations - Introduced `usePromptInputEditor` composable for handling TipTap editor operations. - Implemented content transformation, mention insertion, and paste handling. - Added methods for handling editor updates and restoring focus. feat: handle prompt input files management - Created `usePromptInputFiles` composable for managing file operations in prompt input. - Implemented file selection, paste, drag-drop, and prompt files integration. feat: implement rate limit status management - Developed `useRateLimitStatus` composable for managing rate limit status display and polling. - Added methods for retrieving rate limit status icon, class, tooltip, and wait time formatting. * feat: enhance chat input component with context length management and settings integration * feat: update model configuration and enhance error handling in providers * feat: add MCP tools list component and integrate with chat settings feat: enhance artifact dialog with improved error handling and localization fix: update Mermaid artifact rendering error handling and localization fix: improve input settings error handling and state management fix: update drag and drop composable to handle drag events correctly fix: update Vitest configuration for better project structure and alias resolution * fix(i18n): add unknownError translation --------- Co-authored-by: deepinsect <deepinsect@github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * feat: add Poe provider integration and icon support (#1028) * feat: add Poe provider integration and icon support * chore: format and lint --------- Co-authored-by: zerob13 <zerob13@gmail.com> * fix: make auto scroll works (#1030) * fix: allow settings window links to open externally (#1029) * fix(settings): allow target blank links * fix: harden settings window link handling * feat: enhance GitHub Copilot Device Flow with OAuth token management and API token retrieval (#1021) * feat: enhance GitHub Copilot Device Flow with OAuth token management and API token retrieval - Fixed request header for managing OAuth tokens and retrieving API tokens. - Enhanced model definitions and added new models for better compatibility. * fix: remove privacy related log * fix: OAuth 2.0 for slow_down response * fix: handle lint errors * fix: provider fetched from publicdb * fix(githubCopilotProvider): update request body logging format for clarity * fix(githubCopilotProvider): improve error handling and logging in device flow * feat(theme): fix message paragraph gap and toolcall block (#1031) Co-authored-by: deepinsect <deepinsect@github.com> * fix: scroll to bottom (#1034) * fix: add debounce for renderer * feat: add max wait for renderer * chore(deps): upgrade markdown renderer add worker support * chore: bump markdown version * fix(build): use es module worker format (#1037) * feat: remove function deleteOllamaModel (#1036) * feat: remove function deleteOllamaModel * fix(build): use es module worker format (#1037) --------- Co-authored-by: duskzhen <zerob13@gmail.com> * perf: update dependencies to use stream-monaco and bump vue-renderer-markdown version (#1038) * feat(theme): add markdown layout style and table style (#1039) * feat(theme): add markdown layout style and table style * fix(lint): remove props --------- Co-authored-by: deepinsect <deepinsect@github.com> * feat: support effort and verbosity (#1040) * chore: bump up version * feat: add jiekou.ai as LLM provider (#1041) * feat: add jiekou.ai as LLM provider * fix: change api type to jiekou --------- Co-authored-by: zerob13 <zerob13@gmail.com> * chore: update provider db --------- Co-authored-by: 韦伟 <xweimvp@gmail.com> Co-authored-by: Happer <ericted8810us@gmail.com> Co-authored-by: deepinsect <deepinsect@github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: cp90 <153345481+cp90-pixel@users.noreply.github.com> Co-authored-by: Cedric <14017092+douyixuan@users.noreply.github.com> Co-authored-by: Simon He <57086651+Simon-He95@users.noreply.github.com> Co-authored-by: yyhhyyyyyy <yyhhyyyyyy8@gmail.com> Co-authored-by: cnJasonZ <gbdzxalbb@qq.com>
Summary by CodeRabbit
New Features
UI
Bug Fixes
Localization