@modelprofile.com/flexharness 10.21.0 → 10.23.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_mcp/index.d.ts +33 -9
- package/dist_ts_mcp/index.js +16 -4
- package/dist_ts_tools/index.d.ts +1 -1
- package/dist_ts_tools/index.js +2 -2
- package/dist_ts_tools/tool.filesystem.d.ts +8 -0
- package/dist_ts_tools/tool.filesystem.js +11 -1
- package/package.json +3 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts_mcp/index.ts +56 -12
- package/ts_mcp/readme.md +6 -1
- package/ts_tools/index.ts +1 -1
- package/ts_tools/readme.md +2 -0
- package/ts_tools/tool.filesystem.ts +12 -0
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@modelprofile.com/flexharness',
|
|
6
|
-
version: '10.
|
|
6
|
+
version: '10.23.0',
|
|
7
7
|
description: 'The FlexHarness toolbox source repository and shared dependency catalog.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSwrQkFBK0I7SUFDckMsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLDBFQUEwRTtDQUN4RixDQUFBIn0=
|
package/dist_ts_mcp/index.d.ts
CHANGED
|
@@ -18,19 +18,28 @@ export interface IMcpServerClientOptions {
|
|
|
18
18
|
clientOptions?: plugins.ClientOptions;
|
|
19
19
|
requestOptions?: plugins.RequestOptions;
|
|
20
20
|
}
|
|
21
|
-
export interface
|
|
21
|
+
export interface IMcpServerTrustOptions {
|
|
22
|
+
/**
|
|
23
|
+
* Trusts the server's `readOnlyHint` annotations: `isReadOnlyToolCall` classifies a call of a tool
|
|
24
|
+
* the server annotates `readOnlyHint: true` as read-only, and `createMcpToolCatalog` declares its
|
|
25
|
+
* method `readOnly`. An annotation is the server's own claim, so no server's is trusted unless its
|
|
26
|
+
* configuration says so. Default: false.
|
|
27
|
+
*/
|
|
28
|
+
trustReadOnlyHints?: boolean;
|
|
29
|
+
}
|
|
30
|
+
export interface IMcpStdioServerConfig extends plugins.StdioServerParameters, IMcpServerClientOptions, IMcpServerTrustOptions {
|
|
22
31
|
type: 'stdio';
|
|
23
32
|
}
|
|
24
|
-
export interface IMcpStreamableHttpServerConfig extends IMcpServerClientOptions {
|
|
33
|
+
export interface IMcpStreamableHttpServerConfig extends IMcpServerClientOptions, IMcpServerTrustOptions {
|
|
25
34
|
type: 'streamableHttp' | 'http';
|
|
26
35
|
url: string | URL;
|
|
27
36
|
transportOptions?: plugins.StreamableHTTPClientTransportOptions;
|
|
28
37
|
}
|
|
29
|
-
export interface IMcpTransportServerConfig extends IMcpServerClientOptions {
|
|
38
|
+
export interface IMcpTransportServerConfig extends IMcpServerClientOptions, IMcpServerTrustOptions {
|
|
30
39
|
type: 'transport';
|
|
31
40
|
transport: plugins.Transport;
|
|
32
41
|
}
|
|
33
|
-
export interface IMcpClientServerConfig {
|
|
42
|
+
export interface IMcpClientServerConfig extends IMcpServerTrustOptions {
|
|
34
43
|
type: 'client';
|
|
35
44
|
client: IMcpClientLike;
|
|
36
45
|
}
|
|
@@ -65,6 +74,8 @@ export interface IMcpConnectedServer {
|
|
|
65
74
|
name: string;
|
|
66
75
|
client: IMcpClientLike;
|
|
67
76
|
tools: TMcpToolMetadata[];
|
|
77
|
+
/** Whether its configuration trusts the server's `readOnlyHint` annotations. */
|
|
78
|
+
trustReadOnlyHints: boolean;
|
|
68
79
|
}
|
|
69
80
|
export interface IMcpToolNameMapping {
|
|
70
81
|
serverName: string;
|
|
@@ -74,11 +85,22 @@ export interface ICreateMcpToolsResult {
|
|
|
74
85
|
tools: plugins.ToolSet;
|
|
75
86
|
servers: IMcpConnectedServer[];
|
|
76
87
|
toolNameMap: Record<string, IMcpToolNameMapping>;
|
|
88
|
+
/**
|
|
89
|
+
* Whether a call of `tools` only reads: its server's configuration trusts `readOnlyHint`, and the
|
|
90
|
+
* server annotates the tool `readOnlyHint: true`. Every other call is not read-only. Pass it as the
|
|
91
|
+
* tool handle's `isReadOnlyToolCall`, or ask it from that classifier.
|
|
92
|
+
*/
|
|
93
|
+
isReadOnlyToolCall: (call: {
|
|
94
|
+
toolName: string;
|
|
95
|
+
}) => boolean;
|
|
77
96
|
close: () => Promise<void>;
|
|
78
97
|
}
|
|
79
98
|
export declare const createMcpTools: (options: ICreateMcpToolsOptions) => Promise<ICreateMcpToolsResult>;
|
|
80
|
-
/**
|
|
81
|
-
|
|
99
|
+
/**
|
|
100
|
+
* The tools one MCP server lists, as `listTools` answered them, and whether its configuration trusts
|
|
101
|
+
* their `readOnlyHint` annotations. `IMcpConnectedServer` is one.
|
|
102
|
+
*/
|
|
103
|
+
export interface IMcpToolCatalogServer extends IMcpServerTrustOptions {
|
|
82
104
|
name: string;
|
|
83
105
|
tools: readonly TMcpToolMetadata[];
|
|
84
106
|
}
|
|
@@ -112,9 +134,11 @@ export interface ICreateMcpToolCatalogOptions<TScope = unknown> {
|
|
|
112
134
|
*/
|
|
113
135
|
authorizeToolCall?: (context: IMcpToolCatalogAuthorizeToolCallContext<TScope>) => PromiseLike<void> | void;
|
|
114
136
|
/**
|
|
115
|
-
* Declares a tool's method read-only
|
|
116
|
-
*
|
|
117
|
-
*
|
|
137
|
+
* Declares a tool's method read-only, beside the tools a server that trusts its annotations
|
|
138
|
+
* (`trustReadOnlyHints`) annotates `readOnlyHint: true`: its calls run concurrently with other
|
|
139
|
+
* reads and a turn answers identical ones once. Each still passes `authorizeToolCall`; when that
|
|
140
|
+
* asks for permission, the requests of concurrent reads are pending together. Omission declares
|
|
141
|
+
* no further ones.
|
|
118
142
|
*/
|
|
119
143
|
isReadOnly?: (context: IMcpToolCatalogToolContext) => boolean;
|
|
120
144
|
}
|
package/dist_ts_mcp/index.js
CHANGED
|
@@ -11,18 +11,27 @@ export const createMcpTools = async (options) => {
|
|
|
11
11
|
try {
|
|
12
12
|
for (const [serverName, config] of serverEntries) {
|
|
13
13
|
const client = await connectMcpServer(serverName, config, options);
|
|
14
|
-
const connectedServer = {
|
|
14
|
+
const connectedServer = {
|
|
15
|
+
name: serverName,
|
|
16
|
+
client,
|
|
17
|
+
tools: [],
|
|
18
|
+
trustReadOnlyHints: config.trustReadOnlyHints === true,
|
|
19
|
+
};
|
|
15
20
|
connectedServers.push(connectedServer);
|
|
16
21
|
connectedServer.tools = await listAllMcpTools(client, options.listToolsRequestOptions ?? getServerRequestOptions(config) ?? options.requestOptions, maxListToolsPages);
|
|
17
22
|
}
|
|
18
23
|
const exposedTools = {};
|
|
19
24
|
const toolNameMap = {};
|
|
25
|
+
const readOnlyToolNames = new Set();
|
|
20
26
|
const shouldPrefixToolNames = options.prefixToolNames ?? connectedServers.length > 1;
|
|
21
27
|
for (const { server, tool: mcpTool, exposedToolName } of nameMcpTools(connectedServers, shouldPrefixToolNames)) {
|
|
22
28
|
toolNameMap[exposedToolName] = {
|
|
23
29
|
serverName: server.name,
|
|
24
30
|
toolName: mcpTool.name,
|
|
25
31
|
};
|
|
32
|
+
if (server.trustReadOnlyHints && mcpTool.annotations?.readOnlyHint === true) {
|
|
33
|
+
readOnlyToolNames.add(exposedToolName);
|
|
34
|
+
}
|
|
26
35
|
exposedTools[exposedToolName] = plugins.tool({
|
|
27
36
|
description: mcpTool.description ?? `MCP tool ${mcpTool.name} from ${server.name}`,
|
|
28
37
|
inputSchema: plugins.jsonSchema(mcpTool.inputSchema),
|
|
@@ -44,6 +53,7 @@ export const createMcpTools = async (options) => {
|
|
|
44
53
|
tools: exposedTools,
|
|
45
54
|
servers: connectedServers,
|
|
46
55
|
toolNameMap,
|
|
56
|
+
isReadOnlyToolCall: ({ toolName }) => readOnlyToolNames.has(toolName),
|
|
47
57
|
close: async () => closeMcpClients(connectedServers),
|
|
48
58
|
};
|
|
49
59
|
}
|
|
@@ -82,12 +92,14 @@ export const createMcpToolCatalog = (options) => {
|
|
|
82
92
|
const text = mcpTool.description?.trim() || `MCP tool ${mcpTool.name} from ${server.name}`;
|
|
83
93
|
const summary = summaryOf(text);
|
|
84
94
|
const description = text === summary ? undefined : truncateUtf8(text, plugins.FLEX_TOOL_CATALOG_LIMITS.maxDescriptionBytes);
|
|
95
|
+
const readOnly = (server.trustReadOnlyHints === true && mcpTool.annotations?.readOnlyHint === true)
|
|
96
|
+
|| options.isReadOnly?.(toolContext) === true;
|
|
85
97
|
methods.push({
|
|
86
98
|
method: path,
|
|
87
99
|
summary,
|
|
88
100
|
...(description ? { description } : {}),
|
|
89
101
|
inputSchema: mcpTool.inputSchema,
|
|
90
|
-
...(
|
|
102
|
+
...(readOnly ? { readOnly: true } : {}),
|
|
91
103
|
run: (params, call) => callMcpTool({
|
|
92
104
|
serverName: server.name,
|
|
93
105
|
toolName: mcpTool.name,
|
|
@@ -167,7 +179,7 @@ const connectMcpServer = async (serverName, config, options) => {
|
|
|
167
179
|
};
|
|
168
180
|
const createMcpTransport = (config) => {
|
|
169
181
|
if (config.type === 'stdio') {
|
|
170
|
-
const { type, clientName, clientVersion, clientOptions, requestOptions, ...serverParameters } = config;
|
|
182
|
+
const { type, clientName, clientVersion, clientOptions, requestOptions, trustReadOnlyHints, ...serverParameters } = config;
|
|
171
183
|
return new plugins.StdioClientTransport(serverParameters);
|
|
172
184
|
}
|
|
173
185
|
if (config.type === 'streamableHttp' || config.type === 'http') {
|
|
@@ -374,4 +386,4 @@ const rethrowAfterCleanup = async (originalError, cleanup, message) => {
|
|
|
374
386
|
}
|
|
375
387
|
throw originalError;
|
|
376
388
|
};
|
|
377
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts_mcp/index.ts"],"names":[],"mappings":"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"}
|
|
389
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts_mcp/index.ts"],"names":[],"mappings":"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"}
|
package/dist_ts_tools/index.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ export { createBrowserTools } from './tool.browser.js';
|
|
|
2
2
|
export { acquireToolExecutionContext, ToolExecutionAdapterCleanupError, } from './plugins.js';
|
|
3
3
|
export type { IToolExecutionAdapter, IToolExecutionAdapterRequest, IToolExecutionContextLease, } from './plugins.js';
|
|
4
4
|
export type { ICreateBrowserToolsOptions } from './tool.browser.js';
|
|
5
|
-
export { createFilesystemTools } from './tool.filesystem.js';
|
|
5
|
+
export { createFilesystemTools, isReadOnlyFilesystemToolCall } from './tool.filesystem.js';
|
|
6
6
|
export type { ICreateFilesystemToolsOptions } from './tool.filesystem.js';
|
|
7
7
|
export { createShellTools } from './tool.shell.js';
|
|
8
8
|
export type { ICreateShellToolsOptions } from './tool.shell.js';
|
package/dist_ts_tools/index.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
export { createBrowserTools } from './tool.browser.js';
|
|
2
2
|
export { acquireToolExecutionContext, ToolExecutionAdapterCleanupError, } from './plugins.js';
|
|
3
|
-
export { createFilesystemTools } from './tool.filesystem.js';
|
|
3
|
+
export { createFilesystemTools, isReadOnlyFilesystemToolCall } from './tool.filesystem.js';
|
|
4
4
|
export { createShellTools } from './tool.shell.js';
|
|
5
5
|
export { formatShellResult, formatToolOutput } from './tool.context.js';
|
|
6
6
|
export { InMemoryToolJobStore, ToolJobStoreConflictError } from './plugins.js';
|
|
7
7
|
export { httpTool } from './tool.http.js';
|
|
8
8
|
export { jsonTool } from './tool.json.js';
|
|
9
9
|
export { truncateOutput } from './plugins.js';
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90c190b29scy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsa0JBQWtCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQUN2RCxPQUFPLEVBQ0wsMkJBQTJCLEVBQzNCLGdDQUFnQyxHQUNqQyxNQUFNLGNBQWMsQ0FBQztBQU90QixPQUFPLEVBQUUscUJBQXFCLEVBQUUsNEJBQTRCLEVBQUUsTUFBTSxzQkFBc0IsQ0FBQztBQUUzRixPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQztBQUduRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQztBQTJCeEUsT0FBTyxFQUFFLG9CQUFvQixFQUFFLHlCQUF5QixFQUFFLE1BQU0sY0FBYyxDQUFDO0FBRS9FLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUMxQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDMUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGNBQWMsQ0FBQyJ9
|
|
@@ -10,4 +10,12 @@ export interface ICreateFilesystemToolsOptions {
|
|
|
10
10
|
/** Maximum output bytes before truncating. */
|
|
11
11
|
maxBytes?: number;
|
|
12
12
|
}
|
|
13
|
+
/**
|
|
14
|
+
* Whether a call of `createFilesystemTools()`' tools only reads: `read_file` and `list_directory`
|
|
15
|
+
* change nothing and ask for no permission. Pass it as the tool handle's `isReadOnlyToolCall`, or ask
|
|
16
|
+
* it from that classifier, when the context's `fs.readFile` and `fs.listDirectory` do neither either.
|
|
17
|
+
*/
|
|
18
|
+
export declare function isReadOnlyFilesystemToolCall(call: {
|
|
19
|
+
toolName: string;
|
|
20
|
+
}): boolean;
|
|
13
21
|
export declare function createFilesystemTools(context: IToolExecutionContext, options?: ICreateFilesystemToolsOptions): plugins.ToolSet;
|
|
@@ -1,5 +1,15 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
import { formatToolOutput, } from './tool.context.js';
|
|
3
|
+
/** The tools of `createFilesystemTools()` that only read. */
|
|
4
|
+
const readOnlyFilesystemToolNames = new Set(['read_file', 'list_directory']);
|
|
5
|
+
/**
|
|
6
|
+
* Whether a call of `createFilesystemTools()`' tools only reads: `read_file` and `list_directory`
|
|
7
|
+
* change nothing and ask for no permission. Pass it as the tool handle's `isReadOnlyToolCall`, or ask
|
|
8
|
+
* it from that classifier, when the context's `fs.readFile` and `fs.listDirectory` do neither either.
|
|
9
|
+
*/
|
|
10
|
+
export function isReadOnlyFilesystemToolCall(call) {
|
|
11
|
+
return readOnlyFilesystemToolNames.has(call.toolName);
|
|
12
|
+
}
|
|
3
13
|
export function createFilesystemTools(context, options = {}) {
|
|
4
14
|
const truncate = (output) => plugins.truncateOutput(formatToolOutput(output), {
|
|
5
15
|
maxLines: options.maxLines,
|
|
@@ -144,4 +154,4 @@ export function createFilesystemTools(context, options = {}) {
|
|
|
144
154
|
}
|
|
145
155
|
return tools;
|
|
146
156
|
}
|
|
147
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
157
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"tool.filesystem.js","sourceRoot":"","sources":["../ts_tools/tool.filesystem.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"author": "Task Venture Capital GmbH",
|
|
3
3
|
"license": "MIT",
|
|
4
4
|
"name": "@modelprofile.com/flexharness",
|
|
5
|
-
"version": "10.
|
|
5
|
+
"version": "10.23.0",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"description": "Managed agent sessions with tools, MCP, chat, OCR, documents and browser control through focused subpath imports.",
|
|
8
8
|
"main": "./dist_ts/index.js",
|
|
@@ -87,8 +87,8 @@
|
|
|
87
87
|
},
|
|
88
88
|
"dependencies": {
|
|
89
89
|
"@cfworker/json-schema": "^4.1.1",
|
|
90
|
-
"@modelprofile.com/flexharness-agent": "10.
|
|
91
|
-
"@modelprofile.com/flexharness-models": "10.
|
|
90
|
+
"@modelprofile.com/flexharness-agent": "10.23.0",
|
|
91
|
+
"@modelprofile.com/flexharness-models": "10.23.0",
|
|
92
92
|
"@push.rocks/smartrequest": "^5.5.1",
|
|
93
93
|
"ai": "^7.0.111",
|
|
94
94
|
"zod": "^4.6.5"
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts_mcp/index.ts
CHANGED
|
@@ -27,22 +27,33 @@ export interface IMcpServerClientOptions {
|
|
|
27
27
|
requestOptions?: plugins.RequestOptions;
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
-
export interface
|
|
30
|
+
export interface IMcpServerTrustOptions {
|
|
31
|
+
/**
|
|
32
|
+
* Trusts the server's `readOnlyHint` annotations: `isReadOnlyToolCall` classifies a call of a tool
|
|
33
|
+
* the server annotates `readOnlyHint: true` as read-only, and `createMcpToolCatalog` declares its
|
|
34
|
+
* method `readOnly`. An annotation is the server's own claim, so no server's is trusted unless its
|
|
35
|
+
* configuration says so. Default: false.
|
|
36
|
+
*/
|
|
37
|
+
trustReadOnlyHints?: boolean;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
export interface IMcpStdioServerConfig
|
|
41
|
+
extends plugins.StdioServerParameters, IMcpServerClientOptions, IMcpServerTrustOptions {
|
|
31
42
|
type: 'stdio';
|
|
32
43
|
}
|
|
33
44
|
|
|
34
|
-
export interface IMcpStreamableHttpServerConfig extends IMcpServerClientOptions {
|
|
45
|
+
export interface IMcpStreamableHttpServerConfig extends IMcpServerClientOptions, IMcpServerTrustOptions {
|
|
35
46
|
type: 'streamableHttp' | 'http';
|
|
36
47
|
url: string | URL;
|
|
37
48
|
transportOptions?: plugins.StreamableHTTPClientTransportOptions;
|
|
38
49
|
}
|
|
39
50
|
|
|
40
|
-
export interface IMcpTransportServerConfig extends IMcpServerClientOptions {
|
|
51
|
+
export interface IMcpTransportServerConfig extends IMcpServerClientOptions, IMcpServerTrustOptions {
|
|
41
52
|
type: 'transport';
|
|
42
53
|
transport: plugins.Transport;
|
|
43
54
|
}
|
|
44
55
|
|
|
45
|
-
export interface IMcpClientServerConfig {
|
|
56
|
+
export interface IMcpClientServerConfig extends IMcpServerTrustOptions {
|
|
46
57
|
type: 'client';
|
|
47
58
|
client: IMcpClientLike;
|
|
48
59
|
}
|
|
@@ -86,6 +97,8 @@ export interface IMcpConnectedServer {
|
|
|
86
97
|
name: string;
|
|
87
98
|
client: IMcpClientLike;
|
|
88
99
|
tools: TMcpToolMetadata[];
|
|
100
|
+
/** Whether its configuration trusts the server's `readOnlyHint` annotations. */
|
|
101
|
+
trustReadOnlyHints: boolean;
|
|
89
102
|
}
|
|
90
103
|
|
|
91
104
|
export interface IMcpToolNameMapping {
|
|
@@ -97,6 +110,12 @@ export interface ICreateMcpToolsResult {
|
|
|
97
110
|
tools: plugins.ToolSet;
|
|
98
111
|
servers: IMcpConnectedServer[];
|
|
99
112
|
toolNameMap: Record<string, IMcpToolNameMapping>;
|
|
113
|
+
/**
|
|
114
|
+
* Whether a call of `tools` only reads: its server's configuration trusts `readOnlyHint`, and the
|
|
115
|
+
* server annotates the tool `readOnlyHint: true`. Every other call is not read-only. Pass it as the
|
|
116
|
+
* tool handle's `isReadOnlyToolCall`, or ask it from that classifier.
|
|
117
|
+
*/
|
|
118
|
+
isReadOnlyToolCall: (call: { toolName: string }) => boolean;
|
|
100
119
|
close: () => Promise<void>;
|
|
101
120
|
}
|
|
102
121
|
|
|
@@ -113,7 +132,12 @@ export const createMcpTools = async (
|
|
|
113
132
|
try {
|
|
114
133
|
for (const [serverName, config] of serverEntries) {
|
|
115
134
|
const client = await connectMcpServer(serverName, config, options);
|
|
116
|
-
const connectedServer: IMcpConnectedServer = {
|
|
135
|
+
const connectedServer: IMcpConnectedServer = {
|
|
136
|
+
name: serverName,
|
|
137
|
+
client,
|
|
138
|
+
tools: [],
|
|
139
|
+
trustReadOnlyHints: config.trustReadOnlyHints === true,
|
|
140
|
+
};
|
|
117
141
|
connectedServers.push(connectedServer);
|
|
118
142
|
connectedServer.tools = await listAllMcpTools(
|
|
119
143
|
client,
|
|
@@ -124,6 +148,7 @@ export const createMcpTools = async (
|
|
|
124
148
|
|
|
125
149
|
const exposedTools: plugins.ToolSet = {};
|
|
126
150
|
const toolNameMap: Record<string, IMcpToolNameMapping> = {};
|
|
151
|
+
const readOnlyToolNames = new Set<string>();
|
|
127
152
|
const shouldPrefixToolNames = options.prefixToolNames ?? connectedServers.length > 1;
|
|
128
153
|
|
|
129
154
|
for (const { server, tool: mcpTool, exposedToolName } of nameMcpTools(connectedServers, shouldPrefixToolNames)) {
|
|
@@ -131,6 +156,9 @@ export const createMcpTools = async (
|
|
|
131
156
|
serverName: server.name,
|
|
132
157
|
toolName: mcpTool.name,
|
|
133
158
|
};
|
|
159
|
+
if (server.trustReadOnlyHints && mcpTool.annotations?.readOnlyHint === true) {
|
|
160
|
+
readOnlyToolNames.add(exposedToolName);
|
|
161
|
+
}
|
|
134
162
|
|
|
135
163
|
exposedTools[exposedToolName] = plugins.tool({
|
|
136
164
|
description: mcpTool.description ?? `MCP tool ${mcpTool.name} from ${server.name}`,
|
|
@@ -154,6 +182,7 @@ export const createMcpTools = async (
|
|
|
154
182
|
tools: exposedTools,
|
|
155
183
|
servers: connectedServers,
|
|
156
184
|
toolNameMap,
|
|
185
|
+
isReadOnlyToolCall: ({ toolName }) => readOnlyToolNames.has(toolName),
|
|
157
186
|
close: async () => closeMcpClients(connectedServers),
|
|
158
187
|
};
|
|
159
188
|
} catch (error) {
|
|
@@ -165,8 +194,11 @@ export const createMcpTools = async (
|
|
|
165
194
|
}
|
|
166
195
|
};
|
|
167
196
|
|
|
168
|
-
/**
|
|
169
|
-
|
|
197
|
+
/**
|
|
198
|
+
* The tools one MCP server lists, as `listTools` answered them, and whether its configuration trusts
|
|
199
|
+
* their `readOnlyHint` annotations. `IMcpConnectedServer` is one.
|
|
200
|
+
*/
|
|
201
|
+
export interface IMcpToolCatalogServer extends IMcpServerTrustOptions {
|
|
170
202
|
name: string;
|
|
171
203
|
tools: readonly TMcpToolMetadata[];
|
|
172
204
|
}
|
|
@@ -204,9 +236,11 @@ export interface ICreateMcpToolCatalogOptions<TScope = unknown> {
|
|
|
204
236
|
*/
|
|
205
237
|
authorizeToolCall?: (context: IMcpToolCatalogAuthorizeToolCallContext<TScope>) => PromiseLike<void> | void;
|
|
206
238
|
/**
|
|
207
|
-
* Declares a tool's method read-only
|
|
208
|
-
*
|
|
209
|
-
*
|
|
239
|
+
* Declares a tool's method read-only, beside the tools a server that trusts its annotations
|
|
240
|
+
* (`trustReadOnlyHints`) annotates `readOnlyHint: true`: its calls run concurrently with other
|
|
241
|
+
* reads and a turn answers identical ones once. Each still passes `authorizeToolCall`; when that
|
|
242
|
+
* asks for permission, the requests of concurrent reads are pending together. Omission declares
|
|
243
|
+
* no further ones.
|
|
210
244
|
*/
|
|
211
245
|
isReadOnly?: (context: IMcpToolCatalogToolContext) => boolean;
|
|
212
246
|
}
|
|
@@ -250,12 +284,14 @@ export const createMcpToolCatalog = <TScope = unknown>(
|
|
|
250
284
|
const text = mcpTool.description?.trim() || `MCP tool ${mcpTool.name} from ${server.name}`;
|
|
251
285
|
const summary = summaryOf(text);
|
|
252
286
|
const description = text === summary ? undefined : truncateUtf8(text, plugins.FLEX_TOOL_CATALOG_LIMITS.maxDescriptionBytes);
|
|
287
|
+
const readOnly = (server.trustReadOnlyHints === true && mcpTool.annotations?.readOnlyHint === true)
|
|
288
|
+
|| options.isReadOnly?.(toolContext) === true;
|
|
253
289
|
methods.push({
|
|
254
290
|
method: path,
|
|
255
291
|
summary,
|
|
256
292
|
...(description ? { description } : {}),
|
|
257
293
|
inputSchema: mcpTool.inputSchema,
|
|
258
|
-
...(
|
|
294
|
+
...(readOnly ? { readOnly: true } : {}),
|
|
259
295
|
run: (params, call) => callMcpTool({
|
|
260
296
|
serverName: server.name,
|
|
261
297
|
toolName: mcpTool.name,
|
|
@@ -359,7 +395,15 @@ const createMcpTransport = (
|
|
|
359
395
|
config: Exclude<TMcpServerConfig, IMcpClientServerConfig>,
|
|
360
396
|
): plugins.Transport => {
|
|
361
397
|
if (config.type === 'stdio') {
|
|
362
|
-
const {
|
|
398
|
+
const {
|
|
399
|
+
type,
|
|
400
|
+
clientName,
|
|
401
|
+
clientVersion,
|
|
402
|
+
clientOptions,
|
|
403
|
+
requestOptions,
|
|
404
|
+
trustReadOnlyHints,
|
|
405
|
+
...serverParameters
|
|
406
|
+
} = config;
|
|
363
407
|
return new plugins.StdioClientTransport(serverParameters);
|
|
364
408
|
}
|
|
365
409
|
|
package/ts_mcp/readme.md
CHANGED
|
@@ -9,11 +9,16 @@ pnpm add @modelprofile.com/flexharness @modelcontextprotocol/sdk
|
|
|
9
9
|
```
|
|
10
10
|
|
|
11
11
|
`createMcpTools()` connects MCP servers and exposes their tools as AI SDK tools.
|
|
12
|
+
Its `isReadOnlyToolCall` is the tool handle's classifier for them: a call is read-only when the
|
|
13
|
+
server annotates its tool `readOnlyHint: true` and the server's configuration sets
|
|
14
|
+
`trustReadOnlyHints: true`, so those reads run concurrently. No server's annotations are trusted
|
|
15
|
+
by default; `servers` carries each server's `trustReadOnlyHints`.
|
|
12
16
|
`createMcpToolCatalog()` makes the tools servers list into a FlexHarness tool catalog
|
|
13
17
|
(`search_tools`, `describe_tools`, `execute`, `run_code`): one catalog object for every
|
|
14
18
|
run, each call on the client `resolveClient` names for its run, method paths equal to
|
|
15
19
|
`createMcpTools()`' tool names, `authorizeToolCall` deciding catalog calls as it decides
|
|
16
|
-
tool calls, and read-only methods
|
|
20
|
+
tool calls, and read-only methods where a server whose entry sets `trustReadOnlyHints: true`
|
|
21
|
+
annotates its tool `readOnlyHint: true` or where `isReadOnly` declares them. The root readme's
|
|
17
22
|
Tool Catalog section shows a tool provider that connects clients per run.
|
|
18
23
|
|
|
19
24
|
See the [toolbox usage and migration guide](https://code.foss.global/modelprofile.com/flexharness#readme)
|
package/ts_tools/index.ts
CHANGED
|
@@ -9,7 +9,7 @@ export type {
|
|
|
9
9
|
IToolExecutionContextLease,
|
|
10
10
|
} from './plugins.js';
|
|
11
11
|
export type { ICreateBrowserToolsOptions } from './tool.browser.js';
|
|
12
|
-
export { createFilesystemTools } from './tool.filesystem.js';
|
|
12
|
+
export { createFilesystemTools, isReadOnlyFilesystemToolCall } from './tool.filesystem.js';
|
|
13
13
|
export type { ICreateFilesystemToolsOptions } from './tool.filesystem.js';
|
|
14
14
|
export { createShellTools } from './tool.shell.js';
|
|
15
15
|
export type { ICreateShellToolsOptions } from './tool.shell.js';
|
package/ts_tools/readme.md
CHANGED
|
@@ -15,6 +15,8 @@ for composition examples and the SmartAI/SmartAgent migration map.
|
|
|
15
15
|
|
|
16
16
|
`createFilesystemTools(context, options)` exposes `read_file`, `write_file`, `list_directory` and, unless `includeDelete: false`, `delete_file` over the context's `fs`. `write_file` and `delete_file` ask `context.requestPermission` (`write`, `delete`) before they change anything.
|
|
17
17
|
|
|
18
|
+
`isReadOnlyFilesystemToolCall({ toolName })` is true for `read_file` and `list_directory`, which change nothing and ask for no permission. Pass it as the FlexHarness tool handle's `isReadOnlyToolCall`, or ask it from that classifier, and their calls run concurrently; leave it out for a context whose `fs.readFile` or `fs.listDirectory` changes something or asks for permission.
|
|
19
|
+
|
|
18
20
|
`includeEdit: true` adds `edit_file { path, find, replace, replaceAll? }`. It replaces one exact occurrence of `find`, or every occurrence with `replaceAll`, and refuses a `find` that does not occur or, without `replaceAll`, occurs more than once. The replacement text is literal. It asks for `write` permission before it reads the file, so an edit made while the request waits is kept. It is off by default, so the tools an existing agent sees do not change.
|
|
19
21
|
|
|
20
22
|
```typescript
|
|
@@ -15,6 +15,18 @@ export interface ICreateFilesystemToolsOptions {
|
|
|
15
15
|
maxBytes?: number;
|
|
16
16
|
}
|
|
17
17
|
|
|
18
|
+
/** The tools of `createFilesystemTools()` that only read. */
|
|
19
|
+
const readOnlyFilesystemToolNames: ReadonlySet<string> = new Set(['read_file', 'list_directory']);
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* Whether a call of `createFilesystemTools()`' tools only reads: `read_file` and `list_directory`
|
|
23
|
+
* change nothing and ask for no permission. Pass it as the tool handle's `isReadOnlyToolCall`, or ask
|
|
24
|
+
* it from that classifier, when the context's `fs.readFile` and `fs.listDirectory` do neither either.
|
|
25
|
+
*/
|
|
26
|
+
export function isReadOnlyFilesystemToolCall(call: { toolName: string }): boolean {
|
|
27
|
+
return readOnlyFilesystemToolNames.has(call.toolName);
|
|
28
|
+
}
|
|
29
|
+
|
|
18
30
|
export function createFilesystemTools(context: IToolExecutionContext, options: ICreateFilesystemToolsOptions = {}): plugins.ToolSet {
|
|
19
31
|
const truncate = (output: unknown) => plugins.truncateOutput(formatToolOutput(output), {
|
|
20
32
|
maxLines: options.maxLines,
|