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

package/dist/socket-server.js

@@ -2,7 +2,7 @@ import { createHash } from "node:crypto";
 import * as fs from "node:fs";
 import * as net from "node:net";
 import { basename, dirname, join, resolve as resolvePath } from "node:path";
-import { DEFAULT_SOCKET_PATH } from "./protocol/schemas.js";
+import { cleanupMcpSocketAddress, prepareMcpSocketAddress, resolveMcpSocketAddress, } from "./socket-path.js";
 import { connectionErrorEvent } from "./transport.js";
 const PROBE_TIMEOUT_MS = 1000;
 const PROBE_ATTEMPTS = 3;
@@ -49,11 +49,6 @@ const acquireClaimLock = async (socketPath) => {
     }
     return lock;
 };
-const releaseClaimLock = async (lock) => {
-    if (lock) {
-        await closeServer(lock);
-    }
-};
 const withClaimLock = async (socketPath, action) => {
     const lock = await acquireClaimLock(socketPath);
     if (lock === null) {
@@ -110,8 +105,8 @@ const alreadyOwnedError = (socketPath) => new Error(`Another GTKX MCP server alr
 const undecidedOwnerError = (socketPath, code) => new Error(`Could not tell whether another GTKX MCP server owns ${socketPath}: probing it failed with ${code}. ` +
     "Leaving the socket in place instead of removing one that may still be serving another session. " +
     "Retry, or delete the file by hand once no server is running.");
-const directoryPathError = (socketPath) => new Error(`The GTKX MCP socket path ${socketPath} is a directory, not a socket. ` +
-    "Remove it, or point XDG_RUNTIME_DIR at a directory where GTKX can create its socket.");
+const invalidPathError = (socketPath) => new Error(`The GTKX MCP socket path ${socketPath} exists and is not a socket. ` +
+    "Move it, or point XDG_RUNTIME_DIR at a directory where GTKX can create its socket.");
 const listenFailureError = (socketPath, code) => new Error(`Could not create the GTKX MCP socket at ${socketPath}: listening failed with ${code}. ` +
     "Check that its directory exists and is writable.");
 const removeEntry = (target, inode) => {
@@ -124,8 +119,8 @@ const clearStalePath = async (target) => {
     if (entry === null) {
         return { kind: "vacant" };
     }
-    if (entry.isDirectory()) {
-        return { kind: "directory" };
+    if (!entry.isSocket()) {
+        return { kind: "invalid" };
     }
     const outcome = await probeUntilConclusive(target);
     if (outcome.kind === "vacant") {
@@ -138,8 +133,8 @@ const requireVacantPath = async (socketPath) => {
     if (verdict.kind === "live") {
         throw alreadyOwnedError(socketPath);
     }
-    if (verdict.kind === "directory") {
-        throw directoryPathError(socketPath);
+    if (verdict.kind === "invalid") {
+        throw invalidPathError(socketPath);
     }
     if (verdict.kind === "unknown") {
         throw undecidedOwnerError(socketPath, verdict.code);
@@ -168,24 +163,17 @@ const publishSocket = async (privatePath, socketPath) => {
     }
     throw alreadyOwnedError(socketPath);
 };
-const releaseSocketPath = async (socketPath, inode) => {
-    const lock = await acquireClaimLock(socketPath);
-    try {
-        removeEntry(socketPath, inode);
-    }
-    finally {
-        await releaseClaimLock(lock);
-    }
-};
 class SocketServer {
     server = null;
     socketPath;
     registry;
+    address;
     boundInode = null;
     startup = null;
-    constructor(registry, socketPath = DEFAULT_SOCKET_PATH) {
+    constructor(registry, address = resolveMcpSocketAddress()) {
         this.registry = registry;
-        this.socketPath = socketPath;
+        this.address = address;
+        this.socketPath = address.path;
     }
     listen(privatePath) {
         return new Promise((resolve, reject) => {
@@ -213,20 +201,41 @@ class SocketServer {
         }
     }
     async bind() {
+        prepareMcpSocketAddress(this.address);
         const privatePath = privatePathFor(this.socketPath);
         await clearStalePath(privatePath);
         const server = await this.listenPrivately(privatePath);
+        const privateInode = inodeFor(privatePath);
         try {
-            this.boundInode = await publishSocket(privatePath, this.socketPath);
+            if (privateInode === null) {
+                throw listenFailureError(this.socketPath, "ENOENT");
+            }
+            const publishedInode = await publishSocket(privatePath, this.socketPath);
+            if (publishedInode !== privateInode) {
+                throw listenFailureError(this.socketPath, "ESTALE");
+            }
+            this.boundInode = privateInode;
             this.server = server;
         }
         catch (error) {
             await closeServer(server);
+            if (privateInode !== null) {
+                removeEntry(privatePath, privateInode);
+                removeEntry(this.socketPath, privateInode);
+            }
             throw error;
         }
     }
     open() {
-        return withClaimLock(this.socketPath, () => this.bind());
+        return withClaimLock(this.socketPath, async () => {
+            try {
+                await this.bind();
+            }
+            catch (error) {
+                cleanupMcpSocketAddress(this.address);
+                throw error;
+            }
+        });
     }
     async settleStartup() {
         const startup = this.startup;
@@ -235,12 +244,21 @@ class SocketServer {
             await Promise.allSettled([startup]);
         }
     }
-    async release() {
+    async release(server) {
         const inode = this.boundInode;
+        await withClaimLock(this.socketPath, async () => {
+            this.registry.dispose();
+            await closeServer(server);
+            try {
+                if (inode !== null) {
+                    removeEntry(this.socketPath, inode);
+                }
+            }
+            finally {
+                cleanupMcpSocketAddress(this.address);
+            }
+        });
         this.boundInode = null;
-        if (inode !== null) {
-            await releaseSocketPath(this.socketPath, inode);
-        }
     }
     async start() {
         this.startup ??= this.open();
@@ -261,10 +279,8 @@ class SocketServer {
         if (!server) {
             return;
         }
+        await this.release(server);
         this.server = null;
-        this.registry.dispose();
-        await closeServer(server);
-        await this.release();
     }
 }
 export { SocketServer };

package/dist/socket-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"socket-server.js","sourceRoot":"","sources":["../src/socket-server.ts"],"names":[],"mappings":"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","sourcesContent":["import { createHash } from \"node:crypto\";\nimport * as fs from \"node:fs\";\nimport * as net from \"node:net\";\nimport { basename, dirname, join, resolve as resolvePath } from \"node:path\";\nimport type { ConnectionRegistry } from \"./connection-registry.js\";\nimport { DEFAULT_SOCKET_PATH } from \"./protocol/schemas.js\";\nimport { connectionErrorEvent } from \"./transport.js\";\n\ntype ProbeOutcome = { kind: \"live\" } | { kind: \"unknown\"; code: string } | { kind: \"vacant\" };\ntype PathVerdict = ProbeOutcome | { kind: \"directory\" };\ntype ClaimOutcome = \"occupied\" | \"published\";\n\nconst PROBE_TIMEOUT_MS = 1000;\nconst PROBE_ATTEMPTS = 3;\nconst PROBE_RETRY_DELAY_MS = 50;\nconst CLAIM_ATTEMPTS = 3;\nconst CLAIM_LOCK_PREFIX = \"\\0gtkx-mcp-claim-\";\nconst CLAIM_LOCK_RETRY_DELAY_MS = 25;\nconst CLAIM_LOCK_TIMEOUT_MS = 15_000;\n\nconst delay = (ms: number): Promise<void> =>\n    new Promise((resolve) => {\n        setTimeout(resolve, ms);\n    });\n\nconst closeServer = (server: net.Server): Promise<void> =>\n    new Promise((resolve) => {\n        server.close(() => {\n            resolve();\n        });\n    });\n\nconst digestFor = (socketPath: string): string =>\n    createHash(\"sha256\").update(resolvePath(socketPath)).digest(\"hex\");\n\nconst privatePathFor = (socketPath: string): string => {\n    const width = Math.max(1, basename(socketPath).length - 1);\n\n    return join(dirname(socketPath), `.${digestFor(socketPath).slice(0, width)}`);\n};\n\nconst bindLock = (address: string): Promise<net.Server | null> =>\n    new Promise((resolve) => {\n        const lock = net.createServer();\n        let isBound = false;\n\n        lock.on(\"error\", () => {\n            if (!isBound) {\n                resolve(null);\n            }\n        });\n\n        lock.listen(address, () => {\n            isBound = true;\n            resolve(lock);\n        });\n    });\n\nconst claimBlockedError = (socketPath: string): Error =>\n    new Error(\n        `Timed out waiting for another GTKX MCP server to finish claiming ${socketPath}. ` +\n        \"Retry once no other server is starting on that path.\",\n    );\n\nconst acquireClaimLock = async (socketPath: string): Promise<net.Server | null> => {\n    const address = `${CLAIM_LOCK_PREFIX}${digestFor(socketPath)}`;\n    const deadline = Date.now() + CLAIM_LOCK_TIMEOUT_MS;\n    let lock = await bindLock(address);\n\n    while (lock === null && Date.now() < deadline) {\n        await delay(CLAIM_LOCK_RETRY_DELAY_MS);\n        lock = await bindLock(address);\n    }\n\n    return lock;\n};\n\nconst releaseClaimLock = async (lock: net.Server | null): Promise<void> => {\n    if (lock) {\n        await closeServer(lock);\n    }\n};\n\nconst withClaimLock = async <T>(socketPath: string, action: () => Promise<T> | T): Promise<T> => {\n    const lock = await acquireClaimLock(socketPath);\n\n    if (lock === null) {\n        throw claimBlockedError(socketPath);\n    }\n\n    try {\n        return await action();\n    } finally {\n        await closeServer(lock);\n    }\n};\n\nconst entryFor = (target: string): fs.Stats | null => {\n    try {\n        return fs.lstatSync(target);\n    } catch {\n        return null;\n    }\n};\n\nconst inodeFor = (target: string): number | null => entryFor(target)?.ino ?? null;\n\nconst outcomeForProbeError = (error: NodeJS.ErrnoException): ProbeOutcome => {\n    if (error.code === \"ECONNREFUSED\" || error.code === \"ENOENT\") {\n        return { kind: \"vacant\" };\n    }\n\n    return { kind: \"unknown\", code: error.code ?? error.message };\n};\n\nconst probeSocket = (target: string): Promise<ProbeOutcome> =>\n    new Promise((resolve) => {\n        const probe = net.connect({ path: target, timeout: PROBE_TIMEOUT_MS });\n\n        const settleWith = (outcome: ProbeOutcome): void => {\n            probe.destroy();\n            resolve(outcome);\n        };\n\n        probe.once(\"connect\", () => {\n            settleWith({ kind: \"live\" });\n        });\n\n        probe.once(\"timeout\", () => {\n            settleWith({ kind: \"unknown\", code: \"ETIMEDOUT\" });\n        });\n\n        probe.once(\"error\", (error: NodeJS.ErrnoException) => {\n            settleWith(outcomeForProbeError(error));\n        });\n    });\n\nconst probeUntilConclusive = async (target: string): Promise<ProbeOutcome> => {\n    let outcome = await probeSocket(target);\n\n    for (let attempt = 1; attempt < PROBE_ATTEMPTS && outcome.kind === \"unknown\"; attempt += 1) {\n        await delay(PROBE_RETRY_DELAY_MS);\n        outcome = await probeSocket(target);\n    }\n\n    return outcome;\n};\n\nconst alreadyOwnedError = (socketPath: string): Error =>\n    new Error(\n        `Another GTKX MCP server already owns ${socketPath}. ` +\n        \"Stop the other server (for example, the GTKX MCP server of another active session) and reconnect.\",\n    );\n\nconst undecidedOwnerError = (socketPath: string, code: string): Error =>\n    new Error(\n        `Could not tell whether another GTKX MCP server owns ${socketPath}: probing it failed with ${code}. ` +\n        \"Leaving the socket in place instead of removing one that may still be serving another session. \" +\n        \"Retry, or delete the file by hand once no server is running.\",\n    );\n\nconst directoryPathError = (socketPath: string): Error =>\n    new Error(\n        `The GTKX MCP socket path ${socketPath} is a directory, not a socket. ` +\n        \"Remove it, or point XDG_RUNTIME_DIR at a directory where GTKX can create its socket.\",\n    );\n\nconst listenFailureError = (socketPath: string, code: string): Error =>\n    new Error(\n        `Could not create the GTKX MCP socket at ${socketPath}: listening failed with ${code}. ` +\n        \"Check that its directory exists and is writable.\",\n    );\n\nconst removeEntry = (target: string, inode: number): void => {\n    if (inodeFor(target) === inode) {\n        fs.rmSync(target, { force: true });\n    }\n};\n\nconst clearStalePath = async (target: string): Promise<PathVerdict> => {\n    const entry = entryFor(target);\n\n    if (entry === null) {\n        return { kind: \"vacant\" };\n    }\n\n    if (entry.isDirectory()) {\n        return { kind: \"directory\" };\n    }\n\n    const outcome = await probeUntilConclusive(target);\n\n    if (outcome.kind === \"vacant\") {\n        removeEntry(target, entry.ino);\n    }\n\n    return outcome;\n};\n\nconst requireVacantPath = async (socketPath: string): Promise<void> => {\n    const verdict = await clearStalePath(socketPath);\n\n    if (verdict.kind === \"live\") {\n        throw alreadyOwnedError(socketPath);\n    }\n\n    if (verdict.kind === \"directory\") {\n        throw directoryPathError(socketPath);\n    }\n\n    if (verdict.kind === \"unknown\") {\n        throw undecidedOwnerError(socketPath, verdict.code);\n    }\n};\n\nconst claimSocketPath = (privatePath: string, socketPath: string): ClaimOutcome => {\n    try {\n        fs.linkSync(privatePath, socketPath);\n\n        return \"published\";\n    } catch (error) {\n        if ((error as NodeJS.ErrnoException).code === \"EEXIST\") {\n            return \"occupied\";\n        }\n\n        throw error;\n    }\n};\n\nconst publishSocket = async (privatePath: string, socketPath: string): Promise<number | null> => {\n    for (let attempt = 1; attempt <= CLAIM_ATTEMPTS; attempt += 1) {\n        await requireVacantPath(socketPath);\n\n        if (claimSocketPath(privatePath, socketPath) === \"published\") {\n            const inode = inodeFor(socketPath);\n            fs.rmSync(privatePath, { force: true });\n\n            return inode;\n        }\n    }\n\n    throw alreadyOwnedError(socketPath);\n};\n\nconst releaseSocketPath = async (socketPath: string, inode: number): Promise<void> => {\n    const lock = await acquireClaimLock(socketPath);\n\n    try {\n        removeEntry(socketPath, inode);\n    } finally {\n        await releaseClaimLock(lock);\n    }\n};\n\nclass SocketServer {\n    private server: net.Server | null = null;\n    private socketPath: string;\n    private registry: ConnectionRegistry;\n    private boundInode: number | null = null;\n    private startup: Promise<void> | null = null;\n\n    constructor(registry: ConnectionRegistry, socketPath: string = DEFAULT_SOCKET_PATH) {\n        this.registry = registry;\n        this.socketPath = socketPath;\n    }\n\n    private listen(privatePath: string): Promise<net.Server> {\n        return new Promise((resolve, reject) => {\n            const server = net.createServer((socket) => this.registry.register(socket));\n            let isListening = false;\n\n            server.on(\"error\", (error) => {\n                this.registry.dispatchEvent(connectionErrorEvent(error));\n\n                if (!isListening) {\n                    reject(error);\n                }\n            });\n\n            server.listen(privatePath, () => {\n                isListening = true;\n                resolve(server);\n            });\n        });\n    }\n\n    private async listenPrivately(privatePath: string): Promise<net.Server> {\n        try {\n            return await this.listen(privatePath);\n        } catch (error) {\n            const failure = error as NodeJS.ErrnoException;\n            throw listenFailureError(this.socketPath, failure.code ?? failure.message);\n        }\n    }\n\n    private async bind(): Promise<void> {\n        const privatePath = privatePathFor(this.socketPath);\n        await clearStalePath(privatePath);\n        const server = await this.listenPrivately(privatePath);\n\n        try {\n            this.boundInode = await publishSocket(privatePath, this.socketPath);\n            this.server = server;\n        } catch (error) {\n            await closeServer(server);\n            throw error;\n        }\n    }\n\n    private open(): Promise<void> {\n        return withClaimLock(this.socketPath, () => this.bind());\n    }\n\n    private async settleStartup(): Promise<void> {\n        const startup = this.startup;\n        this.startup = null;\n\n        if (startup) {\n            await Promise.allSettled([startup]);\n        }\n    }\n\n    private async release(): Promise<void> {\n        const inode = this.boundInode;\n        this.boundInode = null;\n\n        if (inode !== null) {\n            await releaseSocketPath(this.socketPath, inode);\n        }\n    }\n\n    async start(): Promise<void> {\n        this.startup ??= this.open();\n        const startup = this.startup;\n\n        try {\n            await startup;\n        } catch (error) {\n            if (this.startup === startup) {\n                this.startup = null;\n            }\n\n            throw error;\n        }\n    }\n\n    async stop(): Promise<void> {\n        await this.settleStartup();\n        const server = this.server;\n\n        if (!server) {\n            return;\n        }\n\n        this.server = null;\n        this.registry.dispose();\n        await closeServer(server);\n        await this.release();\n    }\n}\n\nexport { SocketServer };\n"]}
+{"version":3,"file":"socket-server.js","sourceRoot":"","sources":["../src/socket-server.ts"],"names":[],"mappings":"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","sourcesContent":["import { createHash } from \"node:crypto\";\nimport * as fs from \"node:fs\";\nimport * as net from \"node:net\";\nimport { basename, dirname, join, resolve as resolvePath } from \"node:path\";\nimport type { ConnectionRegistry } from \"./connection-registry.js\";\nimport {\n    cleanupMcpSocketAddress,\n    type McpSocketAddress,\n    prepareMcpSocketAddress,\n    resolveMcpSocketAddress,\n} from \"./socket-path.js\";\nimport { connectionErrorEvent } from \"./transport.js\";\n\ntype ProbeOutcome = { kind: \"live\" } | { kind: \"unknown\"; code: string } | { kind: \"vacant\" };\ntype PathVerdict = ProbeOutcome | { kind: \"invalid\" };\ntype ClaimOutcome = \"occupied\" | \"published\";\n\nconst PROBE_TIMEOUT_MS = 1000;\nconst PROBE_ATTEMPTS = 3;\nconst PROBE_RETRY_DELAY_MS = 50;\nconst CLAIM_ATTEMPTS = 3;\nconst CLAIM_LOCK_PREFIX = \"\\0gtkx-mcp-claim-\";\nconst CLAIM_LOCK_RETRY_DELAY_MS = 25;\nconst CLAIM_LOCK_TIMEOUT_MS = 15_000;\n\nconst delay = (ms: number): Promise<void> =>\n    new Promise((resolve) => {\n        setTimeout(resolve, ms);\n    });\n\nconst closeServer = (server: net.Server): Promise<void> =>\n    new Promise((resolve) => {\n        server.close(() => {\n            resolve();\n        });\n    });\n\nconst digestFor = (socketPath: string): string =>\n    createHash(\"sha256\").update(resolvePath(socketPath)).digest(\"hex\");\n\nconst privatePathFor = (socketPath: string): string => {\n    const width = Math.max(1, basename(socketPath).length - 1);\n\n    return join(dirname(socketPath), `.${digestFor(socketPath).slice(0, width)}`);\n};\n\nconst bindLock = (address: string): Promise<net.Server | null> =>\n    new Promise((resolve) => {\n        const lock = net.createServer();\n        let isBound = false;\n\n        lock.on(\"error\", () => {\n            if (!isBound) {\n                resolve(null);\n            }\n        });\n\n        lock.listen(address, () => {\n            isBound = true;\n            resolve(lock);\n        });\n    });\n\nconst claimBlockedError = (socketPath: string): Error =>\n    new Error(\n        `Timed out waiting for another GTKX MCP server to finish claiming ${socketPath}. ` +\n        \"Retry once no other server is starting on that path.\",\n    );\n\nconst acquireClaimLock = async (socketPath: string): Promise<net.Server | null> => {\n    const address = `${CLAIM_LOCK_PREFIX}${digestFor(socketPath)}`;\n    const deadline = Date.now() + CLAIM_LOCK_TIMEOUT_MS;\n    let lock = await bindLock(address);\n\n    while (lock === null && Date.now() < deadline) {\n        await delay(CLAIM_LOCK_RETRY_DELAY_MS);\n        lock = await bindLock(address);\n    }\n\n    return lock;\n};\n\nconst withClaimLock = async <T>(socketPath: string, action: () => Promise<T> | T): Promise<T> => {\n    const lock = await acquireClaimLock(socketPath);\n\n    if (lock === null) {\n        throw claimBlockedError(socketPath);\n    }\n\n    try {\n        return await action();\n    } finally {\n        await closeServer(lock);\n    }\n};\n\nconst entryFor = (target: string): fs.Stats | null => {\n    try {\n        return fs.lstatSync(target);\n    } catch {\n        return null;\n    }\n};\n\nconst inodeFor = (target: string): number | null => entryFor(target)?.ino ?? null;\n\nconst outcomeForProbeError = (error: NodeJS.ErrnoException): ProbeOutcome => {\n    if (error.code === \"ECONNREFUSED\" || error.code === \"ENOENT\") {\n        return { kind: \"vacant\" };\n    }\n\n    return { kind: \"unknown\", code: error.code ?? error.message };\n};\n\nconst probeSocket = (target: string): Promise<ProbeOutcome> =>\n    new Promise((resolve) => {\n        const probe = net.connect({ path: target, timeout: PROBE_TIMEOUT_MS });\n\n        const settleWith = (outcome: ProbeOutcome): void => {\n            probe.destroy();\n            resolve(outcome);\n        };\n\n        probe.once(\"connect\", () => {\n            settleWith({ kind: \"live\" });\n        });\n\n        probe.once(\"timeout\", () => {\n            settleWith({ kind: \"unknown\", code: \"ETIMEDOUT\" });\n        });\n\n        probe.once(\"error\", (error: NodeJS.ErrnoException) => {\n            settleWith(outcomeForProbeError(error));\n        });\n    });\n\nconst probeUntilConclusive = async (target: string): Promise<ProbeOutcome> => {\n    let outcome = await probeSocket(target);\n\n    for (let attempt = 1; attempt < PROBE_ATTEMPTS && outcome.kind === \"unknown\"; attempt += 1) {\n        await delay(PROBE_RETRY_DELAY_MS);\n        outcome = await probeSocket(target);\n    }\n\n    return outcome;\n};\n\nconst alreadyOwnedError = (socketPath: string): Error =>\n    new Error(\n        `Another GTKX MCP server already owns ${socketPath}. ` +\n        \"Stop the other server (for example, the GTKX MCP server of another active session) and reconnect.\",\n    );\n\nconst undecidedOwnerError = (socketPath: string, code: string): Error =>\n    new Error(\n        `Could not tell whether another GTKX MCP server owns ${socketPath}: probing it failed with ${code}. ` +\n        \"Leaving the socket in place instead of removing one that may still be serving another session. \" +\n        \"Retry, or delete the file by hand once no server is running.\",\n    );\n\nconst invalidPathError = (socketPath: string): Error =>\n    new Error(\n        `The GTKX MCP socket path ${socketPath} exists and is not a socket. ` +\n        \"Move it, or point XDG_RUNTIME_DIR at a directory where GTKX can create its socket.\",\n    );\n\nconst listenFailureError = (socketPath: string, code: string): Error =>\n    new Error(\n        `Could not create the GTKX MCP socket at ${socketPath}: listening failed with ${code}. ` +\n        \"Check that its directory exists and is writable.\",\n    );\n\nconst removeEntry = (target: string, inode: number): void => {\n    if (inodeFor(target) === inode) {\n        fs.rmSync(target, { force: true });\n    }\n};\n\nconst clearStalePath = async (target: string): Promise<PathVerdict> => {\n    const entry = entryFor(target);\n\n    if (entry === null) {\n        return { kind: \"vacant\" };\n    }\n\n    if (!entry.isSocket()) {\n        return { kind: \"invalid\" };\n    }\n\n    const outcome = await probeUntilConclusive(target);\n\n    if (outcome.kind === \"vacant\") {\n        removeEntry(target, entry.ino);\n    }\n\n    return outcome;\n};\n\nconst requireVacantPath = async (socketPath: string): Promise<void> => {\n    const verdict = await clearStalePath(socketPath);\n\n    if (verdict.kind === \"live\") {\n        throw alreadyOwnedError(socketPath);\n    }\n\n    if (verdict.kind === \"invalid\") {\n        throw invalidPathError(socketPath);\n    }\n\n    if (verdict.kind === \"unknown\") {\n        throw undecidedOwnerError(socketPath, verdict.code);\n    }\n};\n\nconst claimSocketPath = (privatePath: string, socketPath: string): ClaimOutcome => {\n    try {\n        fs.linkSync(privatePath, socketPath);\n\n        return \"published\";\n    } catch (error) {\n        if ((error as NodeJS.ErrnoException).code === \"EEXIST\") {\n            return \"occupied\";\n        }\n\n        throw error;\n    }\n};\n\nconst publishSocket = async (privatePath: string, socketPath: string): Promise<number | null> => {\n    for (let attempt = 1; attempt <= CLAIM_ATTEMPTS; attempt += 1) {\n        await requireVacantPath(socketPath);\n\n        if (claimSocketPath(privatePath, socketPath) === \"published\") {\n            const inode = inodeFor(socketPath);\n            fs.rmSync(privatePath, { force: true });\n\n            return inode;\n        }\n    }\n\n    throw alreadyOwnedError(socketPath);\n};\n\nclass SocketServer {\n    private server: net.Server | null = null;\n    private socketPath: string;\n    private registry: ConnectionRegistry;\n    private address: McpSocketAddress;\n    private boundInode: number | null = null;\n    private startup: Promise<void> | null = null;\n\n    constructor(registry: ConnectionRegistry, address: McpSocketAddress = resolveMcpSocketAddress()) {\n        this.registry = registry;\n        this.address = address;\n        this.socketPath = address.path;\n    }\n\n    private listen(privatePath: string): Promise<net.Server> {\n        return new Promise((resolve, reject) => {\n            const server = net.createServer((socket) => this.registry.register(socket));\n            let isListening = false;\n\n            server.on(\"error\", (error) => {\n                this.registry.dispatchEvent(connectionErrorEvent(error));\n\n                if (!isListening) {\n                    reject(error);\n                }\n            });\n\n            server.listen(privatePath, () => {\n                isListening = true;\n                resolve(server);\n            });\n        });\n    }\n\n    private async listenPrivately(privatePath: string): Promise<net.Server> {\n        try {\n            return await this.listen(privatePath);\n        } catch (error) {\n            const failure = error as NodeJS.ErrnoException;\n            throw listenFailureError(this.socketPath, failure.code ?? failure.message);\n        }\n    }\n\n    private async bind(): Promise<void> {\n        prepareMcpSocketAddress(this.address);\n        const privatePath = privatePathFor(this.socketPath);\n        await clearStalePath(privatePath);\n        const server = await this.listenPrivately(privatePath);\n        const privateInode = inodeFor(privatePath);\n\n        try {\n            if (privateInode === null) {\n                throw listenFailureError(this.socketPath, \"ENOENT\");\n            }\n\n            const publishedInode = await publishSocket(privatePath, this.socketPath);\n\n            if (publishedInode !== privateInode) {\n                throw listenFailureError(this.socketPath, \"ESTALE\");\n            }\n\n            this.boundInode = privateInode;\n            this.server = server;\n        } catch (error) {\n            await closeServer(server);\n\n            if (privateInode !== null) {\n                removeEntry(privatePath, privateInode);\n                removeEntry(this.socketPath, privateInode);\n            }\n\n            throw error;\n        }\n    }\n\n    private open(): Promise<void> {\n        return withClaimLock(this.socketPath, async () => {\n            try {\n                await this.bind();\n            } catch (error) {\n                cleanupMcpSocketAddress(this.address);\n                throw error;\n            }\n        });\n    }\n\n    private async settleStartup(): Promise<void> {\n        const startup = this.startup;\n        this.startup = null;\n\n        if (startup) {\n            await Promise.allSettled([startup]);\n        }\n    }\n\n    private async release(server: net.Server): Promise<void> {\n        const inode = this.boundInode;\n\n        await withClaimLock(this.socketPath, async () => {\n            this.registry.dispose();\n            await closeServer(server);\n\n            try {\n                if (inode !== null) {\n                    removeEntry(this.socketPath, inode);\n                }\n            } finally {\n                cleanupMcpSocketAddress(this.address);\n            }\n        });\n\n        this.boundInode = null;\n    }\n\n    async start(): Promise<void> {\n        this.startup ??= this.open();\n        const startup = this.startup;\n\n        try {\n            await startup;\n        } catch (error) {\n            if (this.startup === startup) {\n                this.startup = null;\n            }\n\n            throw error;\n        }\n    }\n\n    async stop(): Promise<void> {\n        await this.settleStartup();\n        const server = this.server;\n\n        if (!server) {\n            return;\n        }\n\n        await this.release(server);\n        this.server = null;\n    }\n}\n\nexport { SocketServer };\n"]}

package/dist/tool-filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-filter.d.ts","sourceRoot":"","sources":["../src/tool-filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAwCtC,QAAA,MAAM,WAAW,GAAI,OAAO,IAAI,EAAE,EAAE,UAAU,WAAW,KAAG,IAAI,EAU/D,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"tool-filter.d.ts","sourceRoot":"","sources":["../src/tool-filter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAqCtC,QAAA,MAAM,WAAW,GAAI,OAAO,IAAI,EAAE,EAAE,UAAU,WAAW,KAAG,IAAI,EAU/D,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,CAAC"}

package/dist/tool-filter.js

@@ -1,7 +1,5 @@
 const NEGATION_PREFIX = "!";
-const SPECIAL_CHARACTERS = /[.+?^${}()|[\]\\]/g;
-const escapeLiteral = (value) => value.replaceAll(SPECIAL_CHARACTERS, String.raw `\$&`);
-const patternToRegExp = (pattern) => new RegExp(`^${pattern.split("*").map((part) => escapeLiteral(part)).join(".*")}$`);
+const patternToRegExp = (pattern) => new RegExp(`^${pattern.split("*").map((part) => RegExp.escape(part)).join(".*")}$`);
 const matchingNames = (tools, pattern) => {
     const expression = patternToRegExp(pattern);
     return tools.filter((tool) => expression.test(tool.name)).map((tool) => tool.name);

package/dist/tool-filter.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-filter.js","sourceRoot":"","sources":["../src/tool-filter.ts"],"names":[],"mappings":"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","sourcesContent":["import type { McpSettings } from \"@gtkx/config/internal\";\nimport type { Tool } from \"./tool.js\";\n\nconst NEGATION_PREFIX = \"!\";\nconst SPECIAL_CHARACTERS = /[.+?^${}()|[\\]\\\\]/g;\n\nconst escapeLiteral = (value: string): string => value.replaceAll(SPECIAL_CHARACTERS, String.raw`\\$&`);\n\nconst patternToRegExp = (pattern: string): RegExp =>\n    new RegExp(`^${pattern.split(\"*\").map((part) => escapeLiteral(part)).join(\".*\")}$`);\n\nconst matchingNames = (tools: Tool[], pattern: string): string[] => {\n    const expression = patternToRegExp(pattern);\n\n    return tools.filter((tool) => expression.test(tool.name)).map((tool) => tool.name);\n};\n\nconst applyPattern = (selected: Set<string>, tools: Tool[], pattern: string): void => {\n    const isNegated = pattern.startsWith(NEGATION_PREFIX);\n    const names = matchingNames(tools, isNegated ? pattern.slice(NEGATION_PREFIX.length) : pattern);\n\n    for (const name of names) {\n        if (isNegated) {\n            selected.delete(name);\n        } else {\n            selected.add(name);\n        }\n    }\n};\n\nconst selectNames = (tools: Tool[], patterns: string[]): Set<string> => {\n    const isSubtractive = patterns.every((pattern) => pattern.startsWith(NEGATION_PREFIX));\n    const selected: Set<string> = new Set(isSubtractive ? tools.map((tool) => tool.name) : []);\n\n    for (const pattern of patterns) {\n        applyPattern(selected, tools, pattern);\n    }\n\n    return selected;\n};\n\nconst selectTools = (tools: Tool[], settings: McpSettings): Tool[] => {\n    const allowed = settings.isReadOnly ? tools.filter((tool) => tool.kind === \"readOnly\") : tools;\n\n    if (settings.tools.length === 0) {\n        return allowed;\n    }\n\n    const selected = selectNames(allowed, settings.tools);\n\n    return allowed.filter((tool) => selected.has(tool.name));\n};\n\nexport { selectTools };\n"]}
+{"version":3,"file":"tool-filter.js","sourceRoot":"","sources":["../src/tool-filter.ts"],"names":[],"mappings":"AAGA,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B,MAAM,eAAe,GAAG,CAAC,OAAe,EAAU,EAAE,CAChD,IAAI,MAAM,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAExF,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,OAAe,EAAY,EAAE;IAC/D,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAE5C,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACvF,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,QAAqB,EAAE,KAAa,EAAE,OAAe,EAAQ,EAAE;IACjF,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAEhG,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,IAAI,SAAS,EAAE,CAAC;YACZ,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;aAAM,CAAC;YACJ,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;IACL,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,QAAkB,EAAe,EAAE;IACnE,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC;IACvF,MAAM,QAAQ,GAAgB,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAE3F,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC7B,YAAY,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,KAAa,EAAE,QAAqB,EAAU,EAAE;IACjE,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAE/F,IAAI,QAAQ,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEtD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC;AAEF,OAAO,EAAE,WAAW,EAAE,CAAC","sourcesContent":["import type { McpSettings } from \"@gtkx/config/internal\";\nimport type { Tool } from \"./tool.js\";\n\nconst NEGATION_PREFIX = \"!\";\n\nconst patternToRegExp = (pattern: string): RegExp =>\n    new RegExp(`^${pattern.split(\"*\").map((part) => RegExp.escape(part)).join(\".*\")}$`);\n\nconst matchingNames = (tools: Tool[], pattern: string): string[] => {\n    const expression = patternToRegExp(pattern);\n\n    return tools.filter((tool) => expression.test(tool.name)).map((tool) => tool.name);\n};\n\nconst applyPattern = (selected: Set<string>, tools: Tool[], pattern: string): void => {\n    const isNegated = pattern.startsWith(NEGATION_PREFIX);\n    const names = matchingNames(tools, isNegated ? pattern.slice(NEGATION_PREFIX.length) : pattern);\n\n    for (const name of names) {\n        if (isNegated) {\n            selected.delete(name);\n        } else {\n            selected.add(name);\n        }\n    }\n};\n\nconst selectNames = (tools: Tool[], patterns: string[]): Set<string> => {\n    const isSubtractive = patterns.every((pattern) => pattern.startsWith(NEGATION_PREFIX));\n    const selected: Set<string> = new Set(isSubtractive ? tools.map((tool) => tool.name) : []);\n\n    for (const pattern of patterns) {\n        applyPattern(selected, tools, pattern);\n    }\n\n    return selected;\n};\n\nconst selectTools = (tools: Tool[], settings: McpSettings): Tool[] => {\n    const allowed = settings.isReadOnly ? tools.filter((tool) => tool.kind === \"readOnly\") : tools;\n\n    if (settings.tools.length === 0) {\n        return allowed;\n    }\n\n    const selected = selectNames(allowed, settings.tools);\n\n    return allowed.filter((tool) => selected.has(tool.name));\n};\n\nexport { selectTools };\n"]}

package/package.json

@@ -1,11 +1,13 @@
 {
   "name": "@gtkx/mcp",
-  "version": "2.0.0-beta.1",
-  "description": "MCP server exposing the GTK API reference and a running GTK4 app.",
+  "version": "2.0.0-beta.11",
+  "description": "MCP tools for GTKX documentation and running applications.",
   "keywords": [
     "gtkx",
     "gtk",
     "gtk4",
+    "adwaita",
+    "gnome",
     "mcp",
     "model-context-protocol",
     "ai",
@@ -56,6 +58,18 @@
           "cwd": ".",
           "command": "eslint {projectRoot}"
         }
+      },
+      "test": {
+        "dependsOn": [
+          "^build",
+          "gtkx:codegen",
+          "@gtkx/cli:build",
+          "@gtkx/components:build"
+        ],
+        "inputs": [
+          "...",
+          "{workspaceRoot}/packages/cli/tests/fixtures/**/*"
+        ]
       }
     }
   },
@@ -63,15 +77,15 @@
     "node": ">=26.7.0"
   },
   "dependencies": {
-    "@gtkx/codegen": "2.0.0-beta.1",
-    "@gtkx/config": "2.0.0-beta.1",
-    "@gtkx/utils": "2.0.0-beta.1",
+    "@gtkx/codegen": "2.0.0-beta.11",
+    "@gtkx/config": "2.0.0-beta.11",
+    "@gtkx/utils": "2.0.0-beta.11",
     "@modelcontextprotocol/sdk": "^1.30.0",
-    "zod": "^4.5.4"
+    "zod": "^4.6.5"
   },
   "devDependencies": {
-    "@gtkx/vitest": "2.0.0-beta.1",
-    "vitest": "^4.1.11"
+    "@gtkx/vitest": "2.0.0-beta.11",
+    "vitest": "^5.0.1"
   },
   "scripts": {
     "release": "tsx ../../scripts/release-package.ts"

package/src/app-router.ts

@@ -16,6 +16,7 @@ import { type AppInfo, RegisterParamsSchema } from "./protocol/schemas.js";
 
 type AppRegisteredEvent = CustomEvent<AppInfo>;
 type AppUnregisteredEvent = CustomEvent<string>;
+type PendingAppWait = { reject: (error: Error) => void };
 
 type RegisteredApp = {
     info: AppInfo;
@@ -23,6 +24,15 @@ type RegisteredApp = {
 };
 
 const DEFAULT_REQUEST_TIMEOUT_MS = 30_000;
+const DEFAULT_APP_TIMEOUT_MS = 10_000;
+
+const routerStoppedError = (): Error => new Error("GTKX MCP server stopped while waiting for an application");
+
+const appWaitTimeoutError = (timeout: number): Error =>
+    new Error(
+        `Timeout waiting for app registration after ${String(timeout)}ms. ` +
+        "Make sure your GTKX app is running with 'gtkx dev'.",
+    );
 
 function appRegisteredEvent(info: AppInfo): AppRegisteredEvent {
     return new CustomEvent("appRegistered", { detail: info });
@@ -33,20 +43,19 @@ function appUnregisteredEvent(applicationId: string): AppUnregisteredEvent {
 }
 
 class AppRouter extends EventTarget {
-    private static defaultWaitTimeout = 10_000;
-
     private apps: Map<string, RegisteredApp> = new Map();
 
     private connectionToApp: Map<string, string> = new Map();
 
-    private requestTimeout: number;
-
     private connections: AppConnections;
 
-    constructor(connections: AppConnections, options: { requestTimeout?: number } = {}) {
+    private pendingAppWaits: Set<PendingAppWait> = new Set();
+
+    private isDisposed = false;
+
+    constructor(connections: AppConnections) {
         super();
         this.connections = connections;
-        this.requestTimeout = options.requestTimeout ?? DEFAULT_REQUEST_TIMEOUT_MS;
         this.connections.onRequest = (connection, request) => this.handleRequest(connection, request);
 
         this.connections.addEventListener("disconnection", (event) => {
@@ -69,6 +78,10 @@ class AppRouter extends EventTarget {
     }
 
     private handleRequest(connection: ProtocolConnection, request: JSONRPCRequest): Promise<Result> {
+        if (this.isDisposed) {
+            return Promise.reject(routerStoppedError());
+        }
+
         if (request.method === "app.register") {
             return Promise.resolve(this.handleRegister(connection, request));
         }
@@ -90,16 +103,10 @@ class AppRouter extends EventTarget {
         }
 
         const params = parseResult.data;
-
-        const appInfo: AppInfo = {
-            applicationId: params.applicationId,
-            pid: params.pid,
-            ...(params.projectRoot !== undefined && { projectRoot: params.projectRoot }),
-        };
-
-        this.apps.set(params.applicationId, { info: appInfo, connection });
+        this.removeApp(connection);
+        this.apps.set(params.applicationId, { info: params, connection });
         this.connectionToApp.set(connection.id, params.applicationId);
-        this.dispatchEvent(appRegisteredEvent(appInfo));
+        this.dispatchEvent(appRegisteredEvent(params));
 
         return { success: true };
     }
@@ -112,7 +119,7 @@ class AppRouter extends EventTarget {
         }
 
         if (error.code === REQUEST_TIMEOUT_CODE) {
-            return requestTimeoutError(this.requestTimeout);
+            return requestTimeoutError(DEFAULT_REQUEST_TIMEOUT_MS);
         }
 
         return protocolErrorFrom(error);
@@ -134,6 +141,40 @@ class AppRouter extends EventTarget {
         this.dispatchEvent(appUnregisteredEvent(applicationId));
     }
 
+    private async waitForRegistration(applicationId: string | undefined, timeout: number): Promise<AppInfo> {
+        const controller = new AbortController();
+        const { promise, reject, resolve } = Promise.withResolvers<AppInfo>();
+        const rejectWait = (error: Error): void => {
+            controller.abort();
+            reject(error);
+        };
+        const pendingWait: PendingAppWait = { reject: rejectWait };
+        const timeoutId = setTimeout(() => {
+            rejectWait(appWaitTimeoutError(timeout));
+        }, timeout);
+
+        this.addEventListener(
+            "appRegistered",
+            (event) => {
+                const info = (event as AppRegisteredEvent).detail;
+
+                if (applicationId === undefined || info.applicationId === applicationId) {
+                    resolve(info);
+                }
+            },
+            { signal: controller.signal },
+        );
+        this.pendingAppWaits.add(pendingWait);
+
+        try {
+            return await promise;
+        } finally {
+            clearTimeout(timeoutId);
+            controller.abort();
+            this.pendingAppWaits.delete(pendingWait);
+        }
+    }
+
     getApps(): AppInfo[] {
         return this.apps.values().map((app) => app.info).toArray();
     }
@@ -152,40 +193,44 @@ class AppRouter extends EventTarget {
         return this.getDefaultApp()?.info.projectRoot;
     }
 
-    waitForApp(timeout: number = AppRouter.defaultWaitTimeout): Promise<AppInfo> {
-        const defaultApp = this.getDefaultApp();
+    dispose(): void {
+        if (this.isDisposed) {
+            return;
+        }
+
+        this.isDisposed = true;
+        const error = routerStoppedError();
 
-        if (defaultApp) {
-            return Promise.resolve(defaultApp.info);
+        for (const pendingWait of this.pendingAppWaits) {
+            pendingWait.reject(error);
         }
+    }
 
-        return new Promise((resolve, reject) => {
-            const timeoutId = setTimeout(() => {
-                this.removeEventListener("appRegistered", onRegister);
+    waitForApp(applicationId?: string, timeout: number = DEFAULT_APP_TIMEOUT_MS): Promise<AppInfo> {
+        if (this.isDisposed) {
+            return Promise.reject(routerStoppedError());
+        }
 
-                reject(
-                    new Error(
-                        `Timeout waiting for app registration after ${String(timeout)}ms. ` +
-                        "Make sure your GTKX app is running with 'gtkx dev'.",
-                    ),
-                );
-            }, timeout);
+        const app = applicationId === undefined ? this.getDefaultApp() : this.apps.get(applicationId);
 
-            const onRegister = (event: Event): void => {
-                clearTimeout(timeoutId);
-                this.removeEventListener("appRegistered", onRegister);
-                resolve((event as AppRegisteredEvent).detail);
-            };
+        if (app) {
+            return Promise.resolve(app.info);
+        }
 
-            this.addEventListener("appRegistered", onRegister);
-        });
+        return this.waitForRegistration(applicationId, timeout);
     }
 
-    async sendToApp<T>(applicationId: string | undefined, method: string, params?: RequestParams): Promise<T> {
+    async sendToApp<T>(
+        applicationId: string | undefined,
+        method: string,
+        params?: RequestParams,
+        waitTimeout?: number,
+    ): Promise<T> {
+        await this.waitForApp(applicationId, waitTimeout);
         const app = this.resolveTargetApp(applicationId);
 
         try {
-            return await app.connection.send<T>(method, params, this.requestTimeout);
+            return await app.connection.send<T>(method, params, DEFAULT_REQUEST_TIMEOUT_MS);
         } catch (error) {
             if (error instanceof McpError) {
                 throw this.toAppError(app, error);

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/internal.ts

@@ -6,7 +6,6 @@ export {
     widgetNotFoundError,
 } from "./protocol/errors.js";
 export {
-    DEFAULT_SOCKET_PATH,
     DEFAULT_SUBTREE_DEPTH,
     MAX_SUBTREE_WIDGETS,
     type ParamsSchema,
@@ -16,5 +15,9 @@ export {
     type ServerRequestParams,
     ServerRequestParamsSchemas,
 } from "./protocol/schemas.js";
+export {
+    MCP_SOCKET_PATH_ENV,
+    resolveMcpSocketPath,
+} from "./socket-path.js";
 export { ProtocolConnection } from "./transport.js";
 export type { JSONRPCRequest, Result } from "@modelcontextprotocol/sdk/types.js";

package/src/protocol/schemas.ts

@@ -1,5 +1,3 @@
-import { tmpdir } from "node:os";
-import { join } from "node:path";
 import { z } from "zod";
 
 type SerializedWidget = {
@@ -22,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]
@@ -130,12 +124,6 @@ const ServerRequestParamsSchemas: {
     "widget.screenshot": screenshotParams,
 };
 
-const DEFAULT_SOCKET_PATH: string = join(getRuntimeDir(), "gtkx-mcp.sock");
-
-function getRuntimeDir(): string {
-    return process.env.XDG_RUNTIME_DIR ?? tmpdir();
-}
-
 export {
     DEFAULT_SUBTREE_DEPTH,
     MAX_SUBTREE_WIDGETS,
@@ -148,7 +136,6 @@ export {
     fireEventParams,
     screenshotParams,
     ServerRequestParamsSchemas,
-    DEFAULT_SOCKET_PATH,
     type SerializedWidget,
     type SerializedProperty,
     type AppInfo,