Skip to content

armgit / dbx

Public Imported from GitHub
0

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。

fix(updates): keep MCP update button hidden after auto-update

zipg5c6030f41338
diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vue
index 7dbe631710..9a8cd199cd 100644
--- a/apps/desktop/src/App.vue
+++ b/apps/desktop/src/App.vue
@@ -374,11 +374,12 @@ const activeAiRunCount = computed(() => (isDesktop ? activeDesktopAiRuns().lengt
/** Runs waiting for a write confirmation — the panel-entry badge shows these
* with a higher-priority indicator (parent PRD §4 line 71 / §9). */
const awaitingAiRunCount = computed(() => (isDesktop ? activeDesktopAiRuns().filter((run) => run.status === "awaiting_write_confirmation").length : 0));
-const { mcpUpdateAvailable, refreshMcpUpdateStatus, handleMcpStatusChanged, applyMcpStatus } = useMcpUpdateBadge({
+const { mcpUpdateAvailable, refreshMcpUpdateStatus, handleMcpStatusChanged, applyMcpStatus, invalidateMcpUpdateStatus } = useMcpUpdateBadge({
isDesktop,
// Update availability remains visible when every auto-update switch is off;
// the switches control installation, not whether the user can be reminded.
updateNotificationsEnabled: () => true,
+ shouldDeferRefresh: () => componentUpdates.updating.value,
});
const drawDesktopWindowFrame = shouldDrawDesktopWindowFrame(isMacOS(), isDesktop, isWindows());
const UPDATE_CHECK_INTERVAL_MS = 60 * 60 * 1000;
@@ -1440,6 +1441,8 @@ function handleToolbarUpdateClick() {
function syncToolbarComponentUpdateState() {
agentDriverUpdateCount.value = componentUpdates.driverUpdateCount.value;
applyMcpStatus(componentUpdates.mcpUpdateAvailable.value);
+ // 组件更新是权威来源;丢弃轮询期间发出的旧快照,避免其晚返回后重新点亮更新入口。
+ invalidateMcpUpdateStatus();
}
function handleComponentUpdatesChanged() {
@@ -1490,6 +1493,8 @@ async function consumePendingComponentUpdatesAfterRestart() {
if (currentVersion && !appVersion.value) appVersion.value = currentVersion;
const pending = takePendingComponentUpdatesAfterAppRestart(currentVersion);
if (!pending) return;
+ // 丢弃重启过程中发出的后台 MCP 轮询:它们可能读到升级前快照,晚返回后会覆盖权威结果。
+ invalidateMcpUpdateStatus();
reportComponentUpdateResult(await runPendingComponentUpdatePlan(pending, componentUpdates));
}
diff --git a/apps/desktop/src/composables/__tests__/useComponentUpdates.spec.ts b/apps/desktop/src/composables/__tests__/useComponentUpdates.spec.ts
index 9010d5fc9d..57935f6e96 100644
--- a/apps/desktop/src/composables/__tests__/useComponentUpdates.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useComponentUpdates.spec.ts
@@ -1,5 +1,6 @@
import { beforeEach, describe, expect, it, vi } from "vitest";
import { useComponentUpdates } from "@/composables/useComponentUpdates";
+import { useMcpUpdateBadge } from "@/composables/useMcpUpdateBadge";
import { runPendingComponentUpdatePlan, type PendingComponentUpdates } from "@/lib/updates/componentUpdateOrchestration";
import { showToolbarUpdateAction } from "@/lib/updates/updateBadges";
@@ -110,6 +111,32 @@ describe("useComponentUpdates", () => {
expect(updates.driverUpdateCount.value).toBe(0);
});
+ it("discards a background refresh that started before an update instead of reusing its stale promise", async () => {
+ const backgroundCatalog = deferred<unknown[]>();
+ mocks.fetchPluginMarketplaceCatalogs.mockReturnValueOnce(backgroundCatalog.promise);
+ let mcpInstallFinished = false;
+ mocks.checkMcpServerStatus.mockImplementation(() => (mcpInstallFinished ? Promise.resolve({ ...mcpStatus, latest_version: mcpStatus.current_version, update_available: false }) : Promise.resolve(mcpStatus)));
+ mocks.installMcpServer.mockImplementation(() => {
+ mcpInstallFinished = true;
+ return Promise.resolve("updated");
+ });
+ const updates = useComponentUpdates({ isDesktop: true });
+
+ // 10 秒后台检查先发出,拿到的是升级前快照(这里让插件目录请求悬停住)。
+ // 修复前:更新流程会复用这个在途 promise,拿不到安装后的权威状态。
+ const backgroundRefresh = updates.refresh();
+ await Promise.resolve();
+
+ // 安装流程开始并完成:安装后的刷新确认无更新。
+ await updates.installCategory("mcp");
+ expect(updates.mcpUpdateAvailable.value).toBe(false);
+
+ // 升级前的旧快照晚返回,必须被丢弃,不能重新点亮更新入口。
+ backgroundCatalog.resolve([]);
+ expect(await backgroundRefresh).toBe(false);
+ expect(updates.mcpUpdateAvailable.value).toBe(false);
+ });
+
it("starts a fresh MCP check for an explicit user action instead of reusing a background result", async () => {
const backgroundMcp = deferred<typeof mcpStatus>();
const userMcp = deferred<typeof mcpStatus>();
@@ -269,6 +296,60 @@ describe("useComponentUpdates", () => {
expect(showToolbarUpdateAction({ ...toolbarOptions, componentUpdatesRunning: updates.updating.value })).toBe(true);
});
+ it("keeps the toolbar update action hidden when a stale background MCP poll lands after the restart install", async () => {
+ // 本用例只关心 MCP,排除驱动/插件分类的干扰。
+ mocks.listInstalledAgents.mockResolvedValue([]);
+ mocks.jdbcPluginStatus.mockResolvedValue({ installed: true, update_available: false });
+ mocks.buildMarketplacePluginListings.mockReturnValue([]);
+ const backgroundSnapshot = deferred<typeof mcpStatus>();
+ let mcpInstallFinished = false;
+ mocks.checkMcpServerStatus.mockImplementation(() => {
+ if (!mcpInstallFinished) return Promise.resolve(mcpStatus);
+ return Promise.resolve({ ...mcpStatus, latest_version: mcpStatus.current_version, update_available: false });
+ });
+ const updates = useComponentUpdates({ isDesktop: true });
+ const badge = useMcpUpdateBadge({
+ isDesktop: true,
+ updateNotificationsEnabled: () => true,
+ shouldDeferRefresh: () => updates.updating.value,
+ });
+
+ // 重启窗口开始前,后台轮询已发出,快照仍是升级前的 update_available=true。
+ mocks.checkMcpServerStatus.mockReturnValueOnce(backgroundSnapshot.promise);
+ const backgroundPoll = badge.refreshMcpUpdateStatus();
+ mocks.installMcpServer.mockImplementation(() => {
+ mcpInstallFinished = true;
+ return Promise.resolve("updated");
+ });
+
+ const pending: PendingComponentUpdates = {
+ fromVersion: "0.6.18",
+ targetVersion: "0.6.19",
+ plan: { kind: "manual", categories: ["mcp"] },
+ };
+ await runPendingComponentUpdatePlan(pending, updates);
+
+ // 安装完成:权威来源确认无更新,并丢弃在途旧快照。
+ badge.applyMcpStatus(updates.mcpUpdateAvailable.value);
+ badge.invalidateMcpUpdateStatus();
+ backgroundSnapshot.resolve(mcpStatus);
+ await backgroundPoll;
+
+ expect(updates.updating.value).toBe(false);
+ expect(updates.mcpUpdateAvailable.value).toBe(false);
+ expect(badge.mcpUpdateAvailable.value).toBe(false);
+ expect(
+ showToolbarUpdateAction({
+ appUpdateAvailable: false,
+ driverUpdateCount: updates.driverUpdateCount.value,
+ jdbcUpdateAvailable: updates.jdbcUpdateAvailable.value,
+ mcpUpdateAvailable: badge.mcpUpdateAvailable.value || updates.mcpUpdateAvailable.value,
+ pluginUpdateCount: updates.pluginUpdateCount.value,
+ componentUpdatesRunning: updates.updating.value,
+ }),
+ ).toBe(false);
+ });
+
it("skips blocked agent updates while allowing other component updates", async () => {
mocks.checkAgentUpdateBlockers.mockResolvedValue([{ db_type: "mysql", label: "MySQL", connections: ["生产 MySQL", "报表 MySQL"] }]);
const updates = useComponentUpdates({ isDesktop: true });
diff --git a/apps/desktop/src/composables/__tests__/useMcpUpdateBadge.spec.ts b/apps/desktop/src/composables/__tests__/useMcpUpdateBadge.spec.ts
index 48047ad937..8e7b75a57c 100644
--- a/apps/desktop/src/composables/__tests__/useMcpUpdateBadge.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useMcpUpdateBadge.spec.ts
@@ -59,6 +59,14 @@ function makeBadge(enabled = true, isDesktop = true) {
});
}
+function makeDeferrableBadge(shouldDefer: () => boolean) {
+ return useMcpUpdateBadge({
+ isDesktop: true,
+ updateNotificationsEnabled: () => true,
+ shouldDeferRefresh: shouldDefer,
+ });
+}
+
beforeEach(() => {
mockedCheck.mockReset();
});
@@ -132,6 +140,38 @@ describe("useMcpUpdateBadge", () => {
expect(badge.mcpUpdateAvailable.value).toBe(false);
});
+ it("组件更新窗口内暂停后台轮询", async () => {
+ mockedCheck.mockResolvedValue(makeStatus(true));
+ const badge = makeDeferrableBadge(() => true);
+ badge.applyMcpStatus(false);
+
+ await badge.refreshMcpUpdateStatus();
+
+ expect(mockedCheck).not.toHaveBeenCalled();
+ expect(badge.mcpUpdateAvailable.value).toBe(false);
+ });
+
+ it("权威状态切换使在途轮询失效,晚返回的旧快照不会重新点亮入口", async () => {
+ const pending = deferred<McpServerStatus>();
+ mockedCheck.mockReturnValueOnce(pending.promise);
+ let defer = false;
+ const badge = makeDeferrableBadge(() => defer);
+
+ const refresh = badge.refreshMcpUpdateStatus();
+ expect(mockedCheck).toHaveBeenCalledOnce();
+
+ // 组件更新安装完成:权威来源确认无更新,并使在途轮询失效。
+ defer = true;
+ badge.applyMcpStatus(false);
+ badge.invalidateMcpUpdateStatus();
+
+ // 更新前的旧快照晚返回,必须被忽略。
+ pending.resolve(makeStatus(true));
+ await refresh;
+
+ expect(badge.mcpUpdateAvailable.value).toBe(false);
+ });
+
it("无 payload 的事件回退到重新检查", async () => {
mockedCheck.mockResolvedValue(makeStatus(true));
const badge = makeBadge(true);
diff --git a/apps/desktop/src/composables/useComponentUpdates.ts b/apps/desktop/src/composables/useComponentUpdates.ts
index c3841582ef..2a09dcca32 100644
--- a/apps/desktop/src/composables/useComponentUpdates.ts
+++ b/apps/desktop/src/composables/useComponentUpdates.ts
@@ -215,6 +215,10 @@ export function useComponentUpdates(options: { isDesktop: boolean }) {
if (!options.isDesktop) return result;
if (activeUpdatePromise) return activeUpdatePromise;
updating.value = true;
+ // 作废更新窗口开始前发出的刷新:旧的 refreshPromise 带的是升级前快照,
+ // 必须一并清掉,否则更新流程会复用它而拿不到安装后的权威状态。
+ refreshVersion += 1;
+ refreshPromise = null;
const operation = (async () => {
await refresh();
const initialCheckError = lastError.value;
@@ -229,6 +233,9 @@ export function useComponentUpdates(options: { isDesktop: boolean }) {
return await operation;
} finally {
if (activeUpdatePromise === operation) activeUpdatePromise = null;
+ // 安装结束后同样作废在途刷新,确保权威状态不会被旧快照覆盖。
+ refreshVersion += 1;
+ refreshPromise = null;
updating.value = false;
updatingCategory.value = null;
}
diff --git a/apps/desktop/src/composables/useMcpUpdateBadge.ts b/apps/desktop/src/composables/useMcpUpdateBadge.ts
index 7fb995f9e3..c4774a8644 100644
--- a/apps/desktop/src/composables/useMcpUpdateBadge.ts
+++ b/apps/desktop/src/composables/useMcpUpdateBadge.ts
@@ -5,6 +5,11 @@ import { beginMcpStatusRequest, isLatestMcpStatusRequest, mcpUpdateAvailability
interface UseMcpUpdateBadgeOptions {
isDesktop: boolean;
updateNotificationsEnabled: () => boolean;
+ /**
+ * 组件更新(尤其是 DBX 重启后自动执行的待更新计划)是 MCP 状态的权威来源。
+ * 更新窗口内暂停后台轮询,避免旧快照在安装完成后把工具栏更新按钮重新点亮。
+ */
+ shouldDeferRefresh?: () => boolean;
}
/**
@@ -18,6 +23,11 @@ export function useMcpUpdateBadge(options: UseMcpUpdateBadgeOptions) {
async function refreshMcpUpdateStatus() {
if (!options.isDesktop || !options.updateNotificationsEnabled()) return;
+ // 预留序号并直接返回:组件更新结束后会由权威来源重新同步。
+ if (options.shouldDeferRefresh?.()) {
+ beginMcpStatusRequest();
+ return;
+ }
const requestId = beginMcpStatusRequest();
try {
const status = await api.checkMcpServerStatus();
@@ -43,6 +53,14 @@ export function useMcpUpdateBadge(options: UseMcpUpdateBadgeOptions) {
mcpUpdateAvailable.value = updateAvailable;
}
+ /**
+ * 使在途的后台检查失效。安装开始/结束等权威状态切换点调用,防止较早发出的
+ * 检查晚返回并覆盖已确认的结果。
+ */
+ function invalidateMcpUpdateStatus() {
+ beginMcpStatusRequest();
+ }
+
function handleMcpStatusChanged(event: Event) {
const detail = (event as CustomEvent<{ updateAvailable?: boolean | null; requestId?: number } | null | undefined>).detail;
if (detail && typeof detail.updateAvailable === "boolean") {
@@ -59,5 +77,6 @@ export function useMcpUpdateBadge(options: UseMcpUpdateBadgeOptions) {
refreshMcpUpdateStatus,
handleMcpStatusChanged,
applyMcpStatus,
+ invalidateMcpUpdateStatus,
};
}