@modelprofile.com/mcp-crossharness 5.0.0 → 5.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist_ts/00_commitinfo_data.js +1 -1
- package/dist_ts/classes.mcpserver.d.ts +4 -4
- package/dist_ts/classes.mcpserver.js +63 -215
- package/dist_ts/classes.mcptoolregistrar.d.ts +26 -0
- package/dist_ts/classes.mcptoolregistrar.js +257 -0
- package/dist_ts/index.d.ts +1 -0
- package/dist_ts/index.js +2 -1
- package/dist_ts/plugins.d.ts +2 -0
- package/dist_ts/plugins.js +1 -1
- package/package.json +1 -1
- package/readme.md +62 -2
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts/classes.mcpserver.ts +67 -297
- package/ts/classes.mcptoolregistrar.ts +345 -0
- package/ts/index.ts +1 -0
- package/ts/plugins.ts +2 -0
|
@@ -0,0 +1,257 @@
|
|
|
1
|
+
import * as plugins from './plugins.js';
|
|
2
|
+
import { ConnectionRegistry } from './classes.connectionregistry.js';
|
|
3
|
+
import { DispatchRegistry } from './classes.dispatchregistry.js';
|
|
4
|
+
const harnessNameSchema = plugins.z.enum(['claudecode', 'opencode', 'codex']);
|
|
5
|
+
/**
|
|
6
|
+
* Registers the Crossharness tool surface on an externally owned MCP server and
|
|
7
|
+
* owns only the resources used by those tools.
|
|
8
|
+
*/
|
|
9
|
+
export class CrossHarnessMcpToolRegistrar {
|
|
10
|
+
connections;
|
|
11
|
+
dispatches;
|
|
12
|
+
registeredTools = [];
|
|
13
|
+
registeredServer;
|
|
14
|
+
registered = false;
|
|
15
|
+
closeStarted = false;
|
|
16
|
+
closePromise;
|
|
17
|
+
resourceShutdownPromise;
|
|
18
|
+
constructor(connectionsArg = new ConnectionRegistry(), dispatchesArg = new DispatchRegistry()) {
|
|
19
|
+
this.connections = connectionsArg;
|
|
20
|
+
this.dispatches = dispatchesArg;
|
|
21
|
+
}
|
|
22
|
+
/** Register the tool surface before the externally owned MCP server connects. */
|
|
23
|
+
register(serverArg) {
|
|
24
|
+
if (this.closeStarted) {
|
|
25
|
+
throw new Error('Crossharness MCP tool registrar is closed');
|
|
26
|
+
}
|
|
27
|
+
if (this.registered) {
|
|
28
|
+
throw new Error('Crossharness MCP tools are already registered');
|
|
29
|
+
}
|
|
30
|
+
if (serverArg.isConnected()) {
|
|
31
|
+
throw new Error('Crossharness MCP tools must be registered before the MCP server connects');
|
|
32
|
+
}
|
|
33
|
+
const registeredTools = [];
|
|
34
|
+
try {
|
|
35
|
+
registeredTools.push(serverArg.registerTool('connect_harness', {
|
|
36
|
+
title: 'Connect to harness server',
|
|
37
|
+
description: 'Establish an explicit connection to an allowlisted harness web server. The exact origin must be listed in CROSSHARNESS_ALLOWED_SERVER_URLS. OpenCode uses http(s), Codex uses ws(s), and Claude Code is rejected because it exposes no URL-addressable session server. Returns a connectionId required by every connection-scoped operation; list_connections remains global.',
|
|
38
|
+
inputSchema: {
|
|
39
|
+
harness: harnessNameSchema,
|
|
40
|
+
serverUrl: plugins.z.string().max(2048).url().describe('Allowlisted harness server origin'),
|
|
41
|
+
directory: plugins.z
|
|
42
|
+
.string()
|
|
43
|
+
.max(4096)
|
|
44
|
+
.startsWith('/')
|
|
45
|
+
.describe('Absolute project directory on the harness server'),
|
|
46
|
+
},
|
|
47
|
+
}, async (args, extra) => this.wrapToolCall(async () => {
|
|
48
|
+
const info = await this.connections.connect(args.harness, args.serverUrl, args.directory, extra.signal);
|
|
49
|
+
return this.describeConnection(info);
|
|
50
|
+
})));
|
|
51
|
+
registeredTools.push(serverArg.registerTool('disconnect_harness', {
|
|
52
|
+
title: 'Disconnect harness server',
|
|
53
|
+
description: 'Close and remove an established harness connection. In-flight requests fail; async dispatch records remain inspectable with check_reply.',
|
|
54
|
+
inputSchema: {
|
|
55
|
+
connectionId: plugins.z.string().max(128).describe('Connection id returned by connect_harness'),
|
|
56
|
+
},
|
|
57
|
+
}, async (args) => this.wrapToolCall(async () => this.describeConnection(await this.connections.disconnect(args.connectionId)))));
|
|
58
|
+
registeredTools.push(serverArg.registerTool('list_connections', {
|
|
59
|
+
title: 'List harness connections',
|
|
60
|
+
description: 'List explicit harness web-server connections established in this MCP process.',
|
|
61
|
+
inputSchema: {},
|
|
62
|
+
}, async () => this.wrapToolCall(async () => {
|
|
63
|
+
const connections = this.connections.list();
|
|
64
|
+
return connections.length > 0
|
|
65
|
+
? connections.map((connection) => this.describeConnection(connection)).join('\n\n')
|
|
66
|
+
: 'No harness server connections established.';
|
|
67
|
+
})));
|
|
68
|
+
registeredTools.push(serverArg.registerTool('connection_status', {
|
|
69
|
+
title: 'Check harness connection',
|
|
70
|
+
description: 'Run the protocol health check for one explicit harness server connection.',
|
|
71
|
+
inputSchema: {
|
|
72
|
+
connectionId: plugins.z.string().max(128).describe('Connection id returned by connect_harness'),
|
|
73
|
+
},
|
|
74
|
+
}, async (args) => this.wrapToolCall(async () => {
|
|
75
|
+
const status = await this.connections.get(args.connectionId).getStatus();
|
|
76
|
+
return `${this.describeConnection(status)}\nhealthy: ${status.healthy ? 'yes' : 'no'}\ndetail: ${status.detail}`;
|
|
77
|
+
})));
|
|
78
|
+
registeredTools.push(serverArg.registerTool('list_chats', {
|
|
79
|
+
title: 'List harness chats',
|
|
80
|
+
description: 'List chats from the server and directory bound to an explicit connection. No local session stores are read.',
|
|
81
|
+
inputSchema: {
|
|
82
|
+
connectionId: plugins.z.string().max(128).describe('Connection id returned by connect_harness'),
|
|
83
|
+
limit: plugins.z.number().int().min(1).max(100).optional(),
|
|
84
|
+
},
|
|
85
|
+
}, async (args) => this.wrapToolCall(async () => {
|
|
86
|
+
const chats = await this.connections.get(args.connectionId).listChats(args.limit ?? 10);
|
|
87
|
+
if (chats.length === 0)
|
|
88
|
+
return 'No chats found for this connection.';
|
|
89
|
+
return [
|
|
90
|
+
'harness\tchatId\tupdatedAt\tactivity\ttitle',
|
|
91
|
+
...chats.map((chat) => `${chat.harness}\t${chat.chatId}\t${chat.updatedAt}\t${chat.isActive ? 'active' : 'idle'}\t${chat.title.replace(/\s+/g, ' ').slice(0, 120)}`),
|
|
92
|
+
].join('\n');
|
|
93
|
+
})));
|
|
94
|
+
registeredTools.push(serverArg.registerTool('read_chat', {
|
|
95
|
+
title: 'Read harness chat',
|
|
96
|
+
description: 'Read a chat through the harness web server bound to an explicit connection.',
|
|
97
|
+
inputSchema: {
|
|
98
|
+
connectionId: plugins.z.string().max(128).describe('Connection id returned by connect_harness'),
|
|
99
|
+
chatId: plugins.z.string().min(1).max(1024),
|
|
100
|
+
limit: plugins.z.number().int().min(1).max(500).optional(),
|
|
101
|
+
maxChars: plugins.z.number().int().min(200).max(50000).optional(),
|
|
102
|
+
},
|
|
103
|
+
}, async (args) => this.wrapToolCall(async () => {
|
|
104
|
+
const transcript = await this.connections
|
|
105
|
+
.get(args.connectionId)
|
|
106
|
+
.readChat(args.chatId, args.limit ?? 20, args.maxChars ?? 2000);
|
|
107
|
+
const header = [
|
|
108
|
+
`harness: ${transcript.harness}`,
|
|
109
|
+
`chatId: ${transcript.chatId}`,
|
|
110
|
+
`title: ${transcript.title}`,
|
|
111
|
+
`directory: ${transcript.directory}`,
|
|
112
|
+
transcript.totalMessages === undefined
|
|
113
|
+
? `messages: showing ${transcript.messages.length}; server total unavailable`
|
|
114
|
+
: `messages: showing ${transcript.messages.length} of ${transcript.totalMessages}`,
|
|
115
|
+
].join('\n');
|
|
116
|
+
const body = transcript.messages
|
|
117
|
+
.map((message) => `-- [${message.role}]${message.timestamp ? ` ${message.timestamp}` : ''}\n${message.text}`)
|
|
118
|
+
.join('\n');
|
|
119
|
+
return `${header}\n\n${body}`;
|
|
120
|
+
})));
|
|
121
|
+
registeredTools.push(serverArg.registerTool('send_message', {
|
|
122
|
+
title: 'Send message through harness server',
|
|
123
|
+
description: 'Send a message only through the harness web server bound to an explicit connection and wait for the reply. There is no CLI, process, local-store, discovery, or retry fallback.',
|
|
124
|
+
inputSchema: {
|
|
125
|
+
connectionId: plugins.z.string().max(128).describe('Connection id returned by connect_harness'),
|
|
126
|
+
chatId: plugins.z.string().min(1).max(1024),
|
|
127
|
+
message: plugins.z.string().min(1).max(1024 * 1024),
|
|
128
|
+
timeoutSeconds: plugins.z.number().int().min(1).max(3600).optional(),
|
|
129
|
+
},
|
|
130
|
+
}, async (args, extra) => this.wrapToolCall(async () => {
|
|
131
|
+
const result = await this.connections
|
|
132
|
+
.get(args.connectionId)
|
|
133
|
+
.sendMessage(args.chatId, args.message, args.timeoutSeconds ?? 300, extra.signal);
|
|
134
|
+
return `${result.reply}\n\n[crossharness transport: ${result.via}]`;
|
|
135
|
+
})));
|
|
136
|
+
registeredTools.push(serverArg.registerTool('send_message_async', {
|
|
137
|
+
title: 'Send message through harness server asynchronously',
|
|
138
|
+
description: 'Start a server-only send and return a dispatchId immediately. Both this connectionId and the dispatchId are required by check_reply.',
|
|
139
|
+
inputSchema: {
|
|
140
|
+
connectionId: plugins.z.string().max(128).describe('Connection id returned by connect_harness'),
|
|
141
|
+
chatId: plugins.z.string().min(1).max(1024),
|
|
142
|
+
message: plugins.z.string().min(1).max(1024 * 1024),
|
|
143
|
+
timeoutSeconds: plugins.z.number().int().min(1).max(3600).optional(),
|
|
144
|
+
},
|
|
145
|
+
}, async (args) => this.wrapToolCall(async () => {
|
|
146
|
+
const connection = this.connections.get(args.connectionId);
|
|
147
|
+
const record = this.dispatches.track(args.connectionId, connection.harness, args.chatId, () => connection.sendMessage(args.chatId, args.message, args.timeoutSeconds ?? 900));
|
|
148
|
+
return [
|
|
149
|
+
`connectionId: ${record.connectionId}`,
|
|
150
|
+
`dispatchId: ${record.dispatchId}`,
|
|
151
|
+
`harness: ${record.harness}`,
|
|
152
|
+
`chatId: ${record.chatId}`,
|
|
153
|
+
`startedAt: ${record.startedAt}`,
|
|
154
|
+
].join('\n');
|
|
155
|
+
})));
|
|
156
|
+
registeredTools.push(serverArg.registerTool('check_reply', {
|
|
157
|
+
title: 'Check async server send',
|
|
158
|
+
description: 'Check an asynchronous send. The connectionId must own the dispatch. Records remain inspectable after disconnect.',
|
|
159
|
+
inputSchema: {
|
|
160
|
+
connectionId: plugins.z.string().max(128).describe('Connection id used for send_message_async'),
|
|
161
|
+
dispatchId: plugins.z.string().max(128).describe('Dispatch id returned by send_message_async'),
|
|
162
|
+
waitSeconds: plugins.z.number().int().min(0).max(60).optional(),
|
|
163
|
+
},
|
|
164
|
+
}, async (args, extra) => this.wrapToolCall(async () => {
|
|
165
|
+
const record = await this.dispatches.waitFor(args.connectionId, args.dispatchId, (args.waitSeconds ?? 0) * 1000, extra.signal);
|
|
166
|
+
if (!record)
|
|
167
|
+
throw new Error('unknown dispatchId for this connectionId');
|
|
168
|
+
const header = [
|
|
169
|
+
`connectionId: ${record.connectionId}`,
|
|
170
|
+
`dispatchId: ${record.dispatchId}`,
|
|
171
|
+
`status: ${record.status}`,
|
|
172
|
+
`harness: ${record.harness}`,
|
|
173
|
+
`chatId: ${record.chatId}`,
|
|
174
|
+
`startedAt: ${record.startedAt}`,
|
|
175
|
+
...(record.completedAt ? [`completedAt: ${record.completedAt}`] : []),
|
|
176
|
+
].join('\n');
|
|
177
|
+
if (record.status === 'working')
|
|
178
|
+
return `${header}\n\nStill working.`;
|
|
179
|
+
if (record.status === 'failed')
|
|
180
|
+
return `${header}\n\nError: ${record.error}`;
|
|
181
|
+
return `${header}\n\n${record.reply}\n\n[crossharness transport: ${record.via}]`;
|
|
182
|
+
})));
|
|
183
|
+
}
|
|
184
|
+
catch (errorArg) {
|
|
185
|
+
for (const registeredTool of registeredTools.reverse())
|
|
186
|
+
registeredTool.remove();
|
|
187
|
+
throw errorArg;
|
|
188
|
+
}
|
|
189
|
+
this.registeredTools = registeredTools;
|
|
190
|
+
this.registeredServer = serverArg;
|
|
191
|
+
this.registered = true;
|
|
192
|
+
}
|
|
193
|
+
/** Close the externally owned MCP server before closing this registrar. */
|
|
194
|
+
async close() {
|
|
195
|
+
if (this.closePromise)
|
|
196
|
+
return this.closePromise;
|
|
197
|
+
if (this.registeredServer?.isConnected()) {
|
|
198
|
+
throw new Error('Crossharness MCP tool registrar cannot close while its MCP server is connected; close the shared MCP server first');
|
|
199
|
+
}
|
|
200
|
+
this.closeStarted = true;
|
|
201
|
+
this.removeRegisteredTools();
|
|
202
|
+
this.registeredServer = undefined;
|
|
203
|
+
this.closePromise = this.ensureResourceShutdown().finally(() => {
|
|
204
|
+
this.closePromise = undefined;
|
|
205
|
+
});
|
|
206
|
+
return this.closePromise;
|
|
207
|
+
}
|
|
208
|
+
removeRegisteredTools() {
|
|
209
|
+
for (const registeredTool of this.registeredTools.reverse())
|
|
210
|
+
registeredTool.remove();
|
|
211
|
+
this.registeredTools = [];
|
|
212
|
+
}
|
|
213
|
+
ensureResourceShutdown() {
|
|
214
|
+
if (this.resourceShutdownPromise)
|
|
215
|
+
return this.resourceShutdownPromise;
|
|
216
|
+
let shutdownPromise;
|
|
217
|
+
shutdownPromise = this.connections.closeAll().finally(() => {
|
|
218
|
+
this.dispatches.dispose();
|
|
219
|
+
}).catch((errorArg) => {
|
|
220
|
+
if (this.resourceShutdownPromise === shutdownPromise) {
|
|
221
|
+
this.resourceShutdownPromise = undefined;
|
|
222
|
+
}
|
|
223
|
+
throw errorArg;
|
|
224
|
+
});
|
|
225
|
+
this.resourceShutdownPromise = shutdownPromise;
|
|
226
|
+
return shutdownPromise;
|
|
227
|
+
}
|
|
228
|
+
describeConnection(infoArg) {
|
|
229
|
+
return [
|
|
230
|
+
`connectionId: ${infoArg.connectionId}`,
|
|
231
|
+
`harness: ${infoArg.harness}`,
|
|
232
|
+
`serverUrl: ${infoArg.serverUrl}`,
|
|
233
|
+
`directory: ${infoArg.directory}`,
|
|
234
|
+
`state: ${infoArg.state}`,
|
|
235
|
+
`connectedAt: ${infoArg.connectedAt}`,
|
|
236
|
+
...(infoArg.serverVersion ? [`serverVersion: ${infoArg.serverVersion}`] : []),
|
|
237
|
+
].join('\n');
|
|
238
|
+
}
|
|
239
|
+
async wrapToolCall(handlerArg) {
|
|
240
|
+
try {
|
|
241
|
+
const text = await handlerArg();
|
|
242
|
+
return { content: [{ type: 'text', text: text.slice(0, 100000) }] };
|
|
243
|
+
}
|
|
244
|
+
catch (error) {
|
|
245
|
+
return {
|
|
246
|
+
content: [
|
|
247
|
+
{
|
|
248
|
+
type: 'text',
|
|
249
|
+
text: `Error: ${error instanceof Error ? error.message : String(error)}`.slice(0, 100000),
|
|
250
|
+
},
|
|
251
|
+
],
|
|
252
|
+
isError: true,
|
|
253
|
+
};
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.mcptoolregistrar.js","sourceRoot":"","sources":["../ts/classes.mcptoolregistrar.ts"],"names":[],"mappings":"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"}
|
package/dist_ts/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from './interfaces.js';
|
|
2
2
|
export * from './classes.connectionregistry.js';
|
|
3
3
|
export * from './classes.dispatchregistry.js';
|
|
4
|
+
export * from './classes.mcptoolregistrar.js';
|
|
4
5
|
export * from './classes.mcpserver.js';
|
|
5
6
|
export declare const runCli: () => Promise<void>;
|
package/dist_ts/index.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
export * from './interfaces.js';
|
|
2
2
|
export * from './classes.connectionregistry.js';
|
|
3
3
|
export * from './classes.dispatchregistry.js';
|
|
4
|
+
export * from './classes.mcptoolregistrar.js';
|
|
4
5
|
export * from './classes.mcpserver.js';
|
|
5
6
|
import { CrossHarnessMcpServer } from './classes.mcpserver.js';
|
|
6
7
|
export const runCli = async () => {
|
|
7
8
|
await new CrossHarnessMcpServer().start();
|
|
8
9
|
};
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGlCQUFpQixDQUFDO0FBQ2hDLGNBQWMsaUNBQWlDLENBQUM7QUFDaEQsY0FBYywrQkFBK0IsQ0FBQztBQUM5QyxjQUFjLCtCQUErQixDQUFDO0FBQzlDLGNBQWMsd0JBQXdCLENBQUM7QUFFdkMsT0FBTyxFQUFFLHFCQUFxQixFQUFFLE1BQU0sd0JBQXdCLENBQUM7QUFFL0QsTUFBTSxDQUFDLE1BQU0sTUFBTSxHQUFHLEtBQUssSUFBbUIsRUFBRTtJQUM5QyxNQUFNLElBQUkscUJBQXFCLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQztBQUM1QyxDQUFDLENBQUMifQ==
|
package/dist_ts/plugins.d.ts
CHANGED
|
@@ -5,6 +5,7 @@ import type { AddressInfo } from 'node:net';
|
|
|
5
5
|
export { crypto, http, stream };
|
|
6
6
|
export type { AddressInfo };
|
|
7
7
|
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
|
|
8
|
+
import type { RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
|
|
8
9
|
import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
|
|
9
10
|
import { Client as McpClient } from '@modelcontextprotocol/sdk/client/index.js';
|
|
10
11
|
import { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory.js';
|
|
@@ -14,4 +15,5 @@ import type { RawData } from 'ws';
|
|
|
14
15
|
import { z } from 'zod';
|
|
15
16
|
export { InMemoryTransport, McpClient, McpServer, StdioServerTransport, WebSocketServer, WsWebSocket, z, };
|
|
16
17
|
export type { RawData };
|
|
18
|
+
export type { RegisteredTool };
|
|
17
19
|
export type { Transport };
|
package/dist_ts/plugins.js
CHANGED
|
@@ -11,4 +11,4 @@ import { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory.js';
|
|
|
11
11
|
import { WebSocket as WsWebSocket, WebSocketServer } from 'ws';
|
|
12
12
|
import { z } from 'zod';
|
|
13
13
|
export { InMemoryTransport, McpClient, McpServer, StdioServerTransport, WebSocketServer, WsWebSocket, z, };
|
|
14
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
14
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsc0JBQXNCO0FBQ3RCLE9BQU8sS0FBSyxNQUFNLE1BQU0sYUFBYSxDQUFDO0FBQ3RDLE9BQU8sS0FBSyxJQUFJLE1BQU0sV0FBVyxDQUFDO0FBQ2xDLE9BQU8sS0FBSyxNQUFNLE1BQU0sYUFBYSxDQUFDO0FBR3RDLE9BQU8sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBRSxDQUFDO0FBR2hDLHNCQUFzQjtBQUN0QixPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0seUNBQXlDLENBQUM7QUFFcEUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLE1BQU0sMkNBQTJDLENBQUM7QUFDakYsT0FBTyxFQUFFLE1BQU0sSUFBSSxTQUFTLEVBQUUsTUFBTSwyQ0FBMkMsQ0FBQztBQUNoRixPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1Q0FBdUMsQ0FBQztBQUUxRSxPQUFPLEVBQUUsU0FBUyxJQUFJLFdBQVcsRUFBRSxlQUFlLEVBQUUsTUFBTSxJQUFJLENBQUM7QUFFL0QsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEtBQUssQ0FBQztBQUV4QixPQUFPLEVBQ0wsaUJBQWlCLEVBQ2pCLFNBQVMsRUFDVCxTQUFTLEVBQ1Qsb0JBQW9CLEVBQ3BCLGVBQWUsRUFDZixXQUFXLEVBQ1gsQ0FBQyxHQUNGLENBQUMifQ==
|
package/package.json
CHANGED
package/readme.md
CHANGED
|
@@ -140,13 +140,73 @@ Register the `mcp-crossharness` binary as a stdio MCP server in your client.
|
|
|
140
140
|
|
|
141
141
|
## Library API
|
|
142
142
|
|
|
143
|
+
### Composable tool registration
|
|
144
|
+
|
|
145
|
+
`CrossHarnessMcpToolRegistrar` registers the same nine Crossharness tools used by the standalone
|
|
146
|
+
server on an MCP SDK 1.30 `McpServer` owned by an embedding application:
|
|
147
|
+
|
|
143
148
|
```typescript
|
|
149
|
+
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
|
|
144
150
|
import {
|
|
145
151
|
ConnectionRegistry,
|
|
146
|
-
|
|
147
|
-
CrossHarnessMcpServer,
|
|
152
|
+
CrossHarnessMcpToolRegistrar,
|
|
148
153
|
} from '@modelprofile.com/mcp-crossharness';
|
|
149
154
|
|
|
155
|
+
const connections = new ConnectionRegistry({
|
|
156
|
+
allowedServerUrls: ['http://127.0.0.1:4096/'],
|
|
157
|
+
openCodeCredentials: {
|
|
158
|
+
serverUrl: 'http://127.0.0.1:4096/',
|
|
159
|
+
username: 'opencode',
|
|
160
|
+
password: controllerOwnedPassword,
|
|
161
|
+
},
|
|
162
|
+
});
|
|
163
|
+
const crossHarnessTools = new CrossHarnessMcpToolRegistrar(connections);
|
|
164
|
+
const sharedServer = new McpServer({ name: 'controller', version: '1.0.0' });
|
|
165
|
+
|
|
166
|
+
crossHarnessTools.register(sharedServer);
|
|
167
|
+
await sharedServer.connect(hostOwnedTransport);
|
|
168
|
+
|
|
169
|
+
// During host shutdown, close the shared server before its Crossharness registrar.
|
|
170
|
+
await sharedServer.close();
|
|
171
|
+
await crossHarnessTools.close();
|
|
172
|
+
```
|
|
173
|
+
|
|
174
|
+
The registrar takes lifecycle ownership of injected `ConnectionRegistry` and `DispatchRegistry`
|
|
175
|
+
instances. Call `register()` before connecting the shared server. A successful registrar can
|
|
176
|
+
register only once.
|
|
177
|
+
|
|
178
|
+
Composition supports an ordinary high-level `McpServer` tool surface, including host tools added
|
|
179
|
+
with `McpServer.registerTool()`. A duplicate high-level tool name throws and transactionally removes
|
|
180
|
+
the Crossharness tools added by that attempt without replacing the host's tool.
|
|
181
|
+
|
|
182
|
+
Do not preinstall custom low-level `tools/list` or `tools/call` handlers with
|
|
183
|
+
`sharedServer.server.setRequestHandler()`. SDK 1.30 adds the first high-level tool to its internal
|
|
184
|
+
map before discovering that low-level handler conflict and throwing, without returning a
|
|
185
|
+
`RegisteredTool` handle. The registrar cannot transactionally roll back that SDK mutation. Use the
|
|
186
|
+
ordinary high-level `McpServer.registerTool()` surface or a separate `McpServer` instead.
|
|
187
|
+
|
|
188
|
+
`close()` removes the registrar's tool registrations, closes every owned connection, and disposes
|
|
189
|
+
its dispatch registry. If the registered server is still connected, `close()` fails before
|
|
190
|
+
removing tools or mutating either registry. Close the shared server first, then call registrar
|
|
191
|
+
`close()`; failed connection cleanup remains retryable by calling it again. The registrar never
|
|
192
|
+
connects or closes the shared `McpServer`, never owns its transport, and installs no stdin,
|
|
193
|
+
process-signal, or shared-server close listeners.
|
|
194
|
+
|
|
195
|
+
`CrossHarnessMcpServer` is the standalone stdio lifecycle wrapper. It creates this exact registrar,
|
|
196
|
+
keeps the existing one-shot `start()` contract, and owns only its own MCP server, transport, and
|
|
197
|
+
stdin close handling in addition to delegating tool-resource cleanup to the registrar. It closes
|
|
198
|
+
the server before the registrar, retains the same server and transport when transport close fails,
|
|
199
|
+
and retries them on the next `close()`. Concurrent transport and registrar cleanup failures are
|
|
200
|
+
reported together as an `AggregateError`.
|
|
201
|
+
|
|
202
|
+
### Direct registry use
|
|
203
|
+
|
|
204
|
+
The registries remain public for applications that need the connection API without MCP tool
|
|
205
|
+
registration:
|
|
206
|
+
|
|
207
|
+
```typescript
|
|
208
|
+
import { ConnectionRegistry } from '@modelprofile.com/mcp-crossharness';
|
|
209
|
+
|
|
150
210
|
const connections = new ConnectionRegistry({
|
|
151
211
|
allowedServerUrls: ['http://127.0.0.1:4096/'],
|
|
152
212
|
openCodeCredentials: {
|
package/ts/00_commitinfo_data.ts
CHANGED