25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。
TypeScript aicliclickhousedatabasedatabase-clientdatabase-managementdockerguimcpmongodbmysqlpostgresqlredisrustsql-serversqlitetaurivue
feat(snippets): add scheduled auto upload
_Mr丶s ゛😁®8334249d5d50
diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vueindex 4383c5f238..1b9b3cc49d 100644--- a/apps/desktop/src/App.vue+++ b/apps/desktop/src/App.vue@@ -73,6 +73,7 @@ import { disposeAllSqlServerActivityTraces } from "@/lib/sqlserver/sqlServerActiimport { useVisibilityChange } from "@/composables/useVisibilityChange";import { useExternalSqlFileChanges } from "@/composables/useExternalSqlFileChanges";import { useWebDavAutoUpload } from "@/composables/useWebDavAutoUpload";+import { useSnippetAutoUpload } from "@/composables/useSnippetAutoUpload";import { readSyncMethod, readWebDavAutoUploadConfig, readWebDavBackupSelection, recordWebDavSyncSuccess } from "@/lib/webdav/webdavAutoUploadConfig";import { useScheduledDatabaseBackups } from "@/composables/useScheduledDatabaseBackups";import { shouldDrawDesktopWindowFrame, shouldDrawLinuxFloatingFrame, useWindowControls } from "@/composables/useWindowControls";@@ -1266,6 +1267,7 @@ const { setupTauriListeners, cleanupTauriListeners } = useTauriEvents({const { showCloseActionPrompt, chooseQuit, chooseMinimize, cancelCloseActionPrompt, performCloseAction, setupCloseActionPromptListener, cleanupCloseActionPromptListener } = useCloseActionPrompt({ requestClose: requestAppClose });useVisibilityChange();useWebDavAutoUpload();+useSnippetAutoUpload();useScheduledDatabaseBackups({ scheduler: true });const appVersion = ref("");diff --git a/apps/desktop/src/components/editor/EditorSettingsDialog.vue b/apps/desktop/src/components/editor/EditorSettingsDialog.vueindex cd99e3f998..045497ade9 100644--- a/apps/desktop/src/components/editor/EditorSettingsDialog.vue+++ b/apps/desktop/src/components/editor/EditorSettingsDialog.vue@@ -165,6 +165,7 @@ import {saveWebMcpHttpSettings,rotateWebMcpToken,forgetSnippetSavedToken,+ forgetSnippetSavedPassphrase,forgetWebdavSyncSecretsPassphrase,forgetWebdavSavedPassword,getAppSupportInfo,@@ -185,6 +186,7 @@ import {saveWebdavSyncSecretsPreference,saveWebdavSavedPassword,saveSnippetSavedToken,+ saveSnippetSavedPassphrase,saveSnippetSyncId,retrySnippetLegacyCleanup,snippetSyncDownload,@@ -192,6 +194,7 @@ import {snippetSyncSettings,snippetSyncTest,snippetSyncUpload,+ snippetPassphraseStatus,snippetTokenStatus,webdavPasswordStatus,webdavSyncDownload,@@ -213,6 +216,21 @@ import {type SyncSnapshotCatalog,type WebDavConfig,} from "@/lib/backend/api";+import {+ MAX_SNIPPET_AUTO_UPLOAD_INTERVAL_MINUTES,+ normalizedSnippetAutoUploadInterval,+ readSnippetAutoUploadConfig,+ readSnippetLastSuccessfulUpload,+ readSnippetRemoteContentHash,+ snippetRemoteContentHashKey,+ SNIPPET_AUTO_UPLOAD_CONFIG_CHANGED_EVENT,+ SNIPPET_LAST_UPLOAD_CHANGED_EVENT,+ writeSnippetAutoUploadFields,+ writeSnippetLastSuccessfulUpload,+ writeSnippetAutoUploadSelection,+ writeSnippetRemoteContentHash,+ withSnippetSyncLock,+} from "@/lib/cloudSync/snippetAutoUploadConfig";import { createModifierDoubleTapShortcutController } from "@/lib/editor/modifierDoubleTapShortcut";import { eventToModifierOnlyShortcut, eventToShortcut } from "@/lib/editor/keyboardShortcuts";import { shortcutRecorderAction } from "@/lib/editor/shortcutRecorder";@@ -4715,27 +4733,99 @@ const snippetInstanceUrl = ref(localStorage.getItem("dbx-gitlab-instance-url") |const activeSnippetInstanceUrl = ref(snippetInstanceUrl.value);const snippetInstanceError = ref("");const snippetPreferenceKey = () => `dbx-snippet-remember-token-${snippetProvider.value}${snippetProvider.value === "gitlab" ? `-${activeSnippetInstanceUrl.value}` : ""}`;+const snippetPassphrasePreferenceKey = () => `dbx-snippet-remember-passphrase-${snippetProvider.value}${snippetProvider.value === "gitlab" ? `-${activeSnippetInstanceUrl.value}` : ""}`;const snippetId = ref("");const snippetToken = ref("");const snippetRememberToken = ref(localStorage.getItem(snippetPreferenceKey()) === "true");const snippetHasSavedToken = ref(false);const snippetPassphrase = ref("");+const snippetRememberPassphrase = ref(localStorage.getItem(snippetPassphrasePreferenceKey()) === "true");+const snippetHasSavedPassphrase = ref(false);+const snippetRemoteContentHashCache = ref(new Map<string, string | null>());+const initialSnippetAutoUploadConfig = readSnippetAutoUploadConfig();+const snippetAutoUploadEnabled = ref(initialSnippetAutoUploadConfig.enabled);+const snippetAutoUploadIntervalMinutes = ref(initialSnippetAutoUploadConfig.intervalMinutes);+const snippetAutoUploadIntervalHint = computed(() => {+ const formatted = formatWebDavAutoUploadInterval(snippetAutoUploadIntervalMinutes.value, locale.value, {+ minute: t("settings.syncAutoUploadUnitMinute"),+ hour: t("settings.syncAutoUploadUnitHour"),+ day: t("settings.syncAutoUploadUnitDay"),+ });+ return t("settings.syncAutoUploadScheduleHint", { interval: formatted.interval });+});const snippetSecretsPassphrase = ref("");const snippetIncludeSecrets = ref(false);const snippetRestoreSecrets = ref(false);const snippetBusy = ref<"" | "test" | "upload" | "download" | "migrate" | "cleanup">("");const snippetMessage = ref("");const snippetError = ref(false);+function currentSnippetLastSuccessfulUpload(): string | undefined {+ const instanceUrl = snippetProvider.value === "gitlab" ? activeSnippetInstanceUrl.value : undefined;+ return readSnippetLastSuccessfulUpload(snippetProvider.value, instanceUrl, snippetId.value);+}+const snippetLastUploadAt = ref(currentSnippetLastSuccessfulUpload());+const snippetLastUploadDisplay = computed(() => {+ if (!snippetLastUploadAt.value) return "";+ const date = new Date(snippetLastUploadAt.value);+ if (Number.isNaN(date.getTime())) return "";+ const time = new Intl.DateTimeFormat(locale.value, {+ year: "numeric",+ month: "2-digit",+ day: "2-digit",+ hour: "2-digit",+ minute: "2-digit",+ second: "2-digit",+ hourCycle: "h23",+ }).format(date);+ return t("settings.syncSnippetLastSuccessfulUpload", { time });+});const legacySnippetId = ref("");const pendingLegacyCleanupId = ref("");const snippetSyncSettingsLoading = ref(true);watch(syncMethodTab, (value) => writeSyncMethod(value), { immediate: true });+function refreshSnippetLastUploadTime() {+ snippetLastUploadAt.value = currentSnippetLastSuccessfulUpload();+}++watch([snippetProvider, activeSnippetInstanceUrl, snippetId], refreshSnippetLastUploadTime);+onMounted(() => window.addEventListener(SNIPPET_LAST_UPLOAD_CHANGED_EVENT, refreshSnippetLastUploadTime));+onUnmounted(() => window.removeEventListener(SNIPPET_LAST_UPLOAD_CHANGED_EVENT, refreshSnippetLastUploadTime));+const webdavReady = computed(() => !!webdavEndpoint.value.trim() && !webdavBusy.value);const localBackupCanIncludeSecrets = computed(() => !!localBackupSecretsPassphrase.value.trim());const snippetReady = computed(() => !snippetSyncSettingsLoading.value && !snippetBusy.value && (snippetProvider.value !== "gitlab" || (!snippetInstanceError.value && snippetInstanceUrl.value === activeSnippetInstanceUrl.value)) && (!!snippetToken.value.trim() || snippetHasSavedToken.value));-const snippetUploadReady = computed(() => snippetReady.value && !!snippetPassphrase.value.trim());+const snippetUploadReady = computed(() => snippetReady.value && (!!snippetPassphrase.value.trim() || snippetHasSavedPassphrase.value));+const snippetAutoUploadRequirements = computed(() => {+ if (snippetSyncSettingsLoading.value) return [];++ const requirements: string[] = [];+ if (snippetProvider.value === "gitlab" && (snippetInstanceError.value || snippetInstanceUrl.value !== activeSnippetInstanceUrl.value)) {+ requirements.push(t("settings.syncSnippetAutoUploadInvalidGitLabInstance"));+ }+ if (!snippetHasSavedToken.value) requirements.push(t("settings.syncSnippetAutoUploadMissingToken"));+ if (!snippetHasSavedPassphrase.value) requirements.push(t("settings.syncSnippetAutoUploadMissingPassphrase"));++ const id = snippetId.value.trim();+ if (!id) {+ requirements.push(t("settings.syncSnippetAutoUploadMissingSnippet"));+ } else {+ const instanceUrl = snippetProvider.value === "gitlab" ? activeSnippetInstanceUrl.value : undefined;+ const hashKey = snippetRemoteContentHashKey(snippetProvider.value, instanceUrl, id);+ const hashCache = snippetRemoteContentHashCache.value;+ const remoteContentHash = hashCache.has(hashKey) ? hashCache.get(hashKey) : readSnippetRemoteContentHash(snippetProvider.value, instanceUrl, id);+ if (!remoteContentHash) requirements.push(t("settings.syncSnippetAutoUploadMissingBaseline"));+ }+ return requirements;+});+const snippetAutoUploadReady = computed(() => !snippetSyncSettingsLoading.value && snippetAutoUploadRequirements.value.length === 0);+const snippetAutoUploadSetupHint = computed(() => {+ if (snippetSyncSettingsLoading.value) return t("settings.syncSnippetAutoUploadChecking");+ return t("settings.syncSnippetAutoUploadNeedsSetup", {+ requirements: snippetAutoUploadRequirements.value.join(t("settings.syncSnippetAutoUploadRequirementSeparator")),+ });+});// Legacy plaintext snippets have no outer encryption password. Let the// backend require one only after it detects an encrypted envelope so those// snapshots remain recoverable for migration.@@ -4755,6 +4845,15 @@ function currentSnippetAccountConfig(): SnippetSyncConfig {return { ...currentSnippetConfig(), token: undefined };}+function persistSnippetRemoteContentHash(snippetId: string, remoteContentHash: string | undefined) {+ const provider = snippetProvider.value;+ const instanceUrl = provider === "gitlab" ? activeSnippetInstanceUrl.value : undefined;+ writeSnippetRemoteContentHash(provider, instanceUrl, snippetId, remoteContentHash);+ const cache = new Map(snippetRemoteContentHashCache.value);+ cache.set(snippetRemoteContentHashKey(provider, instanceUrl, snippetId), remoteContentHash || null);+ snippetRemoteContentHashCache.value = cache;+}+async function refreshSnippetTokenStatus() {const account = `${snippetProvider.value}:${activeSnippetInstanceUrl.value}`;try {@@ -4767,6 +4866,18 @@ async function refreshSnippetTokenStatus() {}}+async function refreshSnippetPassphraseStatus() {+ const account = `${snippetProvider.value}:${activeSnippetInstanceUrl.value}`;+ try {+ const status = await snippetPassphraseStatus(currentSnippetAccountConfig());+ if (account !== `${snippetProvider.value}:${activeSnippetInstanceUrl.value}`) return;+ snippetHasSavedPassphrase.value = status.hasSavedPassphrase;+ if (status.hasSavedPassphrase) snippetRememberPassphrase.value = true;+ } catch {+ if (account === `${snippetProvider.value}:${activeSnippetInstanceUrl.value}`) snippetHasSavedPassphrase.value = false;+ }+}+async function refreshSnippetSyncSettings(provider = snippetProvider.value, instanceUrl = activeSnippetInstanceUrl.value) {const isCurrent = () => provider === snippetProvider.value && instanceUrl === activeSnippetInstanceUrl.value;try {@@ -4795,7 +4906,10 @@ async function refreshSnippetSyncSettings(provider = snippetProvider.value, inst}async function persistSnippetSyncId() {- await saveSnippetSyncId(snippetProvider.value, snippetId.value.trim() || undefined, snippetProvider.value === "gitlab" ? activeSnippetInstanceUrl.value : undefined);+ const id = snippetId.value.trim();+ const instanceUrl = snippetProvider.value === "gitlab" ? activeSnippetInstanceUrl.value : undefined;+ await saveSnippetSyncId(snippetProvider.value, id || undefined, instanceUrl);+ if (!id || !readSnippetRemoteContentHash(snippetProvider.value, instanceUrl, id)) snippetAutoUploadEnabled.value = false;}function commitSnippetInstance() {@@ -4811,14 +4925,20 @@ function commitSnippetInstance() {if (snippetInstanceUrl.value === activeSnippetInstanceUrl.value) return;activeSnippetInstanceUrl.value = snippetInstanceUrl.value;localStorage.setItem("dbx-gitlab-instance-url", activeSnippetInstanceUrl.value);+ syncSnippetAutoUploadPreference();+ window.dispatchEvent(new Event(SNIPPET_AUTO_UPLOAD_CONFIG_CHANGED_EVENT));snippetRememberToken.value = localStorage.getItem(snippetPreferenceKey()) === "true";+ snippetRememberPassphrase.value = localStorage.getItem(snippetPassphrasePreferenceKey()) === "true";snippetToken.value = "";+ snippetPassphrase.value = "";snippetHasSavedToken.value = false;+ snippetHasSavedPassphrase.value = false;snippetId.value = "";legacySnippetId.value = "";pendingLegacyCleanupId.value = "";snippetSyncSettingsLoading.value = true;void refreshSnippetTokenStatus();+ void refreshSnippetPassphraseStatus();void refreshSnippetSyncSettings();}@@ -4835,16 +4955,79 @@ async function applySnippetTokenPreference() {}}+async function clearSnippetSavedToken() {+ const accountKey = `${snippetProvider.value}:${activeSnippetInstanceUrl.value}`;+ const accountConfig = currentSnippetAccountConfig();+ snippetHasSavedToken.value = false;+ snippetRememberToken.value = false;+ snippetAutoUploadEnabled.value = false;+ try {+ await withSnippetSyncLock(() => forgetSnippetSavedToken(accountConfig));+ snippetToken.value = "";+ } catch (error: any) {+ if (accountKey === `${snippetProvider.value}:${activeSnippetInstanceUrl.value}`) {+ snippetHasSavedToken.value = true;+ snippetRememberToken.value = true;+ snippetMessage.value = error?.message || String(error);+ snippetError.value = true;+ }+ }+}++async function applySnippetPassphrasePreference() {+ const passphrase = snippetPassphrase.value.trim();+ localStorage.setItem(snippetPassphrasePreferenceKey(), String(snippetRememberPassphrase.value));+ if (snippetRememberPassphrase.value && passphrase) {+ await saveSnippetSavedPassphrase(currentSnippetAccountConfig(), passphrase);+ snippetHasSavedPassphrase.value = true;+ snippetPassphrase.value = "";+ return;+ }+ if (!snippetRememberPassphrase.value && snippetHasSavedPassphrase.value) {+ await forgetSnippetSavedPassphrase(currentSnippetAccountConfig());+ snippetHasSavedPassphrase.value = false;+ snippetAutoUploadEnabled.value = false;+ }+}++async function clearSnippetSavedPassphrase() {+ const accountKey = `${snippetProvider.value}:${activeSnippetInstanceUrl.value}`;+ const accountConfig = currentSnippetAccountConfig();+ snippetHasSavedPassphrase.value = false;+ snippetRememberPassphrase.value = false;+ snippetAutoUploadEnabled.value = false;+ try {+ await withSnippetSyncLock(() => forgetSnippetSavedPassphrase(accountConfig));+ snippetPassphrase.value = "";+ } catch (error: any) {+ if (accountKey === `${snippetProvider.value}:${activeSnippetInstanceUrl.value}`) {+ snippetHasSavedPassphrase.value = true;+ snippetRememberPassphrase.value = true;+ }+ snippetMessage.value = error?.message || String(error);+ snippetError.value = true;+ }+}++function syncSnippetAutoUploadPreference() {+ const config = readSnippetAutoUploadConfig();+ snippetAutoUploadEnabled.value = config.enabled;+ snippetAutoUploadIntervalMinutes.value = config.intervalMinutes;+}+async function runSnippetAction(kind: "test" | "upload" | "download" | "migrate" | "cleanup", action: () => Promise<string>, persistCurrentSnippetId = true) {snippetBusy.value = kind;snippetMessage.value = "";snippetError.value = false;try {- localStorage.setItem("dbx-snippet-provider", snippetProvider.value);- localStorage.setItem(snippetPreferenceKey(), String(snippetRememberToken.value));- if (persistCurrentSnippetId) await persistSnippetSyncId();- await applySnippetTokenPreference();- snippetMessage.value = await action();+ await withSnippetSyncLock(async () => {+ localStorage.setItem("dbx-snippet-provider", snippetProvider.value);+ localStorage.setItem(snippetPreferenceKey(), String(snippetRememberToken.value));+ if (persistCurrentSnippetId) await persistSnippetSyncId();+ await applySnippetTokenPreference();+ await applySnippetPassphrasePreference();+ snippetMessage.value = await action();+ });} catch (e: any) {snippetMessage.value = e?.message || String(e);if (kind === "upload" && snippetMessage.value.includes("legacy unencrypted DBX snapshot")) {@@ -4888,6 +5071,9 @@ async function migrateLegacySnippet() {const summary = await snippetSyncUpload(config, settingsStore.editorSettings, snippetPassphrase.value, snippetIncludeSecrets.value, snippetSecretsPassphrase.value || undefined);snippetId.value = summary.snippetId;await persistSnippetSyncId();+ persistSnippetRemoteContentHash(summary.snippetId, summary.remoteContentHash);+ const instanceUrl = snippetProvider.value === "gitlab" ? activeSnippetInstanceUrl.value : undefined;+ writeSnippetLastSuccessfulUpload(snippetProvider.value, instanceUrl, summary.snippetId);legacySnippetId.value = "";pendingLegacyCleanupId.value = summary.legacyCleanupRequiredId || "";if (!summary.legacyCleanupRequiredId) {@@ -5180,6 +5366,10 @@ async function confirmSyncSelection(selection: SyncSelection) {const summary = await snippetSyncUpload(currentSnippetConfig(), settingsStore.editorSettings, snippetPassphrase.value, selection.includeSecrets, selection.includeSecrets ? snippetSecretsPassphrase.value : undefined, selection);snippetId.value = summary.snippetId;await persistSnippetSyncId();+ const instanceUrl = snippetProvider.value === "gitlab" ? activeSnippetInstanceUrl.value : undefined;+ writeSnippetAutoUploadSelection(snippetProvider.value, instanceUrl, selection);+ persistSnippetRemoteContentHash(summary.snippetId, summary.remoteContentHash);+ writeSnippetLastSuccessfulUpload(snippetProvider.value, instanceUrl, summary.snippetId);return t("settings.syncSnippetUploadSuccess", { bytes: summary.bytes, id: summary.snippetId });});return;@@ -5187,6 +5377,7 @@ async function confirmSyncSelection(selection: SyncSelection) {snippetRestoreSecrets.value = selection.includeSecrets;await runSnippetAction("download", async () => {const result = await snippetSyncDownload(currentSnippetConfig(), snippetPassphrase.value, selection.includeSecrets, selection.includeSecrets ? snippetSecretsPassphrase.value : undefined, selection);+ persistSnippetRemoteContentHash(result.summary.snippetId, result.summary.remoteContentHash);if (result.editorSettings && typeof result.editorSettings === "object") settingsStore.updateEditorSettings(result.editorSettings as any);await settingsStore.updateDesktopSettings(result.desktopSettings);await connectionStore.initFromDisk();@@ -5309,10 +5500,13 @@ watch(editSidebarTablePageSize.value = settingsStore.desktopSettings.sidebar_table_page_size ?? DEFAULT_SIDEBAR_TABLE_PAGE_SIZE;webdavPassword.value = "";snippetToken.value = "";+ snippetPassphrase.value = "";webdavSecretsPassphrase.value = "";+ syncSnippetAutoUploadPreference();await refreshWebDavPasswordStatus();await refreshWebDavSyncSecretsStatus();await refreshSnippetTokenStatus();+ await refreshSnippetPassphraseStatus();await refreshSnippetSyncSettings();syncAiEditState();await applyPendingAiConfigDeepLinkDraft();@@ -5371,17 +5565,66 @@ watch([webdavAutoUploadEnabled, webdavAutoUploadIntervalMinutes], () => {webdavAutoUploadIntervalMinutes.value = normalizedWebDavAutoUploadInterval(webdavAutoUploadIntervalMinutes.value);rememberWebDavFields();});+watch(snippetRememberToken, async (remember) => {+ localStorage.setItem(snippetPreferenceKey(), String(remember));+ if (remember || !snippetHasSavedToken.value) return;+ const accountKey = `${snippetProvider.value}:${activeSnippetInstanceUrl.value}`;+ const accountConfig = currentSnippetAccountConfig();+ snippetHasSavedToken.value = false;+ snippetAutoUploadEnabled.value = false;+ try {+ await withSnippetSyncLock(() => forgetSnippetSavedToken(accountConfig));+ } catch (error: any) {+ if (accountKey === `${snippetProvider.value}:${activeSnippetInstanceUrl.value}`) {+ snippetHasSavedToken.value = true;+ snippetRememberToken.value = true;+ snippetMessage.value = error?.message || String(error);+ snippetError.value = true;+ }+ }+});+watch(snippetRememberPassphrase, async (remember) => {+ localStorage.setItem(snippetPassphrasePreferenceKey(), String(remember));+ if (remember || !snippetHasSavedPassphrase.value) return;+ const accountKey = `${snippetProvider.value}:${activeSnippetInstanceUrl.value}`;+ const accountConfig = currentSnippetAccountConfig();+ snippetHasSavedPassphrase.value = false;+ snippetAutoUploadEnabled.value = false;+ try {+ await withSnippetSyncLock(() => forgetSnippetSavedPassphrase(accountConfig));+ } catch (error: any) {+ if (accountKey === `${snippetProvider.value}:${activeSnippetInstanceUrl.value}`) {+ snippetHasSavedPassphrase.value = true;+ snippetRememberPassphrase.value = true;+ snippetMessage.value = error?.message || String(error);+ snippetError.value = true;+ }+ }+});+watch([snippetAutoUploadEnabled, snippetAutoUploadIntervalMinutes], () => {+ snippetAutoUploadIntervalMinutes.value = normalizedSnippetAutoUploadInterval(snippetAutoUploadIntervalMinutes.value);+ const persisted = readSnippetAutoUploadConfig();+ if (persisted.enabled !== snippetAutoUploadEnabled.value || persisted.intervalMinutes !== snippetAutoUploadIntervalMinutes.value) {+ writeSnippetAutoUploadFields(snippetProvider.value, snippetProvider.value === "gitlab" ? activeSnippetInstanceUrl.value : undefined, { enabled: snippetAutoUploadEnabled.value, intervalMinutes: snippetAutoUploadIntervalMinutes.value });+ }+});watch(snippetProvider, (provider) => {localStorage.setItem("dbx-snippet-provider", provider);snippetId.value = "";snippetRememberToken.value = localStorage.getItem(snippetPreferenceKey()) === "true";+ snippetRememberPassphrase.value = localStorage.getItem(snippetPassphrasePreferenceKey()) === "true";snippetToken.value = "";+ snippetPassphrase.value = "";snippetHasSavedToken.value = false;+ snippetHasSavedPassphrase.value = false;legacySnippetId.value = "";pendingLegacyCleanupId.value = "";snippetSyncSettingsLoading.value = true;void refreshSnippetTokenStatus();+ void refreshSnippetPassphraseStatus();void refreshSnippetSyncSettings(provider);+ syncSnippetAutoUploadPreference();+ window.dispatchEvent(new Event(SNIPPET_AUTO_UPLOAD_CONFIG_CHANGED_EVENT));});watch(activeSettingsTab, async (tab) => {@@ -5430,6 +5673,8 @@ watch();onMounted(() => {+ syncSnippetAutoUploadPreference();+ window.addEventListener(SNIPPET_AUTO_UPLOAD_CONFIG_CHANGED_EVENT, syncSnippetAutoUploadPreference);window.addEventListener("blur", modifierDoubleTapRecorder.reset);document.addEventListener("visibilitychange", modifierDoubleTapRecorder.reset);window.addEventListener("pointerdown", modifierDoubleTapRecorder.cancel, true);@@ -5449,6 +5694,7 @@ onMounted(() => {});onUnmounted(() => {+ window.removeEventListener(SNIPPET_AUTO_UPLOAD_CONFIG_CHANGED_EVENT, syncSnippetAutoUploadPreference);window.removeEventListener("blur", modifierDoubleTapRecorder.reset);document.removeEventListener("visibilitychange", modifierDoubleTapRecorder.reset);window.removeEventListener("pointerdown", modifierDoubleTapRecorder.cancel, true);@@ -10596,12 +10842,7 @@ LIMIT 100;</pre>type="button"class="absolute right-1 top-1/2 inline-flex size-7 -translate-y-1/2 items-center justify-center rounded-md text-muted-foreground transition-colors hover:bg-accent hover:text-accent-foreground":title="t('settings.syncClearSavedPassword')"- @click="- snippetRememberToken = false;- forgetSnippetSavedToken(currentSnippetAccountConfig());- snippetHasSavedToken = false;- snippetToken = '';- "+ @click="clearSnippetSavedToken"><X class="size-3.5" /></button>@@ -10616,10 +10857,43 @@ LIMIT 100;</pre></div><div class="space-y-2 md:col-span-2"><Label for="snippet-sync-passphrase">{{ t("settings.syncSnippetPassphrase") }}</Label>- <PasswordInput id="snippet-sync-passphrase" v-model="snippetPassphrase" autocomplete="new-password" />+ <PasswordInput id="snippet-sync-passphrase" v-model="snippetPassphrase" :placeholder="snippetHasSavedPassphrase ? '••••••••' : ''" autocomplete="new-password" />+ <div class="flex items-center justify-between gap-3">+ <label class="flex items-center gap-2 text-xs text-muted-foreground">+ <input v-model="snippetRememberPassphrase" type="checkbox" class="h-4 w-4 shrink-0 accent-primary" />+ <span>{{ t("settings.syncSnippetRememberPassphrase") }}</span>+ </label>+ <Button v-if="snippetHasSavedPassphrase" type="button" variant="ghost" size="sm" class="h-7 px-2 text-xs" :title="t('settings.syncClearSavedPassword')" @click="clearSnippetSavedPassphrase">+ <X class="mr-1 size-3.5" />+ {{ t("settings.syncClearSavedPassword") }}+ </Button>+ </div><p class="text-xs text-muted-foreground">{{ t("settings.syncSnippetPassphraseDescription") }}</p>+ <p class="text-xs text-muted-foreground">+ {{ t("settings.syncSnippetRememberPassphraseDescription") }}+ </p>+ </div>+ <div class="settings-item space-y-2 md:col-span-2 rounded-md border bg-muted/20 px-3 py-3">+ <label class="flex items-center gap-2 text-xs">+ <input v-model="snippetAutoUploadEnabled" type="checkbox" class="h-4 w-4 shrink-0 accent-primary" :disabled="!snippetAutoUploadReady && !snippetAutoUploadEnabled" />+ <span class="font-medium">{{ t("settings.syncSnippetAutoUpload") }}</span>+ </label>+ <div class="flex items-center gap-2">+ <Label for="snippet-auto-upload-interval" class="text-xs text-muted-foreground">{{ t("settings.syncSnippetAutoUploadInterval") }}</Label>+ <Input id="snippet-auto-upload-interval" v-model.number="snippetAutoUploadIntervalMinutes" type="number" min="1" :max="MAX_SNIPPET_AUTO_UPLOAD_INTERVAL_MINUTES" step="1" class="h-7 w-24 text-xs" :disabled="!snippetAutoUploadEnabled" />+ <span class="text-xs text-muted-foreground">{{ t("settings.syncAutoUploadMinutes") }}</span>+ </div>+ <p class="text-xs text-muted-foreground" aria-live="polite">+ {{ snippetAutoUploadIntervalHint }}+ </p>+ <p class="text-xs text-muted-foreground">+ {{ t("settings.syncSnippetAutoUploadDescription") }}+ </p>+ <p v-if="!snippetAutoUploadReady" role="status" aria-live="polite" class="border-l-2 border-amber-500 pl-2 text-xs text-amber-700 dark:text-amber-300">+ {{ snippetAutoUploadSetupHint }}+ </p></div><div class="space-y-2 md:col-span-2"><label class="flex items-center gap-2 text-xs text-muted-foreground">@@ -10632,10 +10906,10 @@ LIMIT 100;</pre></label></div><div v-if="snippetIncludeSecrets || snippetRestoreSecrets || legacySnippetId" class="space-y-2 md:col-span-2">- <Label for="snippet-sync-secrets-passphrase">{{ t("settings.syncSecretsPassphrase") }}</Label>+ <Label for="snippet-sync-secrets-passphrase">{{ t("settings.syncSnippetSecretsPassphrase") }}</Label><PasswordInput id="snippet-sync-secrets-passphrase" v-model="snippetSecretsPassphrase" autocomplete="new-password" /><p class="text-xs text-muted-foreground">- {{ t("settings.syncSecretsPassphraseDescription") }}+ {{ t("settings.syncSnippetSecretsPassphraseDescription") }}</p></div><div v-if="pendingLegacyCleanupId" class="flex items-center justify-between gap-3 rounded-md border border-destructive/40 bg-destructive/5 p-3 text-xs text-destructive md:col-span-2">@@ -10646,8 +10920,9 @@ LIMIT 100;</pre></Button></div><div class="flex flex-wrap items-center justify-between gap-3 md:col-span-2">- <div v-if="snippetMessage" class="min-w-0 flex-1 text-xs" :class="snippetError ? 'text-destructive' : 'text-green-600 dark:text-green-400'">- {{ snippetMessage }}+ <div v-if="snippetMessage || snippetLastUploadDisplay" class="min-w-0 flex-1 space-y-1 text-xs">+ <p v-if="snippetMessage" :class="snippetError ? 'text-destructive' : 'text-green-600 dark:text-green-400'">{{ snippetMessage }}</p>+ <p v-if="snippetLastUploadDisplay" class="text-muted-foreground" aria-live="polite">{{ snippetLastUploadDisplay }}</p></div><div v-else class="flex-1" /><div class="flex shrink-0 flex-wrap justify-end gap-2">diff --git a/apps/desktop/src/composables/useSnippetAutoUpload.ts b/apps/desktop/src/composables/useSnippetAutoUpload.tsnew file mode 100644index 0000000000..48801ab979--- /dev/null+++ b/apps/desktop/src/composables/useSnippetAutoUpload.ts@@ -0,0 +1,114 @@+import { onMounted, onUnmounted } from "vue";+import { useSettingsStore } from "@/stores/settingsStore";+import { appendDebugLog } from "@/lib/backend/debugLog";+import { snippetPassphraseStatus, snippetSyncSettings, snippetSyncUpload, snippetTokenStatus } from "@/lib/backend/api";+import {+ readSnippetAutoUploadConfig,+ readSnippetAutoUploadSelection,+ readSnippetRemoteContentHash,+ SNIPPET_AUTO_UPLOAD_CONFIG_CHANGED_EVENT,+ withSnippetSyncLock,+ writeSnippetAutoUploadFields,+ writeSnippetLastSuccessfulUpload,+ writeSnippetRemoteContentHash,+} from "@/lib/cloudSync/snippetAutoUploadConfig";++export function useSnippetAutoUpload() {+ const settingsStore = useSettingsStore();+ let timer: ReturnType<typeof window.setInterval> | undefined;+ let uploading = false;++ function clearTimer() {+ if (!timer) return;+ window.clearInterval(timer);+ timer = undefined;+ }++ function stopAutoUpload(provider: "github" | "gitee" | "gitlab", instanceUrl: string | undefined, intervalMinutes: number) {+ writeSnippetAutoUploadFields(provider, instanceUrl, { enabled: false, intervalMinutes });+ }++ function schedule() {+ clearTimer();+ const config = readSnippetAutoUploadConfig();+ if (!config.enabled) return;+ timer = window.setInterval(() => {+ void runAutoUpload();+ }, config.intervalMinutes * 60_000);+ }++ async function runAutoUpload() {+ if (uploading || !readSnippetAutoUploadConfig().enabled) return;+ uploading = true;+ let config = readSnippetAutoUploadConfig();+ try {+ await withSnippetSyncLock(async () => {+ config = readSnippetAutoUploadConfig();+ if (!config.enabled) return;+ const settings = await snippetSyncSettings(config.provider, config.instanceUrl);+ const snippetId = settings.snippetId?.trim();+ const remoteContentHash = snippetId ? readSnippetRemoteContentHash(config.provider, config.instanceUrl, snippetId) : undefined;+ if (!snippetId || !remoteContentHash) {+ stopAutoUpload(config.provider, config.instanceUrl, config.intervalMinutes);+ appendDebugLog("error", "[DBX][snippet:auto-upload:paused]", "A manual upload or download is required before automatic uploads can start.");+ return;+ }++ const account = { provider: config.provider, instanceUrl: config.instanceUrl, snippetId };+ const [tokenStatus, passphraseStatus] = await Promise.all([snippetTokenStatus(account), snippetPassphraseStatus(account)]);+ if (!tokenStatus.hasSavedToken || !passphraseStatus.hasSavedPassphrase) {+ stopAutoUpload(config.provider, config.instanceUrl, config.intervalMinutes);+ appendDebugLog("error", "[DBX][snippet:auto-upload:paused]", "A saved snippet token and encryption password are required for automatic uploads.");+ return;+ }++ const summary = await snippetSyncUpload(account, settingsStore.editorSettings, undefined, false, undefined, readSnippetAutoUploadSelection(config.provider, config.instanceUrl), remoteContentHash);+ if (!summary.remoteContentHash) {+ stopAutoUpload(config.provider, config.instanceUrl, config.intervalMinutes);+ appendDebugLog("error", "[DBX][snippet:auto-upload:paused]", "The provider did not return a remote content hash.");+ return;+ }+ writeSnippetRemoteContentHash(config.provider, config.instanceUrl, summary.snippetId, summary.remoteContentHash);+ if (!summary.unchanged) writeSnippetLastSuccessfulUpload(config.provider, config.instanceUrl, summary.snippetId);+ appendDebugLog("info", "[DBX][snippet:auto-upload:success]", {+ provider: config.provider,+ snippetId: summary.snippetId,+ bytes: summary.bytes,+ unchanged: summary.unchanged,+ exportedAt: summary.exportedAt,+ });+ });+ } catch (error) {+ const message = error instanceof Error ? error.message : String(error);+ if (message.includes("remote snippet changed since the last successful upload")) {+ stopAutoUpload(config.provider, config.instanceUrl, config.intervalMinutes);+ }+ if (message.includes("encrypted credentials")) {+ stopAutoUpload(config.provider, config.instanceUrl, config.intervalMinutes);+ }+ if (message.includes("legacy unencrypted") || message.includes("failed with HTTP 404") || message.includes("Snippet does not contain")) {+ stopAutoUpload(config.provider, config.instanceUrl, config.intervalMinutes);+ }+ appendDebugLog("error", "[DBX][snippet:auto-upload:error]", { provider: config.provider, message });+ } finally {+ uploading = false;+ }+ }++ onMounted(() => {+ schedule();+ window.addEventListener(SNIPPET_AUTO_UPLOAD_CONFIG_CHANGED_EVENT, schedule);+ window.addEventListener("storage", schedule);+ });++ onUnmounted(() => {+ clearTimer();+ window.removeEventListener(SNIPPET_AUTO_UPLOAD_CONFIG_CHANGED_EVENT, schedule);+ window.removeEventListener("storage", schedule);+ });++ return {+ scheduleSnippetAutoUpload: schedule,+ runSnippetAutoUpload: runAutoUpload,+ };+}diff --git a/apps/desktop/src/i18n/locales/az.ts b/apps/desktop/src/i18n/locales/az.tsindex 29031c0188..c40cf3ca74 100644--- a/apps/desktop/src/i18n/locales/az.ts+++ b/apps/desktop/src/i18n/locales/az.ts@@ -7903,6 +7903,23 @@ export default withEnglishFallback({syncSnippetTokenDescription: "GitHub tokenlərinə Gists üçün yazma icazəsi lazımdır. Tokenlər heç vaxt sinxronlaşdırma anlıq nüsxəsinə daxil edilmir.",syncSnippetPassphrase: "Kod parçasının şifrələmə parolu",syncSnippetPassphraseDescription: "Bütün GitHub/Gitee anlıq nüsxəsini şifrələyir. Yadda saxlanılmır və sinxronlaşdırılan giriş məlumatlarının parolundan ayrıdır.",+ syncSnippetRememberPassphrase: "Şifrələmə parolunu bu cihazda təhlükəsiz saxla",+ syncSnippetRememberPassphraseDescription: "Parol bu cihazın açarı ilə şifrələnir və anlıq nüsxələrə daxil edilmir. Avtomatik yükləmə üçün saxlanmış token və bu parol tələb olunur.",+ syncSnippetAutoUpload: "Anlıq nüsxələri avtomatik yüklə",+ syncSnippetAutoUploadInterval: "Interval",+ syncSnippetAutoUploadDescription: "DBX açıq olduğu müddətdə işləyir; endirmələr əl ilə qalır. Dəyişməyən nüsxələr ötürülür. Uzaq kod parçası dəyişərsə avtomatik yükləmə dayanır və şifrələnmiş giriş məlumatları daxil edilmir. Hər kod parçası üçün bunu yalnız bir cihazda aktiv edin.",+ syncSnippetAutoUploadNeedsSetup: "Avtomatik yükləməni aktiv etməzdən əvvəl tokeni və şifrələmə parolunu saxlayın, sonra bir dəfə əl ilə yükləyin və ya endirin.",+ syncSnippetSecretsPassphrase: "Sinxronlaşdırılan giriş məlumatları üçün parol",+ syncSnippetSecretsPassphraseDescription:+ "Yalnız şifrələnmiş giriş məlumatlarını əlavə edərkən və ya bərpa edərkən lazımdır. Verilənlər bazası hesab məlumatları kimi həssas məlumatları qoruyur. Snapshot parolundan ayrıdır; eyni paroldan istifadə edə bilərsiniz, lakin DBX onu avtomatik təkrar istifadə etmir. Avtomatik yükləmələrə giriş məlumatları daxil edilmir.",+ syncSnippetAutoUploadChecking: "Avtomatik yükləmə tələbləri yoxlanılır...",+ syncSnippetAutoUploadRequirementSeparator: "; ",+ syncSnippetAutoUploadInvalidGitLabInstance: "GitLab nümunəsinin URL ünvanını düzəldin",+ syncSnippetAutoUploadMissingToken: "Giriş tokenini daxil edin, saxlama seçimini işarələyin və bu cihazda saxlamaq üçün Test düyməsinə basın",+ syncSnippetAutoUploadMissingPassphrase: "Kod parçasının şifrələmə parolunu daxil edin, saxlama seçimini işarələyin və bu cihazda saxlamaq üçün Test düyməsinə basın",+ syncSnippetAutoUploadMissingSnippet: "Kod parçası yaratmaq və uzaq bazanı qurmaq üçün bir dəfə əl ilə yükləyin",+ syncSnippetAutoUploadMissingBaseline: "Bu kod parçasını bir dəfə əl ilə uğurla yükləyin və ya endirin; Test yalnız əlçatanlığı yoxlayır, baza yaratmır",+ syncSnippetLastSuccessfulUpload: "Son uğurlu yükləmə: {time}",syncSnippetIncludeSecrets: "Yükləyərkən şifrələnmiş giriş məlumatlarını daxil et",syncSnippetRestoreSecrets: "Endirərkən şifrələnmiş giriş məlumatlarını bərpa et",syncSnippetTestSuccess: "Kod parçası sinxronlaşdırma hədəfi əlçatandır.",diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.tsindex eda77713d2..bf40b4fb3f 100644--- a/apps/desktop/src/i18n/locales/en.ts+++ b/apps/desktop/src/i18n/locales/en.ts@@ -9386,11 +9386,28 @@ export default {syncSnippetTokenDescription: "GitHub tokens need Gists write permission; GitLab personal access tokens need api scope. Tokens are never included in the sync snapshot.",syncSnippetPassphrase: "Snippet encryption password",syncSnippetPassphraseDescription: "Encrypts the complete snippet snapshot. It is not saved and is separate from the password for synced credentials.",+ syncSnippetRememberPassphrase: "Store the encryption password securely on this device",+ syncSnippetRememberPassphraseDescription: "It is encrypted with this device's key and never added to snapshots. Automatic uploads need a saved token and this password.",+ syncSnippetSecretsPassphrase: "Synced credentials password",+ syncSnippetSecretsPassphraseDescription:+ "Only needed when including or restoring encrypted credentials. It protects sensitive data such as database credentials. It is separate from the snapshot password; you may enter the same password, but DBX will not reuse it automatically. Automatic uploads never include credentials.",+ syncSnippetAutoUpload: "Automatically upload snapshots",+ syncSnippetAutoUploadInterval: "Interval",+ syncSnippetAutoUploadDescription: "Runs while DBX stays open. Downloads remain manual. Unchanged snapshots are skipped; automatic uploads pause if the remote snippet changes and never include encrypted credentials. Enable this on one device per snippet.",+ syncSnippetAutoUploadNeedsSetup: "Automatic upload is unavailable. Complete: {requirements}.",+ syncSnippetAutoUploadChecking: "Checking automatic upload requirements...",+ syncSnippetAutoUploadRequirementSeparator: "; ",+ syncSnippetAutoUploadInvalidGitLabInstance: "correct the GitLab instance URL",+ syncSnippetAutoUploadMissingToken: "enter the access token, select its save option, then click Test to save it on this device",+ syncSnippetAutoUploadMissingPassphrase: "enter the snippet encryption password, select its save option, then click Test to save it on this device",+ syncSnippetAutoUploadMissingSnippet: "manually upload once to create a snippet and establish its baseline",+ syncSnippetAutoUploadMissingBaseline: "successfully upload or download this snippet once; Test only checks access and does not establish a baseline",syncSnippetIncludeSecrets: "Include encrypted credentials when uploading",syncSnippetRestoreSecrets: "Restore encrypted credentials when downloading",syncSnippetTestSuccess: "The snippet sync target is accessible.",syncSnippetUploadSuccess: "Uploaded {bytes} bytes to snippet {id}.",syncSnippetDownloadSuccess: "Downloaded and applied {bytes} bytes from snippet {id}.",+ syncSnippetLastSuccessfulUpload: "Last successful upload: {time}",syncSnippetMigrateLegacy: "Migrate legacy snippet",syncSnippetMigrateLegacyRequired: "This legacy plaintext snippet must be migrated with the Migrate legacy snippet action.",syncSnippetMigrateLegacyConfirm: "DBX will first create an encrypted replacement, then permanently delete legacy plaintext snippet {id}. This cannot be undone. Continue?",diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.tsindex 7fbcacde72..7e2960c04e 100644--- a/apps/desktop/src/i18n/locales/es.ts+++ b/apps/desktop/src/i18n/locales/es.ts@@ -9253,6 +9253,23 @@ export default withEnglishFallback({routineSourceOpenModeDialogDescription: "Abrir el código fuente en una ventana emergente para una visualización y edición rápidas.",syncSnippetPassphrase: "Contraseña de cifrado del fragmento",syncSnippetPassphraseDescription: "Cifra la instantánea completa de GitHub/Gitee. No se guarda y es independiente de la contraseña para las credenciales sincronizadas.",+ syncSnippetRememberPassphrase: "Guardar de forma segura la contraseña de cifrado en este dispositivo",+ syncSnippetRememberPassphraseDescription: "Se cifra con la clave de este dispositivo y nunca se incluye en las instantáneas. La carga automática requiere guardar el token y esta contraseña.",+ syncSnippetAutoUpload: "Subir instantáneas automáticamente",+ syncSnippetAutoUploadInterval: "Intervalo",+ syncSnippetAutoUploadDescription: "Se ejecuta mientras DBX esté abierto; las descargas siguen siendo manuales. Omite las instantáneas sin cambios y se pausa si cambia el fragmento remoto. Nunca incluye credenciales cifradas. Actívelo en un solo dispositivo por fragmento.",+ syncSnippetAutoUploadNeedsSetup: "Guarde el token y la contraseña de cifrado, y suba o descargue una vez manualmente antes de activar la carga automática.",+ syncSnippetSecretsPassphrase: "Contraseña de credenciales sincronizadas",+ syncSnippetSecretsPassphraseDescription:+ "Solo se necesita al incluir o restaurar credenciales cifradas. Protege datos sensibles, como las credenciales de bases de datos. Es distinta de la contraseña de la instantánea; puede usar la misma, pero DBX no la reutiliza automáticamente. Las cargas automáticas no incluyen credenciales.",+ syncSnippetAutoUploadChecking: "Comprobando los requisitos de carga automática...",+ syncSnippetAutoUploadRequirementSeparator: "; ",+ syncSnippetAutoUploadInvalidGitLabInstance: "corrija la URL de la instancia de GitLab",+ syncSnippetAutoUploadMissingToken: "introduzca el token de acceso, marque la opción para guardarlo y pulse Probar para guardarlo en este dispositivo",+ syncSnippetAutoUploadMissingPassphrase: "introduzca la contraseña de cifrado del fragmento, marque la opción para guardarla y pulse Probar para guardarla en este dispositivo",+ syncSnippetAutoUploadMissingSnippet: "suba manualmente una vez para crear un fragmento y establecer la referencia remota",+ syncSnippetAutoUploadMissingBaseline: "suba o descargue correctamente este fragmento una vez; Probar solo comprueba el acceso y no establece una referencia",+ syncSnippetLastSuccessfulUpload: "Última carga correcta: {time}",syncSnippetIncludeSecrets: "Incluir credenciales cifradas al subir",syncSnippetRestoreSecrets: "Restaurar credenciales cifradas al descargar",syncSnippetMigrateLegacy: "Migrar fragmento heredado",diff --git a/apps/desktop/src/i18n/locales/id.ts b/apps/desktop/src/i18n/locales/id.tsindex 05291fa481..a09416b6ef 100644--- a/apps/desktop/src/i18n/locales/id.ts+++ b/apps/desktop/src/i18n/locales/id.ts@@ -8708,6 +8708,23 @@ export default withEnglishFallback({syncSnippetTokenDescription: "Token GitHub memerlukan izin tulis Gists; token akses pribadi GitLab memerlukan scope api. Token tidak pernah disertakan dalam snapshot sinkronisasi.",syncSnippetPassphrase: "Kata sandi enkripsi snippet",syncSnippetPassphraseDescription: "Mengenkripsi seluruh snapshot snippet. Tidak disimpan dan terpisah dari kata sandi untuk kredensial yang disinkronkan.",+ syncSnippetRememberPassphrase: "Simpan kata sandi enkripsi dengan aman di perangkat ini",+ syncSnippetRememberPassphraseDescription: "Kata sandi dienkripsi dengan kunci perangkat ini dan tidak pernah disertakan dalam snapshot. Unggahan otomatis memerlukan token tersimpan dan kata sandi ini.",+ syncSnippetAutoUpload: "Unggah snapshot secara otomatis",+ syncSnippetAutoUploadInterval: "Interval",+ syncSnippetAutoUploadDescription: "Berjalan selama DBX terbuka; unduhan tetap manual. Snapshot yang tidak berubah dilewati dan unggahan otomatis dijeda jika snippet jarak jauh berubah. Kredensial terenkripsi tidak pernah disertakan. Aktifkan hanya di satu perangkat untuk setiap snippet.",+ syncSnippetAutoUploadNeedsSetup: "Simpan token dan kata sandi enkripsi, lalu unggah atau unduh sekali secara manual sebelum mengaktifkan unggahan otomatis.",+ syncSnippetSecretsPassphrase: "Kata sandi kredensial tersinkron",+ syncSnippetSecretsPassphraseDescription:+ "Hanya diperlukan saat menyertakan atau memulihkan kredensial terenkripsi. Kata sandi ini melindungi data sensitif seperti kredensial basis data. Kata sandi ini terpisah dari kata sandi snapshot; Anda boleh memakai kata sandi yang sama, tetapi DBX tidak menggunakannya kembali secara otomatis. Unggahan otomatis tidak menyertakan kredensial.",+ syncSnippetAutoUploadChecking: "Memeriksa persyaratan unggahan otomatis...",+ syncSnippetAutoUploadRequirementSeparator: "; ",+ syncSnippetAutoUploadInvalidGitLabInstance: "perbaiki URL instans GitLab",+ syncSnippetAutoUploadMissingToken: "masukkan token akses, pilih opsi penyimpanan, lalu klik Tes untuk menyimpannya di perangkat ini",+ syncSnippetAutoUploadMissingPassphrase: "masukkan kata sandi enkripsi snippet, pilih opsi penyimpanan, lalu klik Tes untuk menyimpannya di perangkat ini",+ syncSnippetAutoUploadMissingSnippet: "unggah secara manual sekali untuk membuat snippet dan menetapkan kondisi awal jarak jauh",+ syncSnippetAutoUploadMissingBaseline: "unggah atau unduh snippet ini secara manual dengan sukses sekali; Tes hanya memeriksa akses dan tidak menetapkan kondisi awal",+ syncSnippetLastSuccessfulUpload: "Waktu unggahan berhasil terakhir: {time}",syncSnippetIncludeSecrets: "Sertakan kredensial terenkripsi saat mengunggah",syncSnippetRestoreSecrets: "Pulihkan kredensial terenkripsi saat mengunduh",syncSnippetTestSuccess: "Target sinkronisasi snippet dapat diakses.",diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.tsindex 4e3701249b..6b034920bd 100644--- a/apps/desktop/src/i18n/locales/it.ts+++ b/apps/desktop/src/i18n/locales/it.ts@@ -9000,6 +9000,24 @@ export default withEnglishFallback({routineSourceOpenModeDialogDescription: "Apre il codice sorgente in una finestra di dialogo a comparsa per una rapida visualizzazione e modifica.",syncSnippetPassphrase: "Password di crittografia dello snippet",syncSnippetPassphraseDescription: "Crittografa l'intero snapshot GitHub/Gitee. Non viene salvata ed è separata dalla password per le credenziali sincronizzate.",+ syncSnippetRememberPassphrase: "Salva in modo sicuro la password di crittografia su questo dispositivo",+ syncSnippetRememberPassphraseDescription: "Viene crittografata con la chiave di questo dispositivo e non viene mai aggiunta agli snapshot. Il caricamento automatico richiede un token salvato e questa password.",+ syncSnippetAutoUpload: "Carica automaticamente gli snapshot",+ syncSnippetAutoUploadInterval: "Intervallo",+ syncSnippetAutoUploadDescription:+ "Funziona mentre DBX è aperto; i download restano manuali. Gli snapshot invariati vengono saltati e il caricamento automatico si sospende se lo snippet remoto cambia. Le credenziali crittografate non vengono incluse. Attivare su un solo dispositivo per snippet.",+ syncSnippetAutoUploadNeedsSetup: "Salva il token e la password di crittografia, quindi carica o scarica una volta manualmente prima di attivare il caricamento automatico.",+ syncSnippetSecretsPassphrase: "Password delle credenziali sincronizzate",+ syncSnippetSecretsPassphraseDescription:+ "Necessaria solo quando includi o ripristini credenziali crittografate. Protegge dati sensibili come le credenziali del database. È distinta dalla password dello snapshot; puoi usare la stessa password, ma DBX non la riutilizza automaticamente. I caricamenti automatici non includono credenziali.",+ syncSnippetAutoUploadChecking: "Controllo dei requisiti di caricamento automatico...",+ syncSnippetAutoUploadRequirementSeparator: "; ",+ syncSnippetAutoUploadInvalidGitLabInstance: "correggi l'URL dell'istanza GitLab",+ syncSnippetAutoUploadMissingToken: "inserisci il token di accesso, seleziona l'opzione di salvataggio e fai clic su Test per salvarlo su questo dispositivo",+ syncSnippetAutoUploadMissingPassphrase: "inserisci la password di crittografia dello snippet, seleziona l'opzione di salvataggio e fai clic su Test per salvarla su questo dispositivo",+ syncSnippetAutoUploadMissingSnippet: "carica manualmente una volta per creare uno snippet e stabilire la versione remota di riferimento",+ syncSnippetAutoUploadMissingBaseline: "carica o scarica manualmente questo snippet con successo una volta; Test controlla solo l'accesso e non stabilisce una versione di riferimento",+ syncSnippetLastSuccessfulUpload: "Ultimo caricamento riuscito: {time}",syncSnippetIncludeSecrets: "Includi credenziali crittografate durante il caricamento",syncSnippetRestoreSecrets: "Ripristina credenziali crittografate durante il download",syncSnippetMigrateLegacy: "Migra snippet legacy",diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.tsindex a33efe9b43..19d831ed73 100644--- a/apps/desktop/src/i18n/locales/ja.ts+++ b/apps/desktop/src/i18n/locales/ja.ts@@ -9019,6 +9019,23 @@ export default withEnglishFallback({syncSnippetTokenDescription: "GitHub トークンには Gists の書き込み権限が必要です。トークンは同期スナップショットに含まれません。",syncSnippetPassphrase: "スニペット暗号化パスワード",syncSnippetPassphraseDescription: "GitHub/Gitee のスナップショット全体を暗号化します。保存されず、同期する認証情報用のパスワードとは別です。",+ syncSnippetRememberPassphrase: "暗号化パスワードをこの端末に安全に保存",+ syncSnippetRememberPassphraseDescription: "この端末の鍵で暗号化して保存し、スナップショットには含めません。自動アップロードには保存済みトークンとこのパスワードが必要です。",+ syncSnippetAutoUpload: "スナップショットを自動アップロード",+ syncSnippetAutoUploadInterval: "間隔",+ syncSnippetAutoUploadDescription: "DBX 起動中に実行します。ダウンロードは手動のままです。変更がないスナップショットは送信せず、リモートのスニペットが変わると自動アップロードを停止します。暗号化された認証情報は含めません。各スニペットで有効にする端末は 1 台にしてください。",+ syncSnippetAutoUploadNeedsSetup: "自動アップロードを有効にする前に、トークンと暗号化パスワードを保存し、一度手動でアップロードまたはダウンロードしてください。",+ syncSnippetSecretsPassphrase: "同期する認証情報のパスワード",+ syncSnippetSecretsPassphraseDescription:+ "暗号化された認証情報を含める、または復元するときのみ必要です。データベースの認証情報などの機密データを保護します。スナップショットのパスワードとは別です。同じパスワードも使えますが、DBX が自動的に再利用することはありません。自動アップロードに認証情報は含まれません。",+ syncSnippetAutoUploadChecking: "自動アップロードの条件を確認中...",+ syncSnippetAutoUploadRequirementSeparator: ";",+ syncSnippetAutoUploadInvalidGitLabInstance: "GitLab インスタンスの URL を修正してください",+ syncSnippetAutoUploadMissingToken: "アクセストークンを入力し、保存オプションを選択してから、テストをクリックしてこの端末に保存してください",+ syncSnippetAutoUploadMissingPassphrase: "スニペットの暗号化パスワードを入力し、保存オプションを選択してから、テストをクリックしてこの端末に保存してください",+ syncSnippetAutoUploadMissingSnippet: "スニペットを作成してリモートの基準を設定するため、手動で一度アップロードしてください",+ syncSnippetAutoUploadMissingBaseline: "このスニペットを一度手動で正常にアップロードまたはダウンロードしてください。テストは接続確認のみで、基準は作成しません",+ syncSnippetLastSuccessfulUpload: "最終アップロード成功日時:{time}",syncSnippetIncludeSecrets: "アップロード時に暗号化された認証情報を含める",syncSnippetRestoreSecrets: "ダウンロード時に暗号化された認証情報を復元する",syncSnippetTestSuccess: "スニペット同期ターゲットにアクセス可能です。",diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.tsindex 721ebb7a19..788bc2c3f6 100644--- a/apps/desktop/src/i18n/locales/ko.ts+++ b/apps/desktop/src/i18n/locales/ko.ts@@ -8121,6 +8121,24 @@ export default withEnglishFallback({syncSnippetToken: "액세스 토큰",syncSnippetRememberToken: "이 기기에 암호화하여 저장",syncSnippetTokenDescription: "GitHub 토큰에는 Gists 쓰기 권한이 필요합니다. 토큰은 동기화 스냅샷에 절대 포함되지 않습니다.",+ syncSnippetPassphrase: "스니펫 암호화 비밀번호",+ syncSnippetPassphraseDescription: "스니펫 스냅샷 전체를 암호화합니다. 이 비밀번호는 저장되지 않으며 동기화 자격 증명 비밀번호와 별개입니다.",+ syncSnippetRememberPassphrase: "이 기기에 암호화 비밀번호를 안전하게 저장",+ syncSnippetRememberPassphraseDescription: "이 기기의 키로 암호화하여 저장하며 스냅샷에는 포함하지 않습니다. 자동 업로드에는 저장된 토큰과 이 비밀번호가 필요합니다.",+ syncSnippetAutoUpload: "스냅샷 자동 업로드",+ syncSnippetAutoUploadInterval: "간격",+ syncSnippetAutoUploadDescription: "DBX가 실행 중일 때 동작하며 다운로드는 수동으로 유지됩니다. 변경되지 않은 스냅샷은 건너뛰고 원격 스니펫 변경이 감지되면 자동 업로드를 일시 중지합니다. 암호화된 자격 증명은 포함하지 않습니다. 스니펫마다 한 기기에서만 활성화하세요.",+ syncSnippetAutoUploadNeedsSetup: "자동 업로드를 활성화하기 전에 토큰과 암호화 비밀번호를 저장하고 한 번 수동으로 업로드하거나 다운로드하세요.",+ syncSnippetSecretsPassphrase: "동기화된 자격 증명 비밀번호",+ syncSnippetSecretsPassphraseDescription: "암호화된 자격 증명을 포함하거나 복원할 때만 필요합니다. 데이터베이스 자격 증명과 같은 민감한 데이터를 보호합니다. 스냅샷 암호와 별개이며 같은 암호를 사용할 수 있지만 DBX가 자동으로 재사용하지 않습니다. 자동 업로드에는 자격 증명이 포함되지 않습니다.",+ syncSnippetAutoUploadChecking: "자동 업로드 조건 확인 중...",+ syncSnippetAutoUploadRequirementSeparator: "; ",+ syncSnippetAutoUploadInvalidGitLabInstance: "GitLab 인스턴스 URL을 수정하세요",+ syncSnippetAutoUploadMissingToken: "액세스 토큰을 입력하고 저장 옵션을 선택한 다음 테스트를 눌러 이 기기에 저장하세요",+ syncSnippetAutoUploadMissingPassphrase: "스니펫 암호화 비밀번호를 입력하고 저장 옵션을 선택한 다음 테스트를 눌러 이 기기에 저장하세요",+ syncSnippetAutoUploadMissingSnippet: "스니펫을 만들고 원격 기준을 설정하려면 한 번 수동으로 업로드하세요",+ syncSnippetAutoUploadMissingBaseline: "이 스니펫을 한 번 수동으로 업로드하거나 다운로드하세요. 테스트는 연결만 확인하며 기준을 만들지 않습니다",+ syncSnippetLastSuccessfulUpload: "최근 업로드 성공 시간: {time}",syncSnippetTestSuccess: "스니펫 동기화 대상에 접근할 수 있습니다.",syncSnippetUploadSuccess: "스니펫 {id}에 {bytes}바이트를 업로드했습니다.",syncSnippetDownloadSuccess: "스니펫 {id}에서 {bytes}바이트를 다운로드하여 적용했습니다.",diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.tsindex af68382be0..d551f65ef3 100644--- a/apps/desktop/src/i18n/locales/pt-BR.ts+++ b/apps/desktop/src/i18n/locales/pt-BR.ts@@ -8998,6 +8998,23 @@ export default withEnglishFallback({routineSourceOpenModeDialogDescription: "Abrir código-fonte em uma caixa de diálogo pop-up, facilitando a visualização e edição rápida.",syncSnippetPassphrase: "Senha de criptografia do snippet",syncSnippetPassphraseDescription: "Criptografa todo o snapshot do GitHub/Gitee. Não é salva e é separada da senha das credenciais sincronizadas.",+ syncSnippetRememberPassphrase: "Salvar a senha de criptografia com segurança neste dispositivo",+ syncSnippetRememberPassphraseDescription: "Ela é criptografada com a chave deste dispositivo e nunca é incluída nos snapshots. O envio automático requer um token salvo e esta senha.",+ syncSnippetAutoUpload: "Enviar snapshots automaticamente",+ syncSnippetAutoUploadInterval: "Intervalo",+ syncSnippetAutoUploadDescription: "Funciona enquanto o DBX estiver aberto; os downloads continuam manuais. Snapshots inalterados são ignorados e o envio automático é pausado se o snippet remoto mudar. Credenciais criptografadas nunca são incluídas. Ative em apenas um dispositivo por snippet.",+ syncSnippetAutoUploadNeedsSetup: "Salve o token e a senha de criptografia e faça um envio ou download manual antes de ativar o envio automático.",+ syncSnippetSecretsPassphrase: "Senha das credenciais sincronizadas",+ syncSnippetSecretsPassphraseDescription:+ "Necessária apenas ao incluir ou restaurar credenciais criptografadas. Ela protege dados sensíveis, como credenciais de banco de dados. É diferente da senha do snapshot; você pode usar a mesma senha, mas o DBX não a reutiliza automaticamente. Envios automáticos nunca incluem credenciais.",+ syncSnippetAutoUploadChecking: "Verificando os requisitos de envio automático...",+ syncSnippetAutoUploadRequirementSeparator: "; ",+ syncSnippetAutoUploadInvalidGitLabInstance: "corrija a URL da instância do GitLab",+ syncSnippetAutoUploadMissingToken: "informe o token de acesso, marque a opção para salvá-lo e clique em Testar para armazená-lo neste dispositivo",+ syncSnippetAutoUploadMissingPassphrase: "informe a senha de criptografia do snippet, marque a opção para salvá-la e clique em Testar para armazená-la neste dispositivo",+ syncSnippetAutoUploadMissingSnippet: "faça um envio manual para criar um snippet e estabelecer a referência remota",+ syncSnippetAutoUploadMissingBaseline: "envie ou baixe este snippet manualmente com sucesso; Testar verifica apenas o acesso e não cria uma referência",+ syncSnippetLastSuccessfulUpload: "Último envio bem-sucedido: {time}",syncSnippetIncludeSecrets: "Incluir credenciais criptografadas ao enviar",syncSnippetRestoreSecrets: "Restaurar credenciais criptografadas ao baixar",syncSnippetMigrateLegacy: "Migrar snippet legado",diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.tsindex 100e0f6c39..6c5d743394 100644--- a/apps/desktop/src/i18n/locales/ru.ts+++ b/apps/desktop/src/i18n/locales/ru.ts@@ -9581,6 +9581,24 @@ export default withEnglishFallback({syncSnippetTokenDescription: "Токенам GitHub нужно разрешение на запись Gists; персональным токенам доступа GitLab нужна область api. Токены никогда не включаются в снимок синхронизации.",syncSnippetPassphrase: "Пароль шифрования сниппета",syncSnippetPassphraseDescription: "Шифрует весь снимок сниппета. Он не сохраняется и отделён от пароля для синхронизируемых учётных данных.",+ syncSnippetRememberPassphrase: "Безопасно сохранить пароль шифрования на этом устройстве",+ syncSnippetRememberPassphraseDescription: "Он шифруется ключом этого устройства и не включается в снимки. Для автоматической загрузки нужны сохранённый токен и этот пароль.",+ syncSnippetAutoUpload: "Автоматически загружать снимки",+ syncSnippetAutoUploadInterval: "Интервал",+ syncSnippetAutoUploadDescription:+ "Работает, пока DBX открыт; скачивание остаётся ручным. Неизменённые снимки пропускаются, а автоматическая загрузка приостанавливается при изменении удалённого сниппета. Зашифрованные учётные данные не включаются. Включайте на одном устройстве для каждого сниппета.",+ syncSnippetAutoUploadNeedsSetup: "Сохраните токен и пароль шифрования, затем вручную загрузите или скачайте данные один раз перед включением автоматической загрузки.",+ syncSnippetSecretsPassphrase: "Пароль синхронизируемых учётных данных",+ syncSnippetSecretsPassphraseDescription:+ "Нужен только при добавлении или восстановлении зашифрованных учётных данных. Он защищает важные данные, например учётные данные базы данных. Это отдельный пароль от пароля снимка; можно использовать тот же пароль, но DBX не будет подставлять его автоматически. Автоматическая загрузка не включает учётные данные.",+ syncSnippetAutoUploadChecking: "Проверка условий автоматической загрузки...",+ syncSnippetAutoUploadRequirementSeparator: "; ",+ syncSnippetAutoUploadInvalidGitLabInstance: "исправьте URL экземпляра GitLab",+ syncSnippetAutoUploadMissingToken: "введите токен доступа, выберите параметр сохранения и нажмите «Тест», чтобы сохранить его на этом устройстве",+ syncSnippetAutoUploadMissingPassphrase: "введите пароль шифрования сниппета, выберите параметр сохранения и нажмите «Тест», чтобы сохранить его на этом устройстве",+ syncSnippetAutoUploadMissingSnippet: "вручную загрузите данные один раз, чтобы создать сниппет и задать удалённую исходную версию",+ syncSnippetAutoUploadMissingBaseline: "вручную успешно загрузите или скачайте этот сниппет один раз; «Тест» проверяет только доступ и не задаёт исходную версию",+ syncSnippetLastSuccessfulUpload: "Последняя успешная загрузка: {time}",syncSnippetIncludeSecrets: "Включать зашифрованные учётные данные при загрузке",syncSnippetRestoreSecrets: "Восстанавливать зашифрованные учётные данные при скачивании",syncSnippetTestSuccess: "Цель синхронизации через сниппеты доступна.",diff --git a/apps/desktop/src/i18n/locales/tr.ts b/apps/desktop/src/i18n/locales/tr.tsindex 9049e57c36..a4480cdbb9 100644--- a/apps/desktop/src/i18n/locales/tr.ts+++ b/apps/desktop/src/i18n/locales/tr.ts@@ -7801,6 +7801,23 @@ export default withEnglishFallback({syncSnippetTokenDescription: "GitHub belirteçleri Gists yazma yetkisi gerektirir. Belirteçler eşitleme anlık görüntüsüne hiçbir zaman dâhil edilmez.",syncSnippetPassphrase: "Parçacık şifreleme parolası",syncSnippetPassphraseDescription: "GitHub/Gitee anlık görüntüsünün tamamını şifreler. Kaydedilmez ve eşitlenen kimlik bilgilerinin parolasından ayrıdır.",+ syncSnippetRememberPassphrase: "Şifreleme parolasını bu cihazda güvenle sakla",+ syncSnippetRememberPassphraseDescription: "Bu cihazın anahtarıyla şifrelenir ve anlık görüntülere eklenmez. Otomatik yükleme için kayıtlı token ve bu parola gerekir.",+ syncSnippetAutoUpload: "Anlık görüntüleri otomatik yükle",+ syncSnippetAutoUploadInterval: "Aralık",+ syncSnippetAutoUploadDescription: "DBX açıkken çalışır; indirmeler elle yapılır. Değişmemiş anlık görüntüler atlanır ve uzak kod parçası değişirse otomatik yükleme duraklatılır. Şifrelenmiş kimlik bilgileri eklenmez. Her kod parçası için yalnızca bir cihazda etkinleştirin.",+ syncSnippetAutoUploadNeedsSetup: "Otomatik yüklemeyi etkinleştirmeden önce tokeni ve şifreleme parolasını kaydedip bir kez elle yükleyin veya indirin.",+ syncSnippetSecretsPassphrase: "Eşitlenen kimlik bilgileri parolası",+ syncSnippetSecretsPassphraseDescription:+ "Yalnızca şifrelenmiş kimlik bilgileri eklenirken veya geri yüklenirken gerekir. Veritabanı kimlik bilgileri gibi hassas verileri korur. Anlık görüntü parolasından ayrıdır; aynı parolayı kullanabilirsiniz ancak DBX bunu otomatik olarak yeniden kullanmaz. Otomatik yüklemelere kimlik bilgileri dahil edilmez.",+ syncSnippetAutoUploadChecking: "Otomatik yükleme gereksinimleri denetleniyor...",+ syncSnippetAutoUploadRequirementSeparator: "; ",+ syncSnippetAutoUploadInvalidGitLabInstance: "GitLab örnek URL'sini düzeltin",+ syncSnippetAutoUploadMissingToken: "erişim tokenini girin, kaydetme seçeneğini işaretleyin ve bu cihaza kaydetmek için Test'e tıklayın",+ syncSnippetAutoUploadMissingPassphrase: "kod parçası şifreleme parolasını girin, kaydetme seçeneğini işaretleyin ve bu cihaza kaydetmek için Test'e tıklayın",+ syncSnippetAutoUploadMissingSnippet: "kod parçası oluşturmak ve uzak başlangıç noktasını belirlemek için bir kez elle yükleyin",+ syncSnippetAutoUploadMissingBaseline: "bu kod parçasını bir kez elle başarıyla yükleyin veya indirin; Test yalnızca erişimi denetler, başlangıç noktası oluşturmaz",+ syncSnippetLastSuccessfulUpload: "Son başarılı yükleme: {time}",syncSnippetIncludeSecrets: "Yüklerken şifreli kimlik bilgilerini dâhil et",syncSnippetRestoreSecrets: "İndirirken şifreli kimlik bilgilerini geri yükle",syncSnippetTestSuccess: "Parçacık eşitleme hedefine erişilebiliyor.",diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.tsindex 3a423082ab..5ac3eb450b 100644--- a/apps/desktop/src/i18n/locales/zh-CN.ts+++ b/apps/desktop/src/i18n/locales/zh-CN.ts@@ -9367,11 +9367,27 @@ export default withEnglishFallback({syncSnippetTokenDescription: "GitHub 需要 Gists 写权限;GitLab 个人访问令牌需要 api 权限。令牌不会写入同步快照。",syncSnippetPassphrase: "代码片段加密密码",syncSnippetPassphraseDescription: "用于加密完整的代码片段快照,不会保存,且与敏感信息同步密码相互独立。",+ syncSnippetRememberPassphrase: "在本机安全保存加密密码",+ syncSnippetRememberPassphraseDescription: "密码使用本机设备密钥加密保存,不会写入快照。自动上传需要同时保存访问令牌和此密码。",+ syncSnippetSecretsPassphrase: "敏感信息同步密码",+ syncSnippetSecretsPassphraseDescription: "仅在勾选上传或恢复加密敏感信息时需要,用于保护数据库凭据等敏感数据。它与上方的快照加密密码独立;可以填写相同密码,但不会自动复用。自动上传不会包含敏感信息。",+ syncSnippetAutoUpload: "自动上传快照",+ syncSnippetAutoUploadInterval: "间隔",+ syncSnippetAutoUploadDescription: "DBX 保持打开时运行,下载仍需手动确认。快照未变化时会跳过;检测到远端代码片段变化时会暂停自动上传,且自动上传不会包含加密敏感信息。每个代码片段只在一台设备启用。",+ syncSnippetAutoUploadNeedsSetup: "自动上传暂不可用,请完成:{requirements}。",+ syncSnippetAutoUploadChecking: "正在检查自动上传条件……",+ syncSnippetAutoUploadRequirementSeparator: ";",+ syncSnippetAutoUploadInvalidGitLabInstance: "修正 GitLab 实例地址",+ syncSnippetAutoUploadMissingToken: "输入访问令牌,勾选“加密保存在本机”,再点“测试”保存到本机",+ syncSnippetAutoUploadMissingPassphrase: "输入代码片段加密密码,勾选“在本机安全保存加密密码”,再点“测试”保存到本机",+ syncSnippetAutoUploadMissingSnippet: "先手动上传一次,创建代码片段并建立远端基线",+ syncSnippetAutoUploadMissingBaseline: "对当前代码片段成功手动上传或下载一次;“测试”只检查连通性,不会建立基线",syncSnippetIncludeSecrets: "上传时包含加密敏感信息",syncSnippetRestoreSecrets: "下载时恢复加密敏感信息",syncSnippetTestSuccess: "代码片段同步目标可访问。",syncSnippetUploadSuccess: "已上传 {bytes} 字节到代码片段 {id}。",syncSnippetDownloadSuccess: "已从代码片段 {id} 下载并应用 {bytes} 字节。",+ syncSnippetLastSuccessfulUpload: "最近上传成功时间:{time}",syncSnippetMigrateLegacy: "迁移旧版代码片段",syncSnippetMigrateLegacyRequired: "此旧版明文代码片段必须通过“迁移旧版代码片段”操作处理。",syncSnippetMigrateLegacyConfirm: "DBX 会先创建新的加密代码片段,再永久删除旧明文代码片段 {id}。此操作无法撤销,是否继续?",diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.tsindex 7f53cdb6df..51876c5060 100644--- a/apps/desktop/src/i18n/locales/zh-TW.ts+++ b/apps/desktop/src/i18n/locales/zh-TW.ts@@ -8350,6 +8350,22 @@ export default withEnglishFallback({routineSourceOpenModeDialogDescription: "在彈出對話方塊中開啟原始碼,方便快速檢視和編輯。",syncSnippetPassphrase: "程式碼片段加密密碼",syncSnippetPassphraseDescription: "用於加密完整的 GitHub/Gitee 快照。不會儲存,且與同步認證資訊的密碼分開。",+ syncSnippetRememberPassphrase: "在此裝置安全儲存加密密碼",+ syncSnippetRememberPassphraseDescription: "密碼會使用此裝置的金鑰加密,且不會寫入快照。自動上傳需要同時儲存存取權杖和此密碼。",+ syncSnippetAutoUpload: "自動上傳快照",+ syncSnippetAutoUploadInterval: "間隔",+ syncSnippetAutoUploadDescription: "DBX 開啟時執行,下載仍需手動確認。快照未變更時會略過;偵測到遠端程式碼片段變更時會暫停自動上傳,且自動上傳不會包含加密敏感資訊。每個程式碼片段只在一台裝置啟用。",+ syncSnippetAutoUploadNeedsSetup: "請先儲存存取權杖和加密密碼,再手動上傳或下載一次,然後啟用自動上傳。",+ syncSnippetSecretsPassphrase: "同步敏感資訊密碼",+ syncSnippetSecretsPassphraseDescription: "僅在包含或還原加密認證資訊時需要,用於保護資料庫認證等敏感資料。此密碼與快照密碼分開;可以填寫相同密碼,但 DBX 不會自動重複使用。自動上傳不會包含認證資訊。",+ syncSnippetAutoUploadChecking: "正在檢查自動上傳條件……",+ syncSnippetAutoUploadRequirementSeparator: ";",+ syncSnippetAutoUploadInvalidGitLabInstance: "修正 GitLab 執行個體網址",+ syncSnippetAutoUploadMissingToken: "輸入存取權杖,勾選儲存選項,再按「測試」將其儲存至此裝置",+ syncSnippetAutoUploadMissingPassphrase: "輸入程式碼片段加密密碼,勾選儲存選項,再按「測試」將其儲存至此裝置",+ syncSnippetAutoUploadMissingSnippet: "先手動上傳一次,建立程式碼片段並設定遠端基準",+ syncSnippetAutoUploadMissingBaseline: "手動成功上傳或下載此程式碼片段一次;「測試」只會檢查連線,不會建立基準",+ syncSnippetLastSuccessfulUpload: "最近上傳成功時間:{time}",syncSnippetIncludeSecrets: "上傳時包含加密認證資訊",syncSnippetRestoreSecrets: "下載時還原加密認證資訊",syncSnippetMigrateLegacy: "遷移舊版程式碼片段",diff --git a/apps/desktop/src/lib/backend/api.ts b/apps/desktop/src/lib/backend/api.tsindex 64bb5cb3fb..911d85a021 100644--- a/apps/desktop/src/lib/backend/api.ts+++ b/apps/desktop/src/lib/backend/api.ts@@ -453,6 +453,9 @@ export const snippetSyncTest = forward("snippetSyncTest");export const snippetTokenStatus = forward("snippetTokenStatus");export const saveSnippetSavedToken = forward("saveSnippetSavedToken");export const forgetSnippetSavedToken = forward("forgetSnippetSavedToken");+export const snippetPassphraseStatus = forward("snippetPassphraseStatus");+export const saveSnippetSavedPassphrase = forward("saveSnippetSavedPassphrase");+export const forgetSnippetSavedPassphrase = forward("forgetSnippetSavedPassphrase");export const snippetSyncSettings = forward("snippetSyncSettings");export const snippetSyncInspect = forward("snippetSyncInspect");export const saveSnippetSyncId = forward("saveSnippetSyncId");@@ -1061,6 +1064,7 @@ export type {SnippetSyncSummary,SnippetDownloadResult,SnippetTokenStatus,+ SnippetPassphraseStatus,McpServerStatus,McpHttpServerSettings,McpHttpServerStatus,diff --git a/apps/desktop/src/lib/backend/http.ts b/apps/desktop/src/lib/backend/http.tsindex 679369b45e..abca22d992 100644--- a/apps/desktop/src/lib/backend/http.ts+++ b/apps/desktop/src/lib/backend/http.ts@@ -2681,6 +2681,8 @@ export interface SnippetSyncSummary {bytes: number;exportedAt?: string;appVersion?: string;+ remoteContentHash?: string;+ unchanged: boolean;legacyCleanupRequiredId?: string;}@@ -2695,6 +2697,10 @@ export interface SnippetTokenStatus {hasSavedToken: boolean;}+export interface SnippetPassphraseStatus {+ hasSavedPassphrase: boolean;+}+export async function webdavSyncTest(config: WebDavConfig): Promise<void> {return post("/api/cloud-sync/webdav/test", { config });}@@ -2776,6 +2782,18 @@ export async function forgetSnippetSavedToken(config: SnippetSyncConfig): Promisawait post("/api/cloud-sync/snippet/forget-token", { config });}+export async function snippetPassphraseStatus(config: SnippetSyncConfig): Promise<SnippetPassphraseStatus> {+ return post("/api/cloud-sync/snippet/passphrase-status", { config });+}++export async function saveSnippetSavedPassphrase(config: SnippetSyncConfig, passphrase: string): Promise<void> {+ await post("/api/cloud-sync/snippet/save-passphrase", { config, passphrase });+}++export async function forgetSnippetSavedPassphrase(config: SnippetSyncConfig): Promise<void> {+ await post("/api/cloud-sync/snippet/forget-passphrase", { config });+}+export async function snippetSyncSettings(provider: SnippetProvider, instanceUrl?: string): Promise<SnippetSyncSettings> {return post("/api/cloud-sync/snippet/settings", { provider, instanceUrl });}@@ -2792,7 +2810,7 @@ export async function snippetSyncInspect(config: SnippetSyncConfig, snippetPasspreturn post("/api/cloud-sync/snippet/inspect", { config, snippetPassphrase, secretsPassphrase });}-export async function snippetSyncUpload(config: SnippetSyncConfig, editorSettings?: unknown, snippetPassphrase?: string, includeSecrets = false, secretsPassphrase?: string, selection?: SyncSelection): Promise<SnippetSyncSummary> {+export async function snippetSyncUpload(config: SnippetSyncConfig, editorSettings?: unknown, snippetPassphrase?: string, includeSecrets = false, secretsPassphrase?: string, selection?: SyncSelection, expectedRemoteContentHash?: string): Promise<SnippetSyncSummary> {return post("/api/cloud-sync/snippet/upload", {config,editorSettings,@@ -2800,6 +2818,7 @@ export async function snippetSyncUpload(config: SnippetSyncConfig, editorSettingincludeSecrets,secretsPassphrase,selection,+ expectedRemoteContentHash,});}diff --git a/apps/desktop/src/lib/backend/tauri.ts b/apps/desktop/src/lib/backend/tauri.tsindex 53cd7f9436..9908a97a64 100644--- a/apps/desktop/src/lib/backend/tauri.ts+++ b/apps/desktop/src/lib/backend/tauri.ts@@ -497,6 +497,8 @@ export interface SnippetSyncSummary {bytes: number;exportedAt?: string;appVersion?: string;+ remoteContentHash?: string;+ unchanged: boolean;legacyCleanupRequiredId?: string;}@@ -511,6 +513,10 @@ export interface SnippetTokenStatus {hasSavedToken: boolean;}+export interface SnippetPassphraseStatus {+ hasSavedPassphrase: boolean;+}+export interface AppSupportInfo {appVersion: string;runtime: "desktop" | "web";@@ -1229,6 +1235,18 @@ export async function forgetSnippetSavedToken(config: SnippetSyncConfig): Promisreturn invoke("forget_snippet_saved_token", { config });}+export async function snippetPassphraseStatus(config: SnippetSyncConfig): Promise<SnippetPassphraseStatus> {+ return invoke("snippet_passphrase_status", { config });+}++export async function saveSnippetSavedPassphrase(config: SnippetSyncConfig, passphrase: string): Promise<void> {+ return invoke("save_snippet_saved_passphrase", { config, passphrase });+}++export async function forgetSnippetSavedPassphrase(config: SnippetSyncConfig): Promise<void> {+ return invoke("forget_snippet_saved_passphrase", { config });+}+export async function snippetSyncSettings(provider: SnippetProvider, instanceUrl?: string): Promise<SnippetSyncSettings> {return invoke("snippet_sync_settings", { provider, instanceUrl });}@@ -1245,7 +1263,7 @@ export async function snippetSyncInspect(config: SnippetSyncConfig, snippetPasspreturn invoke("snippet_sync_inspect", { config, snippetPassphrase, secretsPassphrase });}-export async function snippetSyncUpload(config: SnippetSyncConfig, editorSettings?: unknown, snippetPassphrase?: string, includeSecrets = false, secretsPassphrase?: string, selection?: SyncSelection): Promise<SnippetSyncSummary> {+export async function snippetSyncUpload(config: SnippetSyncConfig, editorSettings?: unknown, snippetPassphrase?: string, includeSecrets = false, secretsPassphrase?: string, selection?: SyncSelection, expectedRemoteContentHash?: string): Promise<SnippetSyncSummary> {return invoke("snippet_sync_upload", {config,editorSettings,@@ -1253,6 +1271,7 @@ export async function snippetSyncUpload(config: SnippetSyncConfig, editorSettingincludeSecrets,secretsPassphrase,selection,+ expectedRemoteContentHash,});}diff --git a/apps/desktop/src/lib/cloudSync/snippetAutoUploadConfig.ts b/apps/desktop/src/lib/cloudSync/snippetAutoUploadConfig.tsnew file mode 100644index 0000000000..73e90ceb20--- /dev/null+++ b/apps/desktop/src/lib/cloudSync/snippetAutoUploadConfig.ts@@ -0,0 +1,120 @@+import type { SnippetProvider, SyncSelection } from "@/lib/backend/api";+import { safeLocalStorageGet, safeLocalStorageRemove, safeLocalStorageSet } from "@/lib/backend/safeStorage";++export const SNIPPET_AUTO_UPLOAD_CONFIG_CHANGED_EVENT = "dbx:snippet-auto-upload-config-changed";+export const SNIPPET_LAST_UPLOAD_CHANGED_EVENT = "dbx:snippet-last-upload-changed";+export const SNIPPET_AUTO_UPLOAD_SELECTION_STORAGE_KEY_PREFIX = "dbx-snippet-auto-upload-selection-";+const SNIPPET_LAST_UPLOAD_STORAGE_KEY_PREFIX = "dbx-snippet-last-upload-";+export const DEFAULT_SNIPPET_AUTO_UPLOAD_INTERVAL_MINUTES = 30;+export const MAX_SNIPPET_AUTO_UPLOAD_INTERVAL_MINUTES = 1440;++let snippetSyncQueue: Promise<void> = Promise.resolve();++export async function withSnippetSyncLock<T>(operation: () => Promise<T>): Promise<T> {+ const previous = snippetSyncQueue;+ let release!: () => void;+ snippetSyncQueue = new Promise<void>((resolve) => {+ release = resolve;+ });+ await previous;+ try {+ return await operation();+ } finally {+ release();+ }+}++export interface SnippetAutoUploadConfig {+ provider: SnippetProvider;+ instanceUrl?: string;+ enabled: boolean;+ intervalMinutes: number;+}++function normalizedProvider(value: string | null): SnippetProvider {+ return value === "gitee" || value === "gitlab" ? value : "github";+}++export function normalizedSnippetAutoUploadInterval(value: unknown): number {+ if (value === null || value === undefined || (typeof value === "string" && !value.trim())) {+ return DEFAULT_SNIPPET_AUTO_UPLOAD_INTERVAL_MINUTES;+ }+ const numberValue = Number(value);+ if (!Number.isFinite(numberValue)) return DEFAULT_SNIPPET_AUTO_UPLOAD_INTERVAL_MINUTES;+ return Math.max(1, Math.min(MAX_SNIPPET_AUTO_UPLOAD_INTERVAL_MINUTES, Math.round(numberValue)));+}++function snippetScope(provider: SnippetProvider, instanceUrl?: string): string {+ const scope = provider === "gitlab" ? instanceUrl?.trim().replace(/\/$/, "") || "https://gitlab.com" : "default";+ return `${provider}-${encodeURIComponent(scope)}`;+}++function preferenceKey(kind: "enabled" | "interval", provider: SnippetProvider, instanceUrl?: string): string {+ return `dbx-snippet-auto-upload-${kind}-${snippetScope(provider, instanceUrl)}`;+}++export function readSnippetAutoUploadConfig(): SnippetAutoUploadConfig {+ const provider = normalizedProvider(safeLocalStorageGet("dbx-snippet-provider"));+ const instanceUrl = safeLocalStorageGet("dbx-gitlab-instance-url")?.trim().replace(/\/$/, "") || "https://gitlab.com";+ return {+ provider,+ instanceUrl: provider === "gitlab" ? instanceUrl : undefined,+ enabled: safeLocalStorageGet(preferenceKey("enabled", provider, instanceUrl)) === "true",+ intervalMinutes: normalizedSnippetAutoUploadInterval(safeLocalStorageGet(preferenceKey("interval", provider, instanceUrl))),+ };+}++export function writeSnippetAutoUploadFields(provider: SnippetProvider, instanceUrl: string | undefined, values: { enabled: boolean; intervalMinutes: unknown }) {+ safeLocalStorageSet(preferenceKey("enabled", provider, instanceUrl), String(values.enabled));+ safeLocalStorageSet(preferenceKey("interval", provider, instanceUrl), String(normalizedSnippetAutoUploadInterval(values.intervalMinutes)));+ if (typeof window !== "undefined") window.dispatchEvent(new Event(SNIPPET_AUTO_UPLOAD_CONFIG_CHANGED_EVENT));+}++export function snippetAutoUploadSelectionKey(provider: SnippetProvider, instanceUrl?: string): string {+ return `${SNIPPET_AUTO_UPLOAD_SELECTION_STORAGE_KEY_PREFIX}${snippetScope(provider, instanceUrl)}`;+}++export function readSnippetAutoUploadSelection(provider: SnippetProvider, instanceUrl?: string): SyncSelection | undefined {+ const serialized = safeLocalStorageGet(snippetAutoUploadSelectionKey(provider, instanceUrl));+ if (!serialized) return undefined;+ try {+ const selection = JSON.parse(serialized) as SyncSelection;+ if (typeof selection !== "object" || selection === null || typeof selection.includeSecrets !== "boolean") return undefined;+ return { ...selection, includeSecrets: false };+ } catch {+ return undefined;+ }+}++export function writeSnippetAutoUploadSelection(provider: SnippetProvider, instanceUrl: string | undefined, selection: SyncSelection) {+ safeLocalStorageSet(snippetAutoUploadSelectionKey(provider, instanceUrl), JSON.stringify({ ...selection, includeSecrets: false }));+}++export function snippetRemoteContentHashKey(provider: SnippetProvider, instanceUrl: string | undefined, snippetId: string): string {+ return `dbx-snippet-auto-upload-remote-hash-${snippetScope(provider, instanceUrl)}-${encodeURIComponent(snippetId.trim())}`;+}++export function readSnippetRemoteContentHash(provider: SnippetProvider, instanceUrl: string | undefined, snippetId: string): string | undefined {+ return safeLocalStorageGet(snippetRemoteContentHashKey(provider, instanceUrl, snippetId)) || undefined;+}++export function writeSnippetRemoteContentHash(provider: SnippetProvider, instanceUrl: string | undefined, snippetId: string, remoteContentHash: string | undefined) {+ const key = snippetRemoteContentHashKey(provider, instanceUrl, snippetId);+ if (remoteContentHash) safeLocalStorageSet(key, remoteContentHash);+ else safeLocalStorageRemove(key);+}++function snippetLastUploadKey(provider: SnippetProvider, instanceUrl: string | undefined, snippetId: string): string {+ return `${SNIPPET_LAST_UPLOAD_STORAGE_KEY_PREFIX}${snippetScope(provider, instanceUrl)}-${encodeURIComponent(snippetId.trim())}`;+}++export function readSnippetLastSuccessfulUpload(provider: SnippetProvider, instanceUrl: string | undefined, snippetId: string): string | undefined {+ if (!snippetId.trim()) return undefined;+ return safeLocalStorageGet(snippetLastUploadKey(provider, instanceUrl, snippetId)) || undefined;+}++export function writeSnippetLastSuccessfulUpload(provider: SnippetProvider, instanceUrl: string | undefined, snippetId: string, uploadedAt = new Date().toISOString()) {+ if (!snippetId.trim()) return;+ safeLocalStorageSet(snippetLastUploadKey(provider, instanceUrl, snippetId), uploadedAt);+ if (typeof window !== "undefined") window.dispatchEvent(new Event(SNIPPET_LAST_UPLOAD_CHANGED_EVENT));+}diff --git a/apps/desktop/src/stores/__tests__/queryStore.titleSuffix.spec.ts b/apps/desktop/src/stores/__tests__/queryStore.titleSuffix.spec.tsindex 52550dbaa3..312eaac29a 100644--- a/apps/desktop/src/stores/__tests__/queryStore.titleSuffix.spec.ts+++ b/apps/desktop/src/stores/__tests__/queryStore.titleSuffix.spec.ts@@ -1,5 +1,6 @@import { createPinia, setActivePinia } from "pinia";import { beforeEach, describe, expect, it, vi } from "vitest";+import { nextTick } from "vue";import { TAB_TITLE_SUFFIX_MAX_LENGTH } from "@/lib/tabs/tabPresentation";const mocks = vi.hoisted(() => ({@@ -68,10 +69,12 @@ describe("queryStore tab title suffix", () => {vi.useFakeTimers();const { store, id } = await createStoreWithDataTab();// Let the creation-time save settle so only the suffix change is observed.+ await nextTick();await vi.advanceTimersByTimeAsync(400);mocks.saveOpenTabsState.mockClear();store.setTabTitleSuffix(id, "待办");+ await nextTick();await vi.advanceTimersByTimeAsync(400);expect(mocks.saveOpenTabsState).toHaveBeenCalled();diff --git a/crates/dbx-core/src/persistence/cloud_sync.rs b/crates/dbx-core/src/persistence/cloud_sync.rsindex bd7124c495..57be19dd95 100644--- a/crates/dbx-core/src/persistence/cloud_sync.rs+++ b/crates/dbx-core/src/persistence/cloud_sync.rs@@ -134,6 +134,12 @@ pub struct SnippetTokenStatus {pub has_saved_token: bool,}+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]+#[serde(rename_all = "camelCase")]+pub struct SnippetPassphraseStatus {+ pub has_saved_passphrase: bool,+}+#[derive(Debug, Clone, Serialize, Deserialize)]#[serde(rename_all = "camelCase")]pub struct SnippetSyncSettings {@@ -788,6 +794,12 @@ pub struct SnippetSyncSummary {pub bytes: usize,pub exported_at: Option<String>,pub app_version: Option<String>,+ /// SHA-256 of the encrypted remote file content. Used by the opt-in+ /// automatic uploader to stop when another device has changed the snippet.+ #[serde(default, skip_serializing_if = "Option::is_none")]+ pub remote_content_hash: Option<String>,+ #[serde(default)]+ pub unchanged: bool,/// A new encrypted snippet was created, but the old plaintext snippet/// could not be removed. The caller must surface this id for manual cleanup.#[serde(default)]@@ -1669,6 +1681,47 @@ pub async fn forget_snippet_token(storage: &Storage, config: &SnippetSyncConfig)storage.delete_webdav_password_blob(&snippet_token_account(config)?).await}+pub async fn snippet_saved_passphrase_status(+ storage: &Storage,+ config: &SnippetSyncConfig,+) -> Result<SnippetPassphraseStatus, String> {+ let account = snippet_passphrase_account(config)?;+ Ok(SnippetPassphraseStatus { has_saved_passphrase: storage.load_webdav_password_blob(&account).await?.is_some() })+}++pub async fn save_snippet_passphrase(+ storage: &Storage,+ config: &SnippetSyncConfig,+ passphrase: &str,+) -> Result<(), String> {+ let passphrase = normalized_passphrase(Some(passphrase))+ .ok_or_else(|| "A snippet encryption password is required to save it.".to_string())?;+ let secret = storage.load_or_create_local_device_secret().await?;+ let blob = encrypt_text_with_secret(passphrase, &secret)?;+ let value = serde_json::to_value(blob).map_err(|e| e.to_string())?;+ storage.save_webdav_password_blob(&snippet_passphrase_account(config)?, &value).await+}++pub async fn forget_snippet_passphrase(storage: &Storage, config: &SnippetSyncConfig) -> Result<(), String> {+ storage.delete_webdav_password_blob(&snippet_passphrase_account(config)?).await+}++pub async fn resolve_snippet_passphrase(+ storage: &Storage,+ config: &SnippetSyncConfig,+ passphrase: Option<&str>,+) -> Result<Option<String>, String> {+ if let Some(passphrase) = normalized_passphrase(passphrase) {+ return Ok(Some(passphrase.to_string()));+ }+ let Some(value) = storage.load_webdav_password_blob(&snippet_passphrase_account(config)?).await? else {+ return Ok(None);+ };+ let blob: EncryptedSecretsBlob = serde_json::from_value(value).map_err(|e| e.to_string())?;+ let secret = storage.load_or_create_local_device_secret().await?;+ Ok(Some(decrypt_text_with_secret(&blob, &secret)?))+}+pub async fn snippet_sync_settings(storage: &Storage,provider: SnippetProvider,@@ -1976,13 +2029,44 @@ impl SnippetSyncClient {snapshot: &SyncSnapshot,snippet_passphrase: Option<&str>,secrets_passphrase: Option<&str>,+ ) -> Result<SnippetSyncSummary, String> {+ self.put_snapshot_with_expected_remote_hash(snapshot, snippet_passphrase, secrets_passphrase, None).await+ }++ pub async fn put_snapshot_with_expected_remote_hash(+ &self,+ snapshot: &SyncSnapshot,+ snippet_passphrase: Option<&str>,+ secrets_passphrase: Option<&str>,+ expected_remote_content_hash: Option<&str>,) -> Result<SnippetSyncSummary, String> {self.require_token()?;let passphrase = required_snippet_passphrase(snippet_passphrase)?;let existing_id = normalized_snippet_id(self.config.snippet_id.as_deref());+ if expected_remote_content_hash.is_some() && existing_id.is_none() {+ return Err(+ "Automatic snippet upload needs a snippet ID and a previous successful manual upload.".to_string()+ );+ }+ if let Some(expected_hash) = expected_remote_content_hash {+ if expected_hash.len() != 64 || !expected_hash.bytes().all(|byte| byte.is_ascii_hexdigit()) {+ return Err(+ "Automatic snippet upload has an invalid saved remote version. Upload manually to reset it."+ .to_string(),+ );+ }+ }let legacy_snapshot = if let Some(id) = existing_id {let existing_content = self.load_snippet_content(id).await?;+ if expected_remote_content_hash+ .is_some_and(|expected_hash| !content_hash(&existing_content).eq_ignore_ascii_case(expected_hash))+ {+ return Err("The remote snippet changed since the last successful upload. Automatic upload was paused to avoid overwriting newer changes. Download and review the latest snippet, then upload manually before re-enabling automatic upload.".to_string());+ }if !is_encrypted_snippet_snapshot(&existing_content) {+ if expected_remote_content_hash.is_some() && is_legacy_dbx_snapshot(&existing_content) {+ return Err("Automatic upload is paused because the remote snippet uses a legacy unencrypted snapshot. Migrate it manually before enabling automatic uploads.".to_string());+ }// Never delete an arbitrary snippet merely because it is not an// encrypted DBX envelope. It must first prove to be a legacy DBX// snapshot, and the caller must explicitly request migration.@@ -2010,7 +2094,25 @@ impl SnippetSyncClient {// password decrypts the currently stored envelope. Otherwise// an accidental password change would silently lock out the// user's other devices.- parse_snippet_snapshot(&existing_content, Some(passphrase))?;+ let existing_snapshot = parse_snippet_snapshot(&existing_content, Some(passphrase))?;+ if expected_remote_content_hash.is_some() {+ if existing_snapshot.encrypted_secrets.is_some() {+ return Err("Automatic upload is paused because this snippet includes encrypted credentials. Use manual upload to keep the credentials protected.".to_string());+ }+ if sync_snapshot_content_eq(&existing_snapshot, snapshot) {+ return Ok(SnippetSyncSummary {+ provider: self.config.provider,+ snippet_id: id.to_string(),+ bytes: existing_content.len(),+ exported_at: Some(existing_snapshot.exported_at),+ app_version: Some(existing_snapshot.app_version),+ remote_content_hash: Some(content_hash(&existing_content)),+ unchanged: true,+ legacy_cleanup_required_id: None,+ legacy_cleanup_expected_content_hash: None,+ });+ }+ }None}} else {@@ -2024,6 +2126,7 @@ impl SnippetSyncClient {let encrypted = encrypt_snippet_snapshot(snapshot_to_upload, passphrase)?;let bytes = serde_json::to_vec_pretty(&encrypted).map_err(|e| e.to_string())?;let content = String::from_utf8(bytes.clone()).map_err(|e| e.to_string())?;+ let remote_content_hash = content_hash(&content);// A migration must create a separate snippet. Updating the legacy// snippet would retain its plaintext revision history on the provider.let update_id = if legacy_snapshot.is_some() { None } else { existing_id };@@ -2077,6 +2180,8 @@ impl SnippetSyncClient {bytes: bytes.len(),exported_at,app_version,+ remote_content_hash: Some(remote_content_hash),+ unchanged: false,legacy_cleanup_required_id,legacy_cleanup_expected_content_hash: legacy_snapshot.map(|(_, _, hash)| hash),})@@ -2097,6 +2202,8 @@ impl SnippetSyncClient {bytes: content.len(),exported_at: Some(snapshot.exported_at.clone()),app_version: Some(snapshot.app_version.clone()),+ remote_content_hash: Some(content_hash(&content)),+ unchanged: false,legacy_cleanup_required_id: None,legacy_cleanup_expected_content_hash: None,};@@ -3057,6 +3164,19 @@ fn content_hash(content: &str) -> String {format!("{:x}", hasher.finalize())}+fn sync_snapshot_content_eq(left: &SyncSnapshot, right: &SyncSnapshot) -> bool {+ let mut left = left.clone();+ let mut right = right.clone();+ left.exported_at.clear();+ right.exported_at.clear();+ left.app_version.clear();+ right.app_version.clear();+ match (serde_json::to_value(left), serde_json::to_value(right)) {+ (Ok(left), Ok(right)) => left == right,+ _ => false,+ }+}+fn snippet_pending_cleanup(summary: &SnippetSyncSummary) -> Result<Option<SnippetPendingCleanup>, String> {match (summary.legacy_cleanup_required_id.as_deref(), summary.legacy_cleanup_expected_content_hash.as_deref()) {(None, None) => Ok(None),@@ -3121,6 +3241,10 @@ fn snippet_token_account(config: &SnippetSyncConfig) -> Result<String, String> {Ok(format!("snippet-token:{}", snippet_provider_storage_key(config.provider, config.instance_url.as_deref())?))}+fn snippet_passphrase_account(config: &SnippetSyncConfig) -> Result<String, String> {+ Ok(format!("snippet-passphrase:{}", snippet_provider_storage_key(config.provider, config.instance_url.as_deref())?))+}+fn validate_snippet_id(provider: SnippetProvider, id: &str) -> Result<(), String> {if provider == SnippetProvider::GitLab&& (id.is_empty() || id.bytes().all(|byte| byte == b'0') || !id.bytes().all(|byte| byte.is_ascii_digit()))diff --git a/crates/dbx-web/src/main.rs b/crates/dbx-web/src/main.rsindex dff2f34897..7a711147ee 100644--- a/crates/dbx-web/src/main.rs+++ b/crates/dbx-web/src/main.rs@@ -1515,6 +1515,9 @@ async fn serve() -> Result<(), String> {.route("/cloud-sync/snippet/token-status", post(routes::cloud_sync::snippet_token_status)).route("/cloud-sync/snippet/save-token", post(routes::cloud_sync::save_snippet_saved_token)).route("/cloud-sync/snippet/forget-token", post(routes::cloud_sync::forget_snippet_saved_token))+ .route("/cloud-sync/snippet/passphrase-status", post(routes::cloud_sync::snippet_passphrase_status))+ .route("/cloud-sync/snippet/save-passphrase", post(routes::cloud_sync::save_snippet_saved_passphrase))+ .route("/cloud-sync/snippet/forget-passphrase", post(routes::cloud_sync::forget_snippet_saved_passphrase)).route("/cloud-sync/snippet/settings", post(routes::cloud_sync::snippet_sync_settings)).route("/cloud-sync/snippet/save-id", post(routes::cloud_sync::save_snippet_sync_id)).route("/cloud-sync/snippet/retry-legacy-cleanup", post(routes::cloud_sync::retry_snippet_legacy_cleanup))diff --git a/crates/dbx-web/src/routes/cloud_sync.rs b/crates/dbx-web/src/routes/cloud_sync.rsindex 50c0e987b4..061dbda013 100644--- a/crates/dbx-web/src/routes/cloud_sync.rs+++ b/crates/dbx-web/src/routes/cloud_sync.rs@@ -7,13 +7,14 @@ use dbx_core::cloud_sync::{describe_sync_snapshot, finalize_snippet_migration, forget_snippet_token, forget_webdav_password,forget_webdav_sync_secrets_passphrase as core_forget_webdav_sync_secrets_passphrase, resolve_snippet_token,resolve_webdav_password, resolve_webdav_sync_secrets_passphrase, retry_pending_snippet_cleanup,- save_snippet_sync_id_for_instance as core_save_snippet_sync_id, save_snippet_token, save_webdav_password,- save_webdav_sync_secrets_preference as core_save_webdav_sync_secrets_preference, snippet_saved_token_status,+ save_snippet_passphrase, save_snippet_sync_id_for_instance as core_save_snippet_sync_id, save_snippet_token,+ save_webdav_password, save_webdav_sync_secrets_preference as core_save_webdav_sync_secrets_preference,+ snippet_saved_passphrase_status, snippet_saved_token_status,snippet_sync_settings_for_instance as core_snippet_sync_settings, webdav_saved_password_status,webdav_sync_secrets_status as core_webdav_sync_secrets_status, ApplySnapshotOptions, ApplySnapshotSummary,- SnippetProvider, SnippetSyncClient, SnippetSyncConfig, SnippetSyncSettings, SnippetSyncSummary, SnippetTokenStatus,- SyncSelection, SyncSnapshotCatalog, WebDavClient, WebDavConfig, WebDavPasswordStatus, WebDavSyncSecretsStatus,- WebDavSyncSummary,+ SnippetPassphraseStatus, SnippetProvider, SnippetSyncClient, SnippetSyncConfig, SnippetSyncSettings,+ SnippetSyncSummary, SnippetTokenStatus, SyncSelection, SyncSnapshotCatalog, WebDavClient, WebDavConfig,+ WebDavPasswordStatus, WebDavSyncSecretsStatus, WebDavSyncSummary,};use dbx_core::storage::DesktopSettings;use serde::{Deserialize, Serialize};@@ -116,6 +117,13 @@ pub struct SaveSnippetTokenRequest {pub token: String,}+#[derive(Debug, Clone, Deserialize)]+#[serde(rename_all = "camelCase")]+pub struct SaveSnippetPassphraseRequest {+ pub config: SnippetSyncConfig,+ pub passphrase: String,+}+#[derive(Debug, Clone, Deserialize)]#[serde(rename_all = "camelCase")]pub struct SnippetUploadRequest {@@ -127,6 +135,7 @@ pub struct SnippetUploadRequest {pub secrets_passphrase: Option<String>,#[serde(default)]pub selection: Option<SyncSelection>,+ pub expected_remote_content_hash: Option<String>,}#[derive(Debug, Clone, Deserialize)]@@ -341,6 +350,29 @@ pub async fn forget_snippet_saved_token(Ok(Json(()))}+pub async fn snippet_passphrase_status(+ State(state): State<Arc<WebState>>,+ Json(req): Json<SnippetConfigRequest>,+) -> Result<Json<SnippetPassphraseStatus>, AppError> {+ snippet_saved_passphrase_status(&state.app.storage, &req.config).await.map(Json).map_err(AppError::from)+}++pub async fn save_snippet_saved_passphrase(+ State(state): State<Arc<WebState>>,+ Json(req): Json<SaveSnippetPassphraseRequest>,+) -> Result<Json<()>, AppError> {+ save_snippet_passphrase(&state.app.storage, &req.config, &req.passphrase).await.map_err(AppError::from)?;+ Ok(Json(()))+}++pub async fn forget_snippet_saved_passphrase(+ State(state): State<Arc<WebState>>,+ Json(req): Json<SnippetConfigRequest>,+) -> Result<Json<()>, AppError> {+ dbx_core::cloud_sync::forget_snippet_passphrase(&state.app.storage, &req.config).await.map_err(AppError::from)?;+ Ok(Json(()))+}+pub async fn snippet_sync_settings(State(state): State<Arc<WebState>>,Json(req): Json<SnippetSyncSettingsRequest>,@@ -377,6 +409,13 @@ pub async fn snippet_sync_upload() -> Result<Json<SnippetSyncSummary>, AppError> {state.ensure_secret_export_allowed(req.include_secrets)?;resolve_snippet_token(&state.app.storage, &mut req.config).await.map_err(AppError::from)?;+ let snippet_passphrase = dbx_core::cloud_sync::resolve_snippet_passphrase(+ &state.app.storage,+ &req.config,+ req.snippet_passphrase.as_deref(),+ )+ .await+ .map_err(AppError::from)?;let secrets_passphrase = if req.include_secrets {Some(req.secrets_passphrase@@ -407,7 +446,12 @@ pub async fn snippet_sync_upload(.map_err(AppError::from)?;let client = SnippetSyncClient::new(req.config).map_err(AppError::from)?;let mut summary = client- .put_snapshot(&snapshot, req.snippet_passphrase.as_deref(), secrets_passphrase)+ .put_snapshot_with_expected_remote_hash(+ &snapshot,+ snippet_passphrase.as_deref(),+ secrets_passphrase,+ req.expected_remote_content_hash.as_deref(),+ ).await.map_err(AppError::from)?;finalize_snippet_migration(&state.app.storage, &client, &mut summary).await.map_err(AppError::from)?;@@ -419,9 +463,16 @@ pub async fn snippet_sync_download(Json(mut req): Json<SnippetDownloadRequest>,) -> Result<Json<SnippetDownloadResult>, AppError> {resolve_snippet_token(&state.app.storage, &mut req.config).await.map_err(AppError::from)?;+ let snippet_passphrase = dbx_core::cloud_sync::resolve_snippet_passphrase(+ &state.app.storage,+ &req.config,+ req.snippet_passphrase.as_deref(),+ )+ .await+ .map_err(AppError::from)?;let (snapshot, summary) = SnippetSyncClient::new(req.config).map_err(AppError::from)?- .get_snapshot(req.snippet_passphrase.as_deref())+ .get_snapshot(snippet_passphrase.as_deref()).await.map_err(AppError::from)?;let apply_summary = apply_sync_snapshot_with_selection(@@ -449,9 +500,16 @@ pub async fn snippet_sync_inspect(Json(mut req): Json<SnippetInspectRequest>,) -> Result<Json<SyncSnapshotCatalog>, AppError> {resolve_snippet_token(&state.app.storage, &mut req.config).await.map_err(AppError::from)?;+ let snippet_passphrase = dbx_core::cloud_sync::resolve_snippet_passphrase(+ &state.app.storage,+ &req.config,+ req.snippet_passphrase.as_deref(),+ )+ .await+ .map_err(AppError::from)?;let (snapshot, _) = SnippetSyncClient::new(req.config).map_err(AppError::from)?- .get_snapshot(req.snippet_passphrase.as_deref())+ .get_snapshot(snippet_passphrase.as_deref()).await.map_err(AppError::from)?;let explicit = req.secrets_passphrase.as_deref().map(str::trim).filter(|value| !value.is_empty());diff --git a/src-tauri/src/commands/cloud_sync.rs b/src-tauri/src/commands/cloud_sync.rsindex f42a1e10f4..d659fddc26 100644--- a/src-tauri/src/commands/cloud_sync.rs+++ b/src-tauri/src/commands/cloud_sync.rs@@ -2,16 +2,17 @@ use std::sync::Arc;use dbx_core::cloud_sync::{apply_sync_snapshot_with_selection, build_sync_snapshot_with_selection, describe_local_sync_state,- describe_sync_snapshot, finalize_snippet_migration, forget_snippet_token, forget_webdav_password,- forget_webdav_sync_secrets_passphrase as core_forget_webdav_sync_secrets_passphrase, resolve_snippet_token,- resolve_webdav_password, resolve_webdav_sync_secrets_passphrase, retry_pending_snippet_cleanup,+ describe_sync_snapshot, finalize_snippet_migration, forget_snippet_passphrase, forget_snippet_token,+ forget_webdav_password, forget_webdav_sync_secrets_passphrase as core_forget_webdav_sync_secrets_passphrase,+ resolve_snippet_passphrase, resolve_snippet_token, resolve_webdav_password, resolve_webdav_sync_secrets_passphrase,+ retry_pending_snippet_cleanup, save_snippet_passphrase,save_snippet_sync_id_for_instance as core_save_snippet_sync_id, save_snippet_token, save_webdav_password,- save_webdav_sync_secrets_preference as core_save_webdav_sync_secrets_preference, snippet_saved_token_status,- snippet_sync_settings_for_instance as core_snippet_sync_settings, webdav_saved_password_status,- webdav_sync_secrets_status as core_webdav_sync_secrets_status, ApplySnapshotOptions, ApplySnapshotSummary,- SnippetProvider, SnippetSyncClient, SnippetSyncConfig, SnippetSyncSettings, SnippetSyncSummary, SnippetTokenStatus,- SyncExportOptions, SyncSelection, SyncSnapshotCatalog, WebDavClient, WebDavConfig, WebDavPasswordStatus,- WebDavSyncSecretsStatus, WebDavSyncSummary,+ save_webdav_sync_secrets_preference as core_save_webdav_sync_secrets_preference, snippet_saved_passphrase_status,+ snippet_saved_token_status, snippet_sync_settings_for_instance as core_snippet_sync_settings,+ webdav_saved_password_status, webdav_sync_secrets_status as core_webdav_sync_secrets_status, ApplySnapshotOptions,+ ApplySnapshotSummary, SnippetPassphraseStatus, SnippetProvider, SnippetSyncClient, SnippetSyncConfig,+ SnippetSyncSettings, SnippetSyncSummary, SnippetTokenStatus, SyncExportOptions, SyncSelection, SyncSnapshotCatalog,+ WebDavClient, WebDavConfig, WebDavPasswordStatus, WebDavSyncSecretsStatus, WebDavSyncSummary,};use dbx_core::storage::DesktopSettings;use dbx_core::storage::{MigrationPreflight, MigrationReport};@@ -247,6 +248,31 @@ pub async fn forget_snippet_saved_token(forget_snippet_token(&state.storage, &config).await}+#[tauri::command]+pub async fn snippet_passphrase_status(+ state: State<'_, Arc<AppState>>,+ config: SnippetSyncConfig,+) -> Result<SnippetPassphraseStatus, String> {+ snippet_saved_passphrase_status(&state.storage, &config).await+}++#[tauri::command]+pub async fn save_snippet_saved_passphrase(+ state: State<'_, Arc<AppState>>,+ config: SnippetSyncConfig,+ passphrase: String,+) -> Result<(), String> {+ save_snippet_passphrase(&state.storage, &config, &passphrase).await+}++#[tauri::command]+pub async fn forget_snippet_saved_passphrase(+ state: State<'_, Arc<AppState>>,+ config: SnippetSyncConfig,+) -> Result<(), String> {+ forget_snippet_passphrase(&state.storage, &config).await+}+#[tauri::command]pub async fn snippet_sync_settings(state: State<'_, Arc<AppState>>,@@ -286,8 +312,10 @@ pub async fn snippet_sync_upload(include_secrets: bool,secrets_passphrase: Option<String>,selection: Option<SyncSelection>,+ expected_remote_content_hash: Option<String>,) -> Result<SnippetSyncSummary, String> {resolve_snippet_token(&state.storage, &mut config).await?;+ let snippet_passphrase = resolve_snippet_passphrase(&state.storage, &config, snippet_passphrase.as_deref()).await?;let secrets_passphrase = if include_secrets {Some(secrets_passphrase@@ -315,7 +343,14 @@ pub async fn snippet_sync_upload().await?;let client = SnippetSyncClient::new(config)?;- let mut summary = client.put_snapshot(&snapshot, snippet_passphrase.as_deref(), secrets_passphrase).await?;+ let mut summary = client+ .put_snapshot_with_expected_remote_hash(+ &snapshot,+ snippet_passphrase.as_deref(),+ secrets_passphrase,+ expected_remote_content_hash.as_deref(),+ )+ .await?;finalize_snippet_migration(&state.storage, &client, &mut summary).await?;Ok(summary)}@@ -330,6 +365,7 @@ pub async fn snippet_sync_download(selection: Option<SyncSelection>,) -> Result<SnippetDownloadResult, String> {resolve_snippet_token(&state.storage, &mut config).await?;+ let snippet_passphrase = resolve_snippet_passphrase(&state.storage, &config, snippet_passphrase.as_deref()).await?;let (snapshot, summary) = SnippetSyncClient::new(config)?.get_snapshot(snippet_passphrase.as_deref()).await?;let apply_summary = apply_sync_snapshot_with_selection(&state.storage,@@ -355,6 +391,7 @@ pub async fn snippet_sync_inspect(secrets_passphrase: Option<String>,) -> Result<SyncSnapshotCatalog, String> {resolve_snippet_token(&state.storage, &mut config).await?;+ let snippet_passphrase = resolve_snippet_passphrase(&state.storage, &config, snippet_passphrase.as_deref()).await?;let (snapshot, _) = SnippetSyncClient::new(config)?.get_snapshot(snippet_passphrase.as_deref()).await?;let explicit = secrets_passphrase.as_deref().map(str::trim).filter(|value| !value.is_empty());let saved = if explicit.is_none() { resolve_webdav_sync_secrets_passphrase(&state.storage).await? } else { None };diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rsindex 99ec41441b..ae98ae2d69 100644--- a/src-tauri/src/lib.rs+++ b/src-tauri/src/lib.rs@@ -2175,6 +2175,9 @@ pub fn run() {commands::cloud_sync::snippet_token_status,commands::cloud_sync::save_snippet_saved_token,commands::cloud_sync::forget_snippet_saved_token,+ commands::cloud_sync::snippet_passphrase_status,+ commands::cloud_sync::save_snippet_saved_passphrase,+ commands::cloud_sync::forget_snippet_saved_passphrase,commands::cloud_sync::snippet_sync_settings,commands::cloud_sync::save_snippet_sync_id,commands::cloud_sync::retry_snippet_legacy_cleanup,