@gtkx/mcp 2.0.0-beta.10 → 2.0.0-beta.11

package/src/connection-registry.ts

@@ -9,7 +9,6 @@ import {
 } from "./transport.js";
 
 class ConnectionRegistry extends EventTarget implements AppConnections {
-    private connections: Map<string, ProtocolConnection> = new Map();
     private sockets: Map<string, Socket> = new Map();
 
     onRequest: ConnectionRequestHandler = (_connection, request) => Promise.reject(methodNotFoundError(request.method));
@@ -17,14 +16,12 @@ class ConnectionRegistry extends EventTarget implements AppConnections {
     register(socket: Socket): ProtocolConnection {
         const connection = ProtocolConnection.fromSocket(socket, {
             onClose: () => {
-                this.connections.delete(connection.id);
                 this.sockets.delete(connection.id);
                 this.dispatchEvent(connectionDisconnectionEvent(connection));
             },
             onError: (error) => this.dispatchEvent(connectionErrorEvent(error)),
         });
 
-        this.connections.set(connection.id, connection);
         this.sockets.set(connection.id, socket);
         connection.fallbackRequestHandler = (request) => this.onRequest(connection, request);
 

package/src/protocol/schemas.ts

@@ -20,11 +20,7 @@ type SerializedProperty = {
     note?: string;
 };
 
-type AppInfo = {
-    applicationId: string;
-    pid: number;
-    projectRoot?: string;
-};
+type AppInfo = z.output<typeof RegisterParamsSchema>;
 
 type ServerRequestParams<Method extends keyof typeof ServerRequestParamsSchemas> = z.infer<
     (typeof ServerRequestParamsSchemas)[Method]

package/src/reference.ts

@@ -1,5 +1,20 @@
-import { type ApiReference, type ApiSymbol, loadApiReference, resolveGirPath, resolveLibraries } from "@gtkx/codegen";
+import {
+    type ApiReference,
+    type ApiSymbol,
+    loadApiReference,
+    mergeOmittedProps,
+    resolveGirPath,
+    resolveLibraries,
+} from "@gtkx/codegen";
+import { readBuiltinElementsForDocs } from "@gtkx/codegen/internal";
 import { loadConfig } from "@gtkx/config";
+import {
+    CONFIG_EXTENSIONS,
+    configDependenciesFor,
+    resolveAcceptedChildTypes,
+    resolveElementProps,
+    resolveOmittedProps,
+} from "@gtkx/config/internal";
 import { type McpServer, ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { type CallToolResult, ErrorCode, McpError, type ReadResourceResult } from "@modelcontextprotocol/sdk/types.js";
 import { existsSync, statSync } from "node:fs";
@@ -58,7 +73,7 @@ type ResourceServer = Pick<McpServer, "registerResource">;
 
 const FRESHNESS_INTERVAL_MS = 2000;
 const FAILURE_RETRY_MS = 5000;
-const CONFIG_EXTENSIONS = ["ts", "mts", "js", "mjs", "json"];
+const CONFIG_LOCATIONS = ["gtkx.config", ".config/gtkx", ".config/gtkx.config"];
 
 const PROJECT_SOURCE_LABELS: Record<ProjectSource, string> = {
     argument: "requested with `projectRoot`",
@@ -128,10 +143,13 @@ const isFresh = (loaded: LoadedReference): boolean =>
         const current = watchFile(file.path);
 
         return current.mtimeMs === file.mtimeMs && current.size === file.size;
-    });
+    }) && loaded.reference.hasFreshInputs();
+
+const configCandidatePaths = (directory: string): string[] =>
+    CONFIG_LOCATIONS.flatMap((location) =>
+        CONFIG_EXTENSIONS.map((extension) => join(directory, `${location}${extension}`)));
 
-const hasConfigFile = (directory: string): boolean =>
-    CONFIG_EXTENSIONS.some((extension) => existsSync(join(directory, `gtkx.config.${extension}`)));
+const hasConfigFile = (directory: string): boolean => configCandidatePaths(directory).some((path) => existsSync(path));
 
 const findProjectRoot = (start: string): string | undefined => {
     const current = resolve(start);
@@ -172,7 +190,8 @@ const resolveProject = (
 };
 
 const loadReference = async (requestedRoot: string): Promise<LoadedReference> => {
-    const { config, configFile, root } = await loadConfig(requestedRoot);
+    const loaded = await loadConfig(requestedRoot);
+    const { config, root } = loaded;
 
     if (config.codegen === false) {
         throw new Error(
@@ -182,7 +201,7 @@ const loadReference = async (requestedRoot: string): Promise<LoadedReference> =>
         );
     }
 
-    const girPath = resolveGirPath(config.girPath);
+    const girPath = resolveGirPath(config.girPath, root);
 
     if (girPath.length === 0) {
         throw new Error(
@@ -193,13 +212,22 @@ const loadReference = async (requestedRoot: string): Promise<LoadedReference> =>
     }
 
     const libraries = resolveLibraries(config.libraries);
+    const builtin = await readBuiltinElementsForDocs();
 
     const reference = loadApiReference({
         libraries,
         girPath,
+        resolveFrom: root,
+        props: { ...builtin.props, ...resolveElementProps(config.elements) },
+        omittedProps: mergeOmittedProps(builtin.omittedProps, resolveOmittedProps(config.elements)),
+        acceptedChildTypes: { ...builtin.acceptedChildTypes, ...resolveAcceptedChildTypes(config.elements) },
     });
 
-    const watched = [watchFile(resolve(root, configFile)), ...reference.girFiles.map((file) => watchFile(file))];
+    const watched = [...new Set([
+        ...configDependenciesFor(loaded),
+        ...configCandidatePaths(root),
+        ...reference.inputFiles,
+    ])].map((file) => watchFile(file));
 
     return { reference, root, watched };
 };

package/src/server.ts

@@ -1,9 +1,11 @@
 import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { loadConfig } from "@gtkx/config";
-import { type McpSettings, resolveMcpSettings } from "@gtkx/config/internal";
+import { configDependenciesFor, type McpSettings, resolveMcpSettings } from "@gtkx/config/internal";
 import { createLogger, installGracefulShutdown, type Logger } from "@gtkx/utils";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { existsSync } from "node:fs";
+import { resolve } from "node:path";
 import { parseArgs } from "node:util";
 import { z } from "zod";
 import type { ConnectionErrorEvent } from "./transport.js";
@@ -175,9 +177,8 @@ const screenshotShape = {
         .boolean()
         .optional()
         .describe(
-            "Whether to return the PNG as image content, true by default. Pass false together with `path` " +
-            "to save the screenshot and get back only where it landed, which keeps the image out of the " +
-            "conversation until something actually needs to look at it.",
+            "Return the PNG as image content (default: true). Set false with `path` to save the image " +
+            "and return only its file location.",
         ),
 };
 
@@ -296,18 +297,14 @@ const widgetPropsTool = (appRouter: AppRouter): Tool =>
         title: "Get widget properties",
         kind: "readOnly",
         description:
-            "Get a fixed summary of one widget by ID: type, accessible role, name, text, sensitivity, " +
-            "visibility, CSS classes, and the same summary for its descendants. The subtree is bounded " +
-            `twice: ${String(DEFAULT_SUBTREE_DEPTH)} levels deep unless \`maxDepth\` says otherwise, and ` +
-            `${String(MAX_SUBTREE_WIDGETS)} widgets in all, filled breadth first. Wherever either bound ` +
-            "cut a branch, that widget carries `hiddenChildren`, the count of its own direct children left " +
-            "out rather than of everything below them; call again with that widget's ID to drill in, or " +
-            "use `gtkx_get_widget_tree` for a wider map. Pass `properties` to read GObject properties too; " +
-            "they come back first in the payload, each under its canonical kebab-case name as " +
-            "`{type, value}`, where an enum or flags value is its GType value name, a 64-bit integer a " +
-            "decimal string, and an object its GType name plus `widgetId` when it is a widget. Asking for " +
-            "a property the widget does not have fails; a value that cannot be marshalled carries a `note` " +
-            "instead.",
+            "Read a widget's type, accessible role, name, text, sensitivity, visibility, CSS classes, " +
+            `and descendants. Defaults to ${String(DEFAULT_SUBTREE_DEPTH)} levels; \`maxDepth\` changes ` +
+            `the depth. Results contain at most ${String(MAX_SUBTREE_WIDGETS)} widgets, in breadth-first ` +
+            "order. `hiddenChildren` counts omitted direct children; query that widget's ID to expand it. " +
+            "Use `gtkx_get_widget_tree` for an overview. Requested GObject `properties` appear first, " +
+            "keyed by canonical kebab-case name with `{type, value}`. Enum/flags values use GType value " +
+            "names, 64-bit integers use decimal strings, and objects use their GType name plus `widgetId` " +
+            "for widgets. Unknown properties fail; values that cannot be converted include a `note`.",
         inputSchema: widgetPropsShape,
         handler: async ({ applicationId, appTimeout, ...params }) => {
             const result = await appRouter.sendToApp(applicationId, "widget.getProps", params, appTimeout);
@@ -365,7 +362,7 @@ function buildInteractionTools(appRouter: AppRouter): Tool[] {
             title: "Click widget",
             kind: "action",
             description:
-                "Click a widget through userEvent.click, with no special case per widget. Works with " +
+                "Click a widget through userEvent.click. Works with " +
                 "buttons, checkboxes, switches, list and grid rows, tree expanders, and column headers: a " +
                 "row is selected, an expander toggles its row's expansion, and a header sorts its column.",
             inputSchema: widgetIdShape,
@@ -539,7 +536,11 @@ const configuredSettings = async (cwd: string): Promise<McpSettings> => {
         const { config } = await loadConfig(cwd);
 
         return resolveMcpSettings(config);
-    } catch {
+    } catch (error) {
+        if (configDependenciesFor(error).some((path) => existsSync(resolve(cwd, path)))) {
+            throw error;
+        }
+
         return DEFAULT_SETTINGS;
     }
 };

package/src/tool-filter.ts

@@ -2,12 +2,9 @@ import type { McpSettings } from "@gtkx/config/internal";
 import type { Tool } from "./tool.js";
 
 const NEGATION_PREFIX = "!";
-const SPECIAL_CHARACTERS = /[.+?^${}()|[\]\\]/g;
-
-const escapeLiteral = (value: string): string => value.replaceAll(SPECIAL_CHARACTERS, String.raw`\$&`);
 
 const patternToRegExp = (pattern: string): RegExp =>
-    new RegExp(`^${pattern.split("*").map((part) => escapeLiteral(part)).join(".*")}$`);
+    new RegExp(`^${pattern.split("*").map((part) => RegExp.escape(part)).join(".*")}$`);
 
 const matchingNames = (tools: Tool[], pattern: string): string[] => {
     const expression = patternToRegExp(pattern);