Skip to content

Fix settings MCP listing source #1647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
src-opn merged 1 commit into from
May 4, 2026
Merged

Fix settings MCP listing source #1647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 0 additions & 56 deletions apps/app/src/react-app/domains/connections/mcp-view.tsx
View file
Open in desktop

This file was deleted.

185 changes: 102 additions & 83 deletions apps/app/src/react-app/domains/connections/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,108 +222,99 @@ export function createConnectionsStore(options: {
return resolvedProjectDir;
};

async function refreshMcpServers() {
if (disposed) return;

const projectDir = options.projectDir().trim();
const isRemoteWorkspace = options.workspaceType() === "remote";
const isLocalWorkspace = !isRemoteWorkspace;
const listMcpFromOpenworkServer = async (projectDir: string) => {
const openworkSnapshot = getOpenworkSnapshot();
const openworkClient = openworkSnapshot.openworkServerClient;
const openworkWorkspaceId = options.runtimeWorkspaceId();
const canUseOpenworkServer =
const openworkWorkspaceId =
options.runtimeWorkspaceId()?.trim() ||
options.selectedWorkspaceId().trim() ||
((await options.ensureRuntimeWorkspaceId?.()) ?? "")?.trim();
const canTryOpenworkServer =
openworkSnapshot.openworkServerStatus === "connected" &&
openworkClient &&
openworkWorkspaceId &&
openworkSnapshot.openworkServerCapabilities?.mcp?.read;
Boolean(openworkClient) &&
Boolean(openworkWorkspaceId) &&
openworkSnapshot.openworkServerCapabilities?.mcp?.read !== false;

if (isRemoteWorkspace) {
if (!canUseOpenworkServer) {
mutateState((current) => ({
...current,
mcpStatus: "OpenWork server unavailable. MCP config is read-only.",
mcpServers: [],
mcpStatuses: {},
}));
return;
}
recordPerfLog(options.developerMode(), "mcp.refresh", "server-path-check", {
workspaceType: options.workspaceType(),
projectDir: projectDir || null,
openworkStatus: openworkSnapshot.openworkServerStatus,
hasOpenworkClient: Boolean(openworkClient),
openworkWorkspaceId: openworkWorkspaceId || null,
canReadMcp: openworkSnapshot.openworkServerCapabilities?.mcp?.read ?? null,
canTryOpenworkServer,
});

try {
setStateField("mcpStatus", null);
const response = await openworkClient.listMcp(openworkWorkspaceId);
const next = response.items.map((entry) => ({
name: entry.name,
config: entry.config as McpServerEntry["config"],
source: entry.source,
}));
if (!canTryOpenworkServer || !openworkClient || !openworkWorkspaceId) return null;

let nextStatuses: McpStatusMap = {};
const activeClient = options.client();
if (activeClient && projectDir) {
try {
const status = unwrap(await activeClient.mcp.status({ directory: projectDir }));
nextStatuses = filterConfiguredStatuses(status as McpStatusMap, next);
} catch {
nextStatuses = {};
}
}
const response = await openworkClient.listMcp(openworkWorkspaceId);
const next = response.items.map((entry) => ({
name: entry.name,
config: entry.config as McpServerEntry["config"],
source: entry.source,
}));

mutateState((current) => ({
...current,
mcpServers: next,
mcpLastUpdatedAt: Date.now(),
mcpStatuses: nextStatuses,
mcpStatus: next.length ? null : "No MCP servers configured yet.",
}));
} catch (error) {
mutateState((current) => ({
...current,
mcpServers: [],
mcpStatuses: {},
mcpStatus:
error instanceof Error ? error.message : "Failed to load MCP servers",
}));
let nextStatuses: McpStatusMap = {};
const activeClient = options.client();
if (activeClient && projectDir) {
try {
const status = unwrap(await activeClient.mcp.status({ directory: projectDir }));
nextStatuses = filterConfiguredStatuses(status as McpStatusMap, next);
} catch {
nextStatuses = {};
}
return;
}

if (isLocalWorkspace && canUseOpenworkServer) {
try {
setStateField("mcpStatus", null);
const response = await openworkClient.listMcp(openworkWorkspaceId);
const next = response.items.map((entry) => ({
name: entry.name,
config: entry.config as McpServerEntry["config"],
source: entry.source,
}));
recordPerfLog(options.developerMode(), "mcp.refresh", "server-path-result", {
count: next.length,
names: next.map((entry) => entry.name),
sources: next.map((entry) => entry.source ?? "unknown"),
});

let nextStatuses: McpStatusMap = {};
const activeClient = options.client();
if (activeClient && projectDir) {
try {
const status = unwrap(await activeClient.mcp.status({ directory: projectDir }));
nextStatuses = filterConfiguredStatuses(status as McpStatusMap, next);
} catch {
nextStatuses = {};
}
}
return { next, nextStatuses };
};

async function refreshMcpServers() {
if (disposed) return;

const projectDir = options.projectDir().trim();
const isRemoteWorkspace = options.workspaceType() === "remote";

try {
setStateField("mcpStatus", null);
const serverResult = await listMcpFromOpenworkServer(projectDir);
if (serverResult) {
mutateState((current) => ({
...current,
mcpServers: next,
mcpServers: serverResult.next,
mcpLastUpdatedAt: Date.now(),
mcpStatuses: nextStatuses,
mcpStatus: next.length ? null : "No MCP servers configured yet.",
mcpStatuses: serverResult.nextStatuses,
mcpStatus: serverResult.next.length ? null : "No MCP servers configured yet.",
}));
} catch (error) {
return;
}
} catch (error) {
recordPerfLog(options.developerMode(), "mcp.refresh", "server-path-error", {
message: error instanceof Error ? error.message : String(error),
});
if (isRemoteWorkspace) {
mutateState((current) => ({
...current,
mcpServers: [],
mcpStatuses: {},
mcpStatus:
error instanceof Error ? error.message : "Failed to load MCP servers",
mcpStatus: error instanceof Error ? error.message : "Failed to load MCP servers",
}));
return;
}
}

if (isRemoteWorkspace) {
mutateState((current) => ({
...current,
mcpStatus: "OpenWork server unavailable. MCP config is read-only.",
mcpServers: [],
mcpStatuses: {},
}));
return;
}

Expand All @@ -349,8 +340,37 @@ export function createConnectionsStore(options: {

try {
setStateField("mcpStatus", null);
const config = await readOpencodeConfig("project", projectDir);
if (!config.exists || !config.content) {
recordPerfLog(options.developerMode(), "mcp.refresh", "desktop-project-fallback", {
projectDir,
});
const [globalConfig, projectConfig] = await Promise.all([
readOpencodeConfig("global", projectDir),
readOpencodeConfig("project", projectDir),
]);
const globalServers = globalConfig.exists && globalConfig.content
? parseMcpServersFromContent(globalConfig.content).map((entry) => ({
...entry,
source: "config.global" as const,
}))
: [];
const projectServers = projectConfig.exists && projectConfig.content
? parseMcpServersFromContent(projectConfig.content)
: [];
const projectNames = new Set(projectServers.map((entry) => entry.name));
const next = [
...globalServers.filter((entry) => !projectNames.has(entry.name)),
...projectServers,
];

recordPerfLog(options.developerMode(), "mcp.refresh", "desktop-project-fallback-result", {
globalConfigPath: globalConfig.path,
projectConfigPath: projectConfig.path,
count: next.length,
names: next.map((entry) => entry.name),
sources: next.map((entry) => entry.source ?? "unknown"),
});

if (!globalConfig.exists && !projectConfig.exists) {
mutateState((current) => ({
...current,
mcpServers: [],
Expand All @@ -360,7 +380,6 @@ export function createConnectionsStore(options: {
return;
}

const next = parseMcpServersFromContent(config.content);
let nextStatuses = state.mcpStatuses;
const activeClient = options.client();
if (activeClient) {
Expand Down
Loading