Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 34 additions & 0 deletions mcpjam-inspector/client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import { ViewsTab } from "./components/ViewsTab";
import { SandboxesTab } from "./components/SandboxesTab";
import { SettingsTab } from "./components/SettingsTab";
import { WorkspaceSettingsTab } from "./components/WorkspaceSettingsTab";
import { ClientConfigTab } from "./components/client-config/ClientConfigTab";
import { WorkspaceClientConfigSync } from "./components/client-config/WorkspaceClientConfigSync";
import { TracingTab } from "./components/TracingTab";
import { AuthTab } from "./components/AuthTab";
import { OAuthFlowTab } from "./components/OAuthFlowTab";
Expand Down Expand Up @@ -106,10 +108,12 @@ import {
writeHostedOAuthResumeMarker,
} from "./lib/hosted-oauth-resume";
import { handleOAuthCallback } from "./lib/oauth/mcp-oauth";
import { getEffectiveWorkspaceClientCapabilities } from "./lib/client-config";
import type {
BillingRolloutState,
OrganizationEntitlements,
} from "./hooks/useOrganizationBilling";
import { useClientConfigStore } from "./stores/client-config-store";

function getHostedOAuthCallbackErrorMessage(): string {
const params = new URLSearchParams(window.location.search);
Expand Down Expand Up @@ -139,6 +143,7 @@ export default function App() {
"billing-entitlements-ui",
);
const learningEnabled = useFeatureFlagEnabled("mcpjam-learning");
const clientConfigEnabled = useFeatureFlagEnabled("client-config-enabled");
const {
getAccessToken,
signIn,
Expand Down Expand Up @@ -354,6 +359,7 @@ export default function App() {
handleSwitchWorkspace,
handleCreateWorkspace,
handleUpdateWorkspace,
handleUpdateClientConfig,
handleDeleteWorkspace,
handleWorkspaceShared,
saveServerConfigWithoutConnecting,
Expand Down Expand Up @@ -423,6 +429,14 @@ export default function App() {

// Get the Convex workspace ID from the active workspace
const activeWorkspace = workspaces[activeWorkspaceId];
const isClientConfigSyncPending = useClientConfigStore(
(state) =>
state.isAwaitingRemoteEcho &&
state.pendingWorkspaceId === activeWorkspaceId,
);
const hostedClientCapabilities = getEffectiveWorkspaceClientCapabilities(
activeWorkspace?.clientConfig,
) as Record<string, unknown>;
const convexWorkspaceId = activeWorkspace?.sharedWorkspaceId ?? null;
const rawBillingOrganizationId =
activeOrganizationId ?? activeWorkspace?.organizationId ?? null;
Expand Down Expand Up @@ -506,9 +520,12 @@ export default function App() {
),
[appState.servers],
);

useHostedApiContext({
workspaceId: convexWorkspaceId,
serverIdsByName: hostedServerIdsByName,
clientCapabilities: hostedClientCapabilities,
clientConfigSyncPending: isClientConfigSyncPending,
getAccessToken,
oauthTokensByServerId,
guestOauthTokensByServerName,
Expand Down Expand Up @@ -641,9 +658,15 @@ export default function App() {
(learningEnabled !== true || !isAuthenticated)
) {
applyNavigation("servers", { updateHash: true });
} else if (
activeTab === "client-config" &&
(clientConfigEnabled !== true || !isAuthenticated)
) {
applyNavigation("servers", { updateHash: true });
}
}, [
ciEvalsEnabled,
clientConfigEnabled,
activeTabBillingFeature,
activeTabBillingLocked,
learningEnabled,
Expand Down Expand Up @@ -965,6 +988,13 @@ export default function App() {
serverName={appState.selectedServer}
/>
)}
{activeTab === "client-config" && (
<ClientConfigTab
activeWorkspaceId={activeWorkspaceId}
workspace={activeWorkspace}
onSaveClientConfig={handleUpdateClientConfig}
/>
)}
{activeTab === "workspace-settings" && (
<WorkspaceSettingsTab
activeWorkspaceId={activeWorkspaceId}
Expand Down Expand Up @@ -1000,6 +1030,10 @@ export default function App() {
themeMode={initialThemeMode}
themePreset={initialThemePreset}
>
<WorkspaceClientConfigSync
activeWorkspaceId={activeWorkspaceId}
savedClientConfig={activeWorkspace?.clientConfig}
/>
<AppStateProvider appState={effectiveAppState}>
<Toaster />
<HostedShellGate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,9 @@ vi.mock("../components/SandboxesTab", () => ({
vi.mock("../components/SettingsTab", () => ({
SettingsTab: () => <div />,
}));
vi.mock("../components/client-config/WorkspaceClientConfigSync", () => ({
WorkspaceClientConfigSync: () => null,
}));
vi.mock("../components/TracingTab", () => ({
TracingTab: () => <div />,
}));
Expand Down
2 changes: 1 addition & 1 deletion mcpjam-inspector/client/src/components/AuthTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
} from "../lib/types/oauth-flow-types";
import { OAuthFlowProgressSimple } from "./oauth/OAuthFlowProgressSimple";
import { OAuthStateMachine } from "../lib/oauth/oauth-state-machine";
import { MCPServerConfig } from "@mcpjam/sdk";
import type { MCPServerConfig } from "@mcpjam/sdk/browser";

interface StatusMessageProps {
message: StatusMessage;
Expand Down
2 changes: 1 addition & 1 deletion mcpjam-inspector/client/src/components/PromptsTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { EmptyState } from "./ui/empty-state";
import { ThreePanelLayout } from "./ui/three-panel-layout";
import { JsonEditor } from "@/components/ui/json-editor";
import { extractDisplayFromValue } from "@/components/chat-v2/shared/tool-result-text";
import { MCPServerConfig, type MCPPrompt } from "@mcpjam/sdk";
import type { MCPPrompt, MCPServerConfig } from "@mcpjam/sdk/browser";
import {
getPrompt as getPromptApi,
listPrompts as listPromptsApi,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import { FileCode, Play, RefreshCw, ChevronRight, Eye } from "lucide-react";
import { EmptyState } from "./ui/empty-state";
import { JsonEditor } from "@/components/ui/json-editor";
import { extractDisplayFromValue } from "@/components/chat-v2/shared/tool-result-text";
import {
import type {
MCPReadResourceResult,
MCPResourceTemplate,
MCPServerConfig,
type MCPResourceTemplate,
type MCPReadResourceResult,
} from "@mcpjam/sdk";
} from "@mcpjam/sdk/browser";
import { listResourceTemplates as listResourceTemplatesApi } from "@/lib/apis/mcp-resource-templates-api";
import { readResource as readResourceTemplateApi } from "@/lib/apis/mcp-resources-api";
import { LoggerView } from "./logger-view";
Expand Down
10 changes: 5 additions & 5 deletions mcpjam-inspector/client/src/components/ResourcesTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import { EmptyState } from "./ui/empty-state";
import { ThreePanelLayout } from "./ui/three-panel-layout";
import { JsonEditor } from "@/components/ui/json-editor";
import { extractDisplayFromValue } from "@/components/chat-v2/shared/tool-result-text";
import {
import type {
MCPReadResourceResult,
MCPResource,
MCPResourceTemplate,
MCPServerConfig,
type MCPReadResourceResult,
type MCPResource,
type MCPResourceTemplate,
} from "@mcpjam/sdk";
} from "@mcpjam/sdk/browser";
import {
listResources,
readResource as readResourceApi,
Expand Down
33 changes: 33 additions & 0 deletions mcpjam-inspector/client/src/components/ServersTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ import { Skeleton } from "./ui/skeleton";
import { useConvexAuth } from "convex/react";
import { Workspace } from "@/state/app-types";
import { useWorkspaceServers as useRemoteWorkspaceServers } from "@/hooks/useWorkspaces";
import {
getEffectiveServerClientCapabilities,
workspaceClientCapabilitiesNeedReconnect,
} from "@/lib/client-config";
import {
DndContext,
closestCenter,
Expand Down Expand Up @@ -78,6 +82,7 @@ function SortableServerCard({
id,
dndDisabled,
server,
needsReconnect,
onDisconnect,
onReconnect,
onRemove,
Expand All @@ -87,6 +92,7 @@ function SortableServerCard({
id: string;
dndDisabled: boolean;
server: ServerWithName;
needsReconnect?: boolean;
onDisconnect: (name: string) => void;
onReconnect: (
name: string,
Expand Down Expand Up @@ -117,6 +123,7 @@ function SortableServerCard({
<div ref={setNodeRef} style={style} {...dragListeners}>
<ServerConnectionCard
server={server}
needsReconnect={needsReconnect}
onDisconnect={onDisconnect}
onReconnect={onReconnect}
onRemove={onRemove}
Expand Down Expand Up @@ -232,6 +239,27 @@ export function ServersTab({
};

const activeServer = activeId ? workspaceServers[activeId] : null;
const reconnectWarningByServerName = useMemo(
() =>
Object.fromEntries(
Object.entries(workspaceServers).map(([serverName, server]) => [
serverName,
server.connectionStatus === "connected" &&
workspaceClientCapabilitiesNeedReconnect({
desiredCapabilities: getEffectiveServerClientCapabilities({
workspaceClientConfig:
workspaces[activeWorkspaceId]?.clientConfig,
serverCapabilities: server.config.capabilities as
| Record<string, unknown>
| undefined,
}),
initializedCapabilities: server.initializationInfo
?.clientCapabilities as Record<string, unknown> | undefined,
}),
]),
),
[activeWorkspaceId, workspaceServers, workspaces],
);

const detailModalLiveServer = detailModalState.serverName
? (workspaceServers[detailModalState.serverName] ?? null)
Expand Down Expand Up @@ -478,6 +506,7 @@ export function ServersTab({
id={name}
dndDisabled={false}
server={server}
needsReconnect={reconnectWarningByServerName[name]}
onDisconnect={onDisconnect}
onReconnect={onReconnect}
onRemove={onRemove}
Expand All @@ -493,6 +522,9 @@ export function ServersTab({
<div style={{ opacity: 0.85 }}>
<ServerConnectionCard
server={activeServer}
needsReconnect={
reconnectWarningByServerName[activeServer.name]
}
onDisconnect={onDisconnect}
onReconnect={onReconnect}
onRemove={onRemove}
Expand Down Expand Up @@ -605,6 +637,7 @@ export function ServersTab({
isOpen={detailModalState.isOpen}
onClose={handleCloseDetailModal}
server={detailModalServer}
needsReconnect={reconnectWarningByServerName[detailModalServer.name]}
defaultTab={detailModalState.defaultTab}
onSubmit={handleSubmitDetailModal}
onDisconnect={onDisconnect}
Expand Down
2 changes: 1 addition & 1 deletion mcpjam-inspector/client/src/components/SettingsTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { updateThemeMode } from "@/lib/theme-utils";
import { Plus, Pencil, Trash2 } from "lucide-react";
import { HOSTED_MODE } from "@/lib/config";

import type { CustomProvider } from "@mcpjam/sdk";
import type { CustomProvider } from "@mcpjam/sdk/browser";

interface ProviderConfig {
id: string;
Expand Down
2 changes: 1 addition & 1 deletion mcpjam-inspector/client/src/components/TasksTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
import { EmptyState } from "./ui/empty-state";
import { JsonEditor } from "@/components/ui/json-editor";
import { extractDisplayFromToolResult } from "@/components/chat-v2/shared/tool-result-text";
import { MCPServerConfig } from "@mcpjam/sdk";
import type { MCPServerConfig } from "@mcpjam/sdk/browser";
import {
Task,
listTasks,
Expand Down
2 changes: 1 addition & 1 deletion mcpjam-inspector/client/src/components/ToolsTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import {
} from "@/lib/apis/mcp-tasks-api";
import { trackTask } from "@/lib/task-tracker";
import { validateToolOutput } from "@/lib/schema-utils";
import { MCPServerConfig } from "@mcpjam/sdk";
import type { MCPServerConfig } from "@mcpjam/sdk/browser";
import { detectEnvironment, detectPlatform } from "@/lib/PosthogUtils";
import { usePostHog } from "posthog-js/react";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect, vi, beforeEach } from "vitest";
import { render, screen, fireEvent, waitFor } from "@testing-library/react";
import { PromptsTab } from "../PromptsTab";
import type { MCPServerConfig } from "@mcpjam/sdk";
import type { MCPServerConfig } from "@mcpjam/sdk/browser";

const { mockJsonEditor } = vi.hoisted(() => ({
mockJsonEditor: vi.fn((props: any) => (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { beforeEach, describe, expect, it, vi } from "vitest";
import { fireEvent, render, screen, waitFor } from "@testing-library/react";
import { ResourceTemplatesTab } from "../ResourceTemplatesTab";
import type { MCPServerConfig } from "@mcpjam/sdk";
import type { MCPServerConfig } from "@mcpjam/sdk/browser";

const { mockJsonEditor } = vi.hoisted(() => ({
mockJsonEditor: vi.fn((props: any) => (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { describe, it, expect, vi, beforeEach } from "vitest";
import { render, screen, fireEvent, waitFor } from "@testing-library/react";
import { ResourcesTab } from "../ResourcesTab";
import type { MCPServerConfig } from "@mcpjam/sdk";
import type { MCPServerConfig } from "@mcpjam/sdk/browser";

const { mockJsonEditor } = vi.hoisted(() => ({
mockJsonEditor: vi.fn((props: any) => (
Expand Down
Loading
Loading