Skip to content

A desktop coding agent with free access to frontier models.

TypeScript

feat: MCP status comes from the new engine

ogsamrat5164c3ea6b7b
diff --git a/apps/app/src/app/lib/omnirush-server.ts b/apps/app/src/app/lib/omnirush-server.ts
index a12af046..1e0f2347 100644
--- a/apps/app/src/app/lib/omnirush-server.ts
+++ b/apps/app/src/app/lib/omnirush-server.ts
@@ -4,6 +4,7 @@ import type {
SkillFileTree,
SkillUploadFile,
} from "./skill-upload";
+import { v2McpStatusMap } from "./opencode-v2-adapter";
import type { McpStatusMap } from "../types";
import type { Message, Part, Session, Todo } from "@opencode-ai/sdk/v2/client";
import {
@@ -2487,8 +2488,9 @@ export function createOmniRushServerClient(options: { baseUrl: string; token?: s
`/workspace/${workspaceId}/mcp`,
{ token, hostToken },
),
- getMcpStatus: (workspaceId: string) =>
- requestJson<McpStatusMap>(baseUrl, `/workspace/${encodeURIComponent(workspaceId)}/opencode/mcp`, { token, hostToken }),
+ // The 2.x engine runs every chat: its MCP status, as the 1.x status map.
+ getMcpStatus: async (workspaceId: string) =>
+ v2McpStatusMap(await requestJson<unknown>(baseUrl, `/workspace/${encodeURIComponent(workspaceId)}/opencode2/api/mcp`, { token, hostToken })) as McpStatusMap,
listMcpApps: (workspaceId: string) =>
requestJson<{ servers: OmniRushMcpAppCatalogServer[] }>(
baseUrl,
diff --git a/apps/app/src/app/lib/opencode-v2-adapter.ts b/apps/app/src/app/lib/opencode-v2-adapter.ts
index a6872b6b..19ac6d5b 100644
--- a/apps/app/src/app/lib/opencode-v2-adapter.ts
+++ b/apps/app/src/app/lib/opencode-v2-adapter.ts
@@ -205,6 +205,16 @@ function responseData(value: unknown): unknown {
return isRecord(value) && "data" in value ? value.data : value;
}
+/** 2.x `GET /api/mcp` ({data: [{name, status: {status, error}}]}) as the 1.x status map, by server name. */
+export function v2McpStatusMap(payload: unknown): Record<string, { status: string; error?: string }> {
+ const out: Record<string, { status: string; error?: string }> = {};
+ for (const entry of responseItems(payload)) {
+ if (!isRecord(entry) || typeof entry.name !== "string" || !isRecord(entry.status) || typeof entry.status.status !== "string") continue;
+ out[entry.name] = { status: entry.status.status, ...(typeof entry.status.error === "string" ? { error: entry.status.error } : {}) };
+ }
+ return out;
+}
+
function responseItems(value: unknown): unknown[] {
const data = responseData(value);
return Array.isArray(data) ? data : [];
@@ -1836,7 +1846,10 @@ export function createClientV2(
files: async (): Promise<FieldsResult<never[]>> => localResult(baseUrl, "/api/fs/find", []),
},
mcp: {
- status: async (): Promise<FieldsResult<Record<string, never>>> => localResult(baseUrl, "/api/mcp", {}),
+ status: async (_parameters?: DirectoryParameters, options?: RequestOptions): Promise<FieldsResult<Record<string, { status: string; error?: string }>>> => {
+ const result = await request("GET", "/api/mcp", undefined, options?.signal);
+ return result.response.ok ? successfulResult(result, v2McpStatusMap(result.payload)) : failedResult(result);
+ },
},
event: {
subscribe: async (
diff --git a/apps/app/tests/opencode-v2-adapter.test.ts b/apps/app/tests/opencode-v2-adapter.test.ts
index bb0dac2a..78658bf9 100644
--- a/apps/app/tests/opencode-v2-adapter.test.ts
+++ b/apps/app/tests/opencode-v2-adapter.test.ts
@@ -1861,3 +1861,10 @@ describe("OpenCode 2.0.32 routes", () => {
expect(input).not.toHaveProperty("filePath");
});
});
+
+test("MCP status from the 2.x engine reads as the 1.x status map", async () => {
+ const { v2McpStatusMap } = await import("../src/app/lib/opencode-v2-adapter");
+ expect(v2McpStatusMap({ data: [{ name: "memory", status: { status: "connected" } }, { name: "gh", status: { status: "failed", error: "boom" } }, { name: 3 }] }))
+ .toEqual({ memory: { status: "connected" }, gh: { status: "failed", error: "boom" } });
+ expect(v2McpStatusMap(null)).toEqual({});
+});