diff --git a/packages/devtools/client/src/components/ErrorFallback/ErrorFallback.tsx b/packages/devtools/client/src/components/Error/Fallback.tsx
similarity index 77%
rename from packages/devtools/client/src/components/ErrorFallback/ErrorFallback.tsx
rename to packages/devtools/client/src/components/Error/Fallback.tsx
index f0356b35f15b..899cf53e7a89 100644
--- a/packages/devtools/client/src/components/ErrorFallback/ErrorFallback.tsx
+++ b/packages/devtools/client/src/components/Error/Fallback.tsx
@@ -21,14 +21,12 @@ export const ErrorFallback: React.FC<ErrorFallbackProps> = props => {
       <Heading as="h4" mb="4">
         <Text as="span">{title}</Text>
       </Heading>
-      <TextArea disabled style={{ height: '50vh' }}>
-        {description}
-      </TextArea>
+      <TextArea disabled style={{ height: '50vh' }} value={description} />
     </Box>
   );
 };
 
-export const ErrorRouteHandler: React.FC<ErrorFallbackProps> = props => {
+export const ErrorRouteHandler: React.FC = () => {
   const error = useRouteError();
-  return <ErrorFallback {...props} error={error} />;
+  return <ErrorFallback resetErrorBoundary={() => null} error={error} />;
 };
diff --git a/packages/devtools/client/src/components/Error/FeatureDisabled.module.scss b/packages/devtools/client/src/components/Error/FeatureDisabled.module.scss
new file mode 100644
index 000000000000..75812d6f9904
--- /dev/null
+++ b/packages/devtools/client/src/components/Error/FeatureDisabled.module.scss
@@ -0,0 +1,9 @@
+.container {
+  width: max-content;
+  min-width: var(--space-9);
+  color: var(--gray-11);
+}
+
+.children {
+  color: var(--gray-9);
+}
diff --git a/packages/devtools/client/src/components/Error/FeatureDisabled.tsx b/packages/devtools/client/src/components/Error/FeatureDisabled.tsx
new file mode 100644
index 000000000000..779cabdfd3c3
--- /dev/null
+++ b/packages/devtools/client/src/components/Error/FeatureDisabled.tsx
@@ -0,0 +1,25 @@
+import React, { PropsWithChildren } from 'react';
+import { Box, Flex, Heading } from '@radix-ui/themes';
+import { HiExclamationCircle } from 'react-icons/hi2';
+import styles from './FeatureDisabled.module.scss';
+
+export interface FeatureDisabledProps extends PropsWithChildren {
+  title: string;
+}
+
+export const FeatureDisabled: React.FC<FeatureDisabledProps> = props => {
+  const { title, children } = props;
+  return (
+    <Flex className={styles.container} mt="9" mx="auto" gap="2">
+      <Flex height="9" align="center">
+        <HiExclamationCircle size="36" />
+      </Flex>
+      <Box>
+        <Flex height="9" align="center">
+          <Heading>{title}</Heading>
+        </Flex>
+        <Box className={styles.children}>{children}</Box>
+      </Box>
+    </Flex>
+  );
+};
diff --git a/packages/devtools/client/src/components/ErrorFallback/index.ts b/packages/devtools/client/src/components/ErrorFallback/index.ts
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/packages/devtools/client/src/entries/client/routes/config/error.tsx b/packages/devtools/client/src/entries/client/routes/config/error.tsx
index fc315e95a4f8..23d8d6dbd39c 100644
--- a/packages/devtools/client/src/entries/client/routes/config/error.tsx
+++ b/packages/devtools/client/src/entries/client/routes/config/error.tsx
@@ -1,3 +1,3 @@
-import { ErrorRouteHandler } from '@/components/ErrorFallback/ErrorFallback';
+import { ErrorRouteHandler } from '@/components/Error/Fallback';
 
 export default ErrorRouteHandler;
diff --git a/packages/devtools/client/src/entries/client/routes/context/error.tsx b/packages/devtools/client/src/entries/client/routes/context/error.tsx
index fc315e95a4f8..23d8d6dbd39c 100644
--- a/packages/devtools/client/src/entries/client/routes/context/error.tsx
+++ b/packages/devtools/client/src/entries/client/routes/context/error.tsx
@@ -1,3 +1,3 @@
-import { ErrorRouteHandler } from '@/components/ErrorFallback/ErrorFallback';
+import { ErrorRouteHandler } from '@/components/Error/Fallback';
 
 export default ErrorRouteHandler;
diff --git a/packages/devtools/client/src/entries/client/routes/doctor/error.tsx b/packages/devtools/client/src/entries/client/routes/doctor/error.tsx
new file mode 100644
index 000000000000..40cfd4c466cd
--- /dev/null
+++ b/packages/devtools/client/src/entries/client/routes/doctor/error.tsx
@@ -0,0 +1,37 @@
+import { FC } from 'react';
+import { useRouteError } from '@modern-js/runtime/router';
+import { Box, Link } from '@radix-ui/themes';
+import { useSnapshot } from 'valtio';
+import { parseURL } from 'ufo';
+import { $definition } from '../state';
+import {
+  ErrorFallbackProps,
+  ErrorRouteHandler,
+} from '@/components/Error/Fallback';
+import { FeatureDisabled } from '@/components/Error/FeatureDisabled';
+
+const Handler: FC<ErrorFallbackProps> = () => {
+  const error = useRouteError();
+  const def = useSnapshot($definition);
+  const isStateError =
+    error && typeof error === 'object' && Object.keys(error).length === 0;
+  if (isStateError) {
+    const websiteDisplay = parseURL(def.doctor.website).host;
+    const websiteLink = (
+      <Link href={def.doctor.website} target="_blank" rel="noopener noreferrer">
+        🔗{websiteDisplay}
+      </Link>
+    );
+    return (
+      <Box width="100%">
+        <FeatureDisabled title="Doctor is not working">
+          Visit the website of {websiteLink} to learn more.
+        </FeatureDisabled>
+      </Box>
+    );
+  } else {
+    return <ErrorRouteHandler />;
+  }
+};
+
+export default Handler;
diff --git a/packages/devtools/client/src/entries/client/routes/doctor/page.tsx b/packages/devtools/client/src/entries/client/routes/doctor/page.tsx
index ade8a4b7c5ec..ec4678ddbc2e 100644
--- a/packages/devtools/client/src/entries/client/routes/doctor/page.tsx
+++ b/packages/devtools/client/src/entries/client/routes/doctor/page.tsx
@@ -20,7 +20,7 @@ import {
 import _ from 'lodash';
 import { parseURL } from 'ufo';
 import clsx from 'clsx';
-import { $dependencies } from '../state';
+import { $definition, $dependencies } from '../state';
 import logo from './rsdoctor-large.png';
 import { $doctor } from './state';
 import styles from './page.module.scss';
@@ -79,11 +79,12 @@ const Page: FC = () => {
   const doctor = useSnapshot($doctor);
 
   const dependencies = useSnapshot($dependencies);
+  const def = useSnapshot($definition);
   const isWebDoctor = Object.keys(dependencies).find(key =>
     key.startsWith('@web-doctor/'),
   );
   const implementation = isWebDoctor ? 'Web Doctor' : 'Rsdoctor';
-  const website = 'https://rsdoctor.dev';
+  const { website } = def.doctor;
   const version =
     dependencies['@web-doctor/webpack-plugin(builder)'] ??
     dependencies['@web-doctor/rspack-plugin(builder)'] ??
diff --git a/packages/devtools/client/src/entries/client/routes/error.tsx b/packages/devtools/client/src/entries/client/routes/error.tsx
index fc315e95a4f8..23d8d6dbd39c 100644
--- a/packages/devtools/client/src/entries/client/routes/error.tsx
+++ b/packages/devtools/client/src/entries/client/routes/error.tsx
@@ -1,3 +1,3 @@
-import { ErrorRouteHandler } from '@/components/ErrorFallback/ErrorFallback';
+import { ErrorRouteHandler } from '@/components/Error/Fallback';
 
 export default ErrorRouteHandler;
diff --git a/packages/devtools/client/src/entries/client/routes/headers/error.tsx b/packages/devtools/client/src/entries/client/routes/headers/error.tsx
index fc315e95a4f8..23d8d6dbd39c 100644
--- a/packages/devtools/client/src/entries/client/routes/headers/error.tsx
+++ b/packages/devtools/client/src/entries/client/routes/headers/error.tsx
@@ -1,3 +1,3 @@
-import { ErrorRouteHandler } from '@/components/ErrorFallback/ErrorFallback';
+import { ErrorRouteHandler } from '@/components/Error/Fallback';
 
 export default ErrorRouteHandler;
diff --git a/packages/devtools/client/src/entries/client/routes/overview/error.tsx b/packages/devtools/client/src/entries/client/routes/overview/error.tsx
index fc315e95a4f8..23d8d6dbd39c 100644
--- a/packages/devtools/client/src/entries/client/routes/overview/error.tsx
+++ b/packages/devtools/client/src/entries/client/routes/overview/error.tsx
@@ -1,3 +1,3 @@
-import { ErrorRouteHandler } from '@/components/ErrorFallback/ErrorFallback';
+import { ErrorRouteHandler } from '@/components/Error/Fallback';
 
 export default ErrorRouteHandler;
diff --git a/packages/devtools/client/src/entries/client/routes/pages/error.tsx b/packages/devtools/client/src/entries/client/routes/pages/error.tsx
index fc315e95a4f8..23d8d6dbd39c 100644
--- a/packages/devtools/client/src/entries/client/routes/pages/error.tsx
+++ b/packages/devtools/client/src/entries/client/routes/pages/error.tsx
@@ -1,3 +1,3 @@
-import { ErrorRouteHandler } from '@/components/ErrorFallback/ErrorFallback';
+import { ErrorRouteHandler } from '@/components/Error/Fallback';
 
 export default ErrorRouteHandler;
diff --git a/packages/devtools/client/src/entries/client/routes/react/error.tsx b/packages/devtools/client/src/entries/client/routes/react/error.tsx
index fc315e95a4f8..23d8d6dbd39c 100644
--- a/packages/devtools/client/src/entries/client/routes/react/error.tsx
+++ b/packages/devtools/client/src/entries/client/routes/react/error.tsx
@@ -1,3 +1,3 @@
-import { ErrorRouteHandler } from '@/components/ErrorFallback/ErrorFallback';
+import { ErrorRouteHandler } from '@/components/Error/Fallback';
 
 export default ErrorRouteHandler;
diff --git a/packages/devtools/client/src/entries/client/routes/state.tsx b/packages/devtools/client/src/entries/client/routes/state.tsx
index 41b94f99451e..2aed9970e14e 100644
--- a/packages/devtools/client/src/entries/client/routes/state.tsx
+++ b/packages/devtools/client/src/entries/client/routes/state.tsx
@@ -154,6 +154,7 @@ export const $definition = proxy({
   packages: _definitionTask.then(def => def.packages),
   assets: _definitionTask.then(def => def.assets),
   announcement: _definitionTask.then(def => def.announcement),
+  doctor: _definitionTask.then(def => def.doctor),
 });
 
 export const _dependenciesTask = $server.then(({ remote }) =>
diff --git a/packages/devtools/kit/src/client.ts b/packages/devtools/kit/src/client.ts
index 21fc33d62ecb..50a4d92836b9 100644
--- a/packages/devtools/kit/src/client.ts
+++ b/packages/devtools/kit/src/client.ts
@@ -39,6 +39,10 @@ export class AnnouncementDefinition {
   fallback: string = 'https://modernjs.dev/';
 }
 
+export class DoctorDefinition {
+  website: string = 'https://rsdoctor.dev';
+}
+
 export class ClientDefinition {
   name: NameDefinition = new NameDefinition();
 
@@ -46,6 +50,8 @@ export class ClientDefinition {
 
   assets: AssetDefinition = new AssetDefinition();
 
+  doctor: DoctorDefinition = new DoctorDefinition();
+
   announcement: AnnouncementDefinition = new AnnouncementDefinition();
 }
 
diff --git a/packages/devtools/plugin/package.json b/packages/devtools/plugin/package.json
index 8484e714790f..e76b155f1f2f 100644
--- a/packages/devtools/plugin/package.json
+++ b/packages/devtools/plugin/package.json
@@ -28,15 +28,18 @@
         "jsnext:source": "./src/index.ts",
         "require": "./dist/index.js"
       },
-      "default": "./dist/index.js"
+      "default": "./dist/index.js",
+      "types": "./dist/index.d.ts"
     },
     "./cli": {
       "jsnext:source": "./src/cli.ts",
-      "default": "./dist/cli.js"
+      "default": "./dist/cli.js",
+      "types": "./dist/cli.d.ts"
     },
     "./runtime": {
       "jsnext:source": "./src/runtime.ts",
-      "default": "./dist/runtime.js"
+      "default": "./dist/runtime.js",
+      "types": "./dist/runtime.d.ts"
     }
   },
   "scripts": {
diff --git a/packages/devtools/plugin/src/cli.ts b/packages/devtools/plugin/src/cli.ts
index 0589e0f1fd8c..262c37005de4 100644
--- a/packages/devtools/plugin/src/cli.ts
+++ b/packages/devtools/plugin/src/cli.ts
@@ -5,126 +5,131 @@ import { ProxyDetail } from '@modern-js/types';
 import { getPort, logger } from '@modern-js/utils';
 import createServeMiddleware from 'serve-static';
 import type { AppTools, CliPlugin } from '@modern-js/app-tools';
-import { ROUTE_BASENAME } from '@modern-js/devtools-kit/node';
-import {
-  DevtoolsPluginOptions,
-  DevtoolsPluginInlineOptions,
-  resolveContext,
-} from './config';
+import { ClientDefinition, ROUTE_BASENAME } from '@modern-js/devtools-kit/node';
+import { DevtoolsPluginOptions, resolveContext } from './config';
 import { setupClientConnection } from './rpc';
 import { SocketServer } from './utils/socket';
 
-export type { DevtoolsPluginOptions, DevtoolsPluginInlineOptions };
+export type { DevtoolsPluginOptions };
 
-export const devtoolsPlugin = (
-  inlineOptions: DevtoolsPluginInlineOptions = {},
-): CliPlugin<AppTools> => ({
-  name: '@modern-js/plugin-devtools',
-  usePlugins: [],
-  setup: async api => {
-    const ctx = resolveContext(inlineOptions);
-    if (!ctx.enable) {
-      return {};
-    }
+export type DevtoolsPlugin = CliPlugin<AppTools> & {
+  setClientDefinition: (def: ClientDefinition) => void;
+};
 
-    const httpServer = await setupHttpServer();
-    const socketServer = new SocketServer({
-      server: httpServer.instance,
-      path: '/rpc',
-    });
-    const rpc = await setupClientConnection({ api, server: socketServer });
+export const devtoolsPlugin = (
+  inlineOptions: DevtoolsPluginOptions = {},
+): DevtoolsPlugin => {
+  const ctx = resolveContext(inlineOptions);
+  return {
+    name: '@modern-js/plugin-devtools',
+    usePlugins: [],
+    setClientDefinition(def) {
+      Object.assign(ctx.def, def);
+    },
+    async setup(api) {
+      if (!ctx.enable) return {};
 
-    return {
-      prepare: rpc.hooks.prepare,
-      modifyFileSystemRoutes: rpc.hooks.modifyFileSystemRoutes,
-      beforeRestart() {
-        return new Promise((resolve, reject) =>
-          httpServer.instance.close(err => (err ? reject(err) : resolve())),
-        );
-      },
-      modifyServerRoutes({ routes }) {
-        routes.push({
-          urlPath: '/sw-proxy.js',
-          isSPA: true,
-          isSSR: false,
-          entryPath: 'public/sw-proxy.js',
-        });
-        return { routes };
-      },
-      config() {
-        const config = api.useConfigContext().devtools ?? {};
-        Object.assign(ctx, resolveContext(ctx, config), {
-          __keep: true, // Keep resource query always existing.
-        });
-        logger.info(`${ctx.def.name.formalName} Devtools is enabled`);
+      const httpServer = await setupHttpServer();
+      const socketServer = new SocketServer({
+        server: httpServer.instance,
+        path: '/rpc',
+      });
+      const rpc = await setupClientConnection({
+        api,
+        server: socketServer,
+        def: ctx.def,
+      });
 
-        const swProxyEntry = require.resolve(
-          '@modern-js/devtools-client/sw-proxy',
-        );
+      return {
+        prepare: rpc.hooks.prepare,
+        modifyFileSystemRoutes: rpc.hooks.modifyFileSystemRoutes,
+        beforeRestart() {
+          return new Promise((resolve, reject) =>
+            httpServer.instance.close(err => (err ? reject(err) : resolve())),
+          );
+        },
+        modifyServerRoutes({ routes }) {
+          routes.push({
+            urlPath: '/sw-proxy.js',
+            isSPA: true,
+            isSSR: false,
+            entryPath: 'public/sw-proxy.js',
+          });
+          return { routes };
+        },
+        config() {
+          const config = api.useConfigContext().devtools ?? {};
+          Object.assign(ctx, resolveContext(ctx, config));
+          logger.info(`${ctx.def.name.formalName} DevTools is enabled`);
 
-        // Inject options to client.
-        const serializedOptions = JSON.stringify(ctx);
-        const tags: AppTools['normalizedConfig']['html']['tags'] = [
-          {
-            tag: 'script',
-            children: `window.__MODERN_JS_DEVTOOLS_OPTIONS__ = ${serializedOptions};`,
-            head: true,
-            append: false,
-          },
-        ];
+          const swProxyEntry = require.resolve(
+            '@modern-js/devtools-client/sw-proxy',
+          );
 
-        const styles: string[] = [];
-        const manifest = require('@modern-js/devtools-client/manifest');
-        // Inject JavaScript chunks to client.
-        for (const src of manifest.routeAssets.mount.assets) {
-          assert(typeof src === 'string');
-          if (src.endsWith('.js')) {
-            tags.push({
+          // Inject options to client.
+          const serializedOptions = JSON.stringify(ctx);
+          const tags: AppTools['normalizedConfig']['html']['tags'] = [
+            {
               tag: 'script',
-              attrs: { src },
+              children: `window.__MODERN_JS_DEVTOOLS_OPTIONS__ = ${serializedOptions};`,
               head: true,
               append: false,
-            });
-          } else if (src.endsWith('.css')) {
-            styles.push(src);
+            },
+          ];
+
+          const styles: string[] = [];
+          const manifest = require('@modern-js/devtools-client/manifest');
+          // Inject JavaScript chunks to client.
+          for (const src of manifest.routeAssets.mount.assets) {
+            assert(typeof src === 'string');
+            if (src.endsWith('.js')) {
+              tags.push({
+                tag: 'script',
+                attrs: { src },
+                head: true,
+                append: false,
+              });
+            } else if (src.endsWith('.css')) {
+              styles.push(src);
+            }
           }
-        }
-        // Inject CSS chunks to client inside of template to avoid polluting global.
-        tags.push({
-          tag: 'template',
-          attrs: { id: '_modern_js_devtools_styles' },
-          append: true,
-          head: false,
-          children: styles
-            .map(src => `<link rel="stylesheet" href="${src}">`)
-            .join(''),
-        });
+          // Inject CSS chunks to client inside of template to avoid polluting global.
+          tags.push({
+            tag: 'template',
+            attrs: { id: '_modern_js_devtools_styles' },
+            append: true,
+            head: false,
+            children: styles
+              .map(src => `<link rel="stylesheet" href="${src}">`)
+              .join(''),
+          });
 
-        return {
-          builderPlugins: [rpc.builderPlugin],
-          source: {},
-          output: {
-            copy: [{ from: swProxyEntry, to: 'public' }],
-          },
-          html: { tags },
-          tools: {
-            devServer: {
-              proxy: {
-                [ROUTE_BASENAME]: {
-                  target: `http://localhost:${httpServer.port}`,
-                  pathRewrite: {
-                    [`^${ROUTE_BASENAME}`]: '',
+          return {
+            builderPlugins: [rpc.builderPlugin],
+            source: {},
+            output: {
+              copy: [{ from: swProxyEntry, to: 'public' }],
+            },
+            html: { tags },
+            tools: {
+              devServer: {
+                proxy: {
+                  [ROUTE_BASENAME]: {
+                    target: `http://localhost:${httpServer.port}`,
+                    pathRewrite: {
+                      [`^${ROUTE_BASENAME}`]: '',
+                    },
+                    ws: true,
                   },
-                  ws: true,
-                },
-              } as Record<string, ProxyDetail>,
+                } as Record<string, ProxyDetail>,
+              },
             },
-          },
-        };
-      },
-    };
-  },
-});
+          };
+        },
+      };
+    },
+  };
+};
 
 export default devtoolsPlugin;
 
diff --git a/packages/devtools/plugin/src/config.ts b/packages/devtools/plugin/src/config.ts
index d0df86d65959..8d9a992a5200 100644
--- a/packages/devtools/plugin/src/config.ts
+++ b/packages/devtools/plugin/src/config.ts
@@ -1,25 +1,18 @@
-import {
-  ClientDefinition,
-  ROUTE_BASENAME,
-  SetupClientParams,
-} from '@modern-js/devtools-kit/node';
+import { ClientDefinition, ROUTE_BASENAME } from '@modern-js/devtools-kit/node';
 import type { RequiredDeep } from 'type-fest';
 
-export type DevtoolsPluginOptions = Partial<SetupClientParams>;
-
-export interface DevtoolsPluginInlineOptions extends DevtoolsPluginOptions {
+export interface DevtoolsPluginOptions {
   enable?: boolean;
+  endpoint?: string;
+  dataSource?: string;
 }
 
-export type DevtoolsContext = RequiredDeep<DevtoolsPluginInlineOptions>;
-
-export const getDefaultOptions = () =>
-  ({
-    def: new ClientDefinition(),
-  } satisfies DevtoolsPluginOptions);
+export interface DevtoolsContext extends RequiredDeep<DevtoolsPluginOptions> {
+  def: ClientDefinition;
+}
 
 export const resolveContext = (
-  ...sources: DevtoolsPluginInlineOptions[]
+  ...sources: Partial<DevtoolsContext>[]
 ): DevtoolsContext => {
   const ret: DevtoolsContext = {
     enable: process.env.NODE_ENV === 'development',
@@ -27,24 +20,15 @@ export const resolveContext = (
     endpoint: ROUTE_BASENAME,
     def: new ClientDefinition(),
   };
+
+  // Keep resource query always existing.
+  Object.assign(ret, { __keep: true });
+
   for (const opts of sources) {
     ret.enable = opts.enable ?? ret.enable;
     ret.dataSource = opts.dataSource ?? ret.dataSource;
     ret.endpoint = opts.endpoint ?? ret.endpoint;
-    if (opts.def) {
-      if (opts.def.announcement) {
-        Object.assign(ret.def.announcement, opts.def.announcement);
-      }
-      if (opts.def.assets) {
-        Object.assign(ret.def.assets, opts.def.assets);
-      }
-      if (opts.def.name) {
-        Object.assign(ret.def.name, opts.def.name);
-      }
-      if (opts.def.packages) {
-        Object.assign(ret.def.packages, opts.def.packages);
-      }
-    }
+    ret.def = opts.def ?? ret.def;
   }
   return ret;
 };
diff --git a/packages/devtools/plugin/src/index.ts b/packages/devtools/plugin/src/index.ts
index 27d7e7f2e141..d14858945181 100644
--- a/packages/devtools/plugin/src/index.ts
+++ b/packages/devtools/plugin/src/index.ts
@@ -1,2 +1,2 @@
 export { devtoolsPlugin, default } from './cli';
-export type { DevtoolsPluginOptions, DevtoolsPluginInlineOptions } from './cli';
+export type { DevtoolsPluginOptions } from './cli';
diff --git a/packages/devtools/plugin/src/rpc/index.ts b/packages/devtools/plugin/src/rpc/index.ts
index db1cb7321636..c54dc1934483 100644
--- a/packages/devtools/plugin/src/rpc/index.ts
+++ b/packages/devtools/plugin/src/rpc/index.ts
@@ -10,7 +10,7 @@ import {
   findManifest,
   parseManifest,
 } from '@modern-js/devtools-kit/node';
-import type { JsonValue, PartialDeep } from 'type-fest';
+import type { JsonValue } from 'type-fest';
 import { createBirpc, BirpcOptions } from 'birpc';
 import * as flatted from 'flatted';
 import createDeferPromise from 'p-defer';
@@ -23,16 +23,13 @@ import { requireModule } from '../utils/module';
 export interface SetupClientConnectionOptions {
   api: CliPluginAPI;
   server: SocketServer;
+  def: ClientDefinition;
 }
 
 export const setupClientConnection = async (
   options: SetupClientConnectionOptions,
 ) => {
-  const { api, server } = options;
-  let def: PartialDeep<ClientDefinition> = {};
-  const setDefinition = (definition: PartialDeep<ClientDefinition>) => {
-    def = definition;
-  };
+  const { api, server, def } = options;
 
   const _fileSystemRoutesMap: Record<string, FileSystemRoutes> = {};
 
@@ -165,12 +162,7 @@ export const setupClientConnection = async (
       return deferred.compileTimeCost.promise;
     },
     async getClientDefinition() {
-      const ret = new ClientDefinition();
-      Object.assign(ret.name, def.name);
-      Object.assign(ret.packages, def.packages);
-      Object.assign(ret.assets, def.assets);
-      Object.assign(ret.announcement, def.announcement);
-      return ret;
+      return def;
     },
     async getDoctorOverview() {
       const ctx = api.useAppContext();
@@ -268,5 +260,5 @@ export const setupClientConnection = async (
     },
   };
 
-  return { client: clientConn, hooks, builderPlugin, setDefinition };
+  return { client: clientConn, hooks, builderPlugin };
 };