@geminixiang/mikan 1.0.0-beta.90 → 1.0.0-beta.92
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/CHANGELOG.md +13 -0
- package/dist/harness/mcp-result.d.ts.map +1 -1
- package/dist/harness/mcp-result.js +13 -2
- package/dist/harness/mcp-result.js.map +1 -1
- package/dist/harness/mcp.d.ts +2 -2
- package/dist/harness/mcp.d.ts.map +1 -1
- package/dist/harness/mcp.js +65 -13
- package/dist/harness/mcp.js.map +1 -1
- package/dist/harness/session.d.ts.map +1 -1
- package/dist/harness/session.js +11 -6
- package/dist/harness/session.js.map +1 -1
- package/dist/harness/tools/codemode.d.ts +2 -0
- package/dist/harness/tools/codemode.d.ts.map +1 -1
- package/dist/harness/tools/codemode.js +87 -24
- package/dist/harness/tools/codemode.js.map +1 -1
- package/dist/harness/tools/pi-tools.d.ts.map +1 -1
- package/dist/harness/tools/pi-tools.js +3 -1
- package/dist/harness/tools/pi-tools.js.map +1 -1
- package/dist/harness/tools/tool-search.d.ts +1 -0
- package/dist/harness/tools/tool-search.d.ts.map +1 -1
- package/dist/harness/tools/tool-search.js +80 -18
- package/dist/harness/tools/tool-search.js.map +1 -1
- package/dist/harness/types.d.ts +12 -6
- package/dist/harness/types.d.ts.map +1 -1
- package/dist/harness/types.js.map +1 -1
- package/dist/sessions/session-store.d.ts +2 -2
- package/dist/sessions/session-store.d.ts.map +1 -1
- package/dist/sessions/session-store.js +3 -4
- package/dist/sessions/session-store.js.map +1 -1
- package/dist/settings/index.d.ts.map +1 -1
- package/dist/settings/index.js +2 -0
- package/dist/settings/index.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -9,6 +9,19 @@ any release.
|
|
|
9
9
|
|
|
10
10
|
## [Unreleased]
|
|
11
11
|
|
|
12
|
+
## [1.0.0-beta.92]
|
|
13
|
+
|
|
14
|
+
### Changed
|
|
15
|
+
|
|
16
|
+
- Codemode guides the model to discover every tool a task needs in one script and to parse MCP results and emit only the fields the answer needs, because everything a script emits is sent again on every later model call. `searchTools()` and `tool_search` rank with BM25 over names, descriptions, argument schemas, and the MCP server name, splitting camelCase like Pi, so a query such as `OpenConnector` finds `mcp__open-connector__*` tools; the default limit is 8.
|
|
17
|
+
|
|
18
|
+
## [1.0.0-beta.91]
|
|
19
|
+
|
|
20
|
+
### Changed
|
|
21
|
+
|
|
22
|
+
- MCP follows Pi's codemode design. MCP tools are reached from `codemode` scripts by default and `tool_search` exists only for servers configured with `"exposure": "deferred"`. A script receives each MCP tool's complete `CallToolResult` (`content`, `structuredContent`, `isError`) instead of the bounded view the model gets, so it can filter large results before they enter the context, and an MCP error resolves with `isError: true` instead of rejecting. The `codemode` description no longer repeats the declarations of tools already declared to the model; each of those tools' descriptions says what a script call resolves to. Server instructions are no longer copied into the system prompt: an `mcp_servers` section lists each server once with the first line of its new optional `description` or its instructions, and scripts read the rest with the new `describeNamespace()`. On a local request these changes cut the tool declarations from 38,274 to 26,538 characters and the codemode description from 14,232 to 2,803.
|
|
23
|
+
- A direct MCP call that the server marks `isError` returns an error result instead of throwing, keeping the server's message.
|
|
24
|
+
|
|
12
25
|
## [1.0.0-beta.90]
|
|
13
26
|
|
|
14
27
|
### Changed
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-result.d.ts","sourceRoot":"","sources":["../../src/harness/mcp-result.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"mcp-result.d.ts","sourceRoot":"","sources":["../../src/harness/mcp-result.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAa,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAIlD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC;CACf;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAmED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,aAAa,GAAG,CAAC,WAAW,GAAG,YAAY,CAAC,EAAE,CAStF;AAiED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,cAAc,CAahF;AAuDD,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,aAAa,EACrB,GAAG,EAAE,YAAY,GAAG,SAAS,EAC7B,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,eAAe,CAAC,CAsB1B"}
|
|
@@ -172,22 +172,33 @@ function truncationNotice(bounded, totalBytes, spillPath) {
|
|
|
172
172
|
: "The full result could not be saved";
|
|
173
173
|
return `[MCP result truncated: showing ${view}. ${full}, or re-query with filters or smaller pages.]`;
|
|
174
174
|
}
|
|
175
|
+
function scriptResult(result) {
|
|
176
|
+
const copy = JSON.parse(JSON.stringify({
|
|
177
|
+
content: Array.isArray(result.content) ? result.content : [],
|
|
178
|
+
structuredContent: result.structuredContent ?? undefined,
|
|
179
|
+
isError: result.isError === true ? true : undefined,
|
|
180
|
+
}));
|
|
181
|
+
return copy;
|
|
182
|
+
}
|
|
175
183
|
export async function guardMcpToolResult(result, env, context) {
|
|
184
|
+
const structuredContent = scriptResult(result);
|
|
176
185
|
const blocks = mcpResultContent(result).map((block) => block.type === "text" ? Object.assign(block, { text: compactMcpText(block.text) }) : block);
|
|
177
186
|
const texts = blocks.filter((block) => block.type === "text");
|
|
178
187
|
const images = blocks.filter((block) => block.type === "image");
|
|
179
188
|
const combined = texts.map((block) => block.text).join("\n");
|
|
180
189
|
if (result.isError) {
|
|
181
|
-
|
|
190
|
+
const text = boundMcpText(combined, RESULT_LIMITS).text || "MCP tool call failed";
|
|
191
|
+
return { content: [{ type: "text", text }], isError: true, structuredContent };
|
|
182
192
|
}
|
|
183
193
|
if (fits(combined, RESULT_LIMITS))
|
|
184
|
-
return { content: blocks, details: undefined };
|
|
194
|
+
return { content: blocks, details: undefined, structuredContent };
|
|
185
195
|
const bounded = boundMcpText(combined, RESULT_LIMITS);
|
|
186
196
|
const spillPath = await spillFullResult(env, combined, context);
|
|
187
197
|
const notice = truncationNotice(bounded, Buffer.byteLength(combined, "utf8"), spillPath);
|
|
188
198
|
return {
|
|
189
199
|
content: [{ type: "text", text: `${bounded.text}\n\n${notice}` }, ...images],
|
|
190
200
|
details: undefined,
|
|
201
|
+
structuredContent,
|
|
191
202
|
};
|
|
192
203
|
}
|
|
193
204
|
//# sourceMappingURL=mcp-result.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-result.js","sourceRoot":"","sources":["../../src/harness/mcp-result.ts"],"names":[],"mappings":"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","sourcesContent":["import { randomBytes } from \"node:crypto\";\nimport type { ImageContent, TextContent } from \"@earendil-works/pi-ai\";\nimport type { Context } from \"@earendil-works/chord\";\nimport type { ExecutionEnv } from \"@earendil-works/pi-durable/env\";\nimport type { MikanToolResult } from \"./types.js\";\nimport { redactSecrets } from \"./tools/secret-redaction.js\";\nimport { isRecord } from \"../unknown-values.js\";\n\nexport interface McpTextLimits {\n maxBytes: number;\n maxLines: number;\n}\n\nexport interface BoundedMcpText {\n text: string;\n digest?: true;\n}\n\nexport interface McpCallResult {\n content?: unknown;\n structuredContent?: unknown;\n isError?: boolean;\n}\n\nconst SPILL_DIR = [\".mikan\", \"mcp-output\"];\nconst NOTICE_RESERVE_BYTES = 640;\nconst NOTICE_RESERVE_LINES = 4;\nconst TOOL_OUTPUT_MAX_BYTES = 50 * 1024;\nconst TOOL_OUTPUT_MAX_LINES = 2000;\nconst RESULT_LIMITS: McpTextLimits = {\n maxBytes: TOOL_OUTPUT_MAX_BYTES - NOTICE_RESERVE_BYTES,\n maxLines: TOOL_OUTPUT_MAX_LINES - NOTICE_RESERVE_LINES,\n};\n\ninterface DigestLevel {\n stringChars: number;\n arrayItems: number;\n depth: number;\n}\n\nconst DIGEST_LEVELS: readonly DigestLevel[] = [\n { stringChars: 200, arrayItems: 3, depth: 6 },\n { stringChars: 80, arrayItems: 2, depth: 4 },\n { stringChars: 40, arrayItems: 1, depth: 3 },\n { stringChars: 16, arrayItems: 1, depth: 2 },\n];\n\ntype RawBlock = Record<string, unknown>;\n\nfunction isRawBlock(value: unknown): value is RawBlock {\n return isRecord(value);\n}\n\nfunction stringField(block: RawBlock, key: string): string | undefined {\n const value = block[key];\n return typeof value === \"string\" ? value : undefined;\n}\n\nfunction describeResource(resource: RawBlock): string {\n const uri = stringField(resource, \"uri\") ?? \"(no URI)\";\n const text = stringField(resource, \"text\");\n if (text !== undefined) return `[Resource: ${uri}]\\n${text}`;\n const blob = stringField(resource, \"blob\");\n const mimeType = stringField(resource, \"mimeType\") ?? \"unknown type\";\n const size = blob === undefined ? \"no content\" : `${Buffer.byteLength(blob, \"base64\")} bytes`;\n return `[Resource: ${uri} (${mimeType}, ${size}, binary content omitted)]`;\n}\n\nfunction blockContent(block: RawBlock): TextContent | ImageContent {\n const text = stringField(block, \"text\");\n if (block.type === \"text\" && text !== undefined) return { type: \"text\", text };\n const data = stringField(block, \"data\");\n const mimeType = stringField(block, \"mimeType\");\n if (block.type === \"image\" && data !== undefined && mimeType !== undefined) {\n return { type: \"image\", data, mimeType };\n }\n if (block.type === \"resource\" && isRawBlock(block.resource)) {\n return { type: \"text\", text: describeResource(block.resource) };\n }\n if (block.type === \"resource_link\") {\n const uri = stringField(block, \"uri\") ?? \"(no URI)\";\n return { type: \"text\", text: `[Resource link: ${stringField(block, \"name\") ?? uri}] ${uri}` };\n }\n if (block.type === \"audio\") {\n return { type: \"text\", text: `[Audio content omitted: ${mimeType ?? \"audio/*\"}]` };\n }\n return { type: \"text\", text: JSON.stringify(block) };\n}\n\nexport function mcpResultContent(result: McpCallResult): (TextContent | ImageContent)[] {\n const blocks = (Array.isArray(result.content) ? result.content : [])\n .filter(isRawBlock)\n .map(blockContent);\n if (blocks.length > 0) return blocks;\n if (result.structuredContent !== undefined && result.structuredContent !== null) {\n return [{ type: \"text\", text: JSON.stringify(result.structuredContent) }];\n }\n return [{ type: \"text\", text: \"(empty result)\" }];\n}\n\nfunction parseJson(text: string): { value: unknown } | undefined {\n const trimmed = text.trimStart();\n if (!trimmed.startsWith(\"{\") && !trimmed.startsWith(\"[\")) return undefined;\n try {\n return { value: JSON.parse(text) };\n } catch {\n return undefined;\n }\n}\n\nfunction digest(value: unknown, level: DigestLevel, depth = 0): unknown {\n if (typeof value === \"string\") {\n return value.length <= level.stringChars\n ? value\n : `${value.slice(0, level.stringChars)}…[+${value.length - level.stringChars} chars]`;\n }\n if (Array.isArray(value)) {\n if (depth >= level.depth) return `[…${value.length} items]`;\n const kept = value.slice(0, level.arrayItems).map((item) => digest(item, level, depth + 1));\n const hidden = value.length - kept.length;\n return hidden > 0 ? [...kept, `…[+${hidden} more items]`] : kept;\n }\n if (isRawBlock(value)) {\n if (depth >= level.depth) return `{…${Object.keys(value).length} keys}`;\n return Object.fromEntries(\n Object.entries(value).map(([key, item]) => [key, digest(item, level, depth + 1)]),\n );\n }\n return value;\n}\n\nfunction fits(text: string, limits: McpTextLimits): boolean {\n return (\n Buffer.byteLength(text, \"utf8\") <= limits.maxBytes && text.split(\"\\n\").length <= limits.maxLines\n );\n}\n\nfunction sliceToBytes(text: string, maxBytes: number): string {\n const buffer = Buffer.from(text, \"utf8\");\n if (buffer.length <= maxBytes) return text;\n let end = Math.max(0, maxBytes);\n while (end > 0 && (buffer[end]! & 0xc0) === 0x80) end--;\n return buffer.subarray(0, end).toString(\"utf8\");\n}\n\nfunction headTruncate(text: string, limits: McpTextLimits): string {\n const kept: string[] = [];\n let bytes = 0;\n for (const line of text.split(\"\\n\").slice(0, limits.maxLines)) {\n const lineBytes = Buffer.byteLength(line, \"utf8\") + (kept.length > 0 ? 1 : 0);\n if (bytes + lineBytes > limits.maxBytes) break;\n kept.push(line);\n bytes += lineBytes;\n }\n return kept.length === 0 ? sliceToBytes(text, limits.maxBytes) : kept.join(\"\\n\");\n}\n\nfunction formatSize(bytes: number): string {\n if (bytes < 1024) return `${bytes}B`;\n if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}KB`;\n return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;\n}\n\nexport function boundMcpText(text: string, limits: McpTextLimits): BoundedMcpText {\n const parsed = parseJson(text);\n if (!parsed) {\n return fits(text, limits) ? { text } : { text: headTruncate(text, limits) };\n }\n const compact = JSON.stringify(parsed.value);\n if (fits(compact, limits)) return { text: compact };\n for (const level of DIGEST_LEVELS) {\n const digested = JSON.stringify(digest(parsed.value, level));\n if (fits(digested, limits)) return { text: digested, digest: true };\n }\n const smallest = JSON.stringify(digest(parsed.value, DIGEST_LEVELS.at(-1)!));\n return { text: sliceToBytes(smallest, limits.maxBytes), digest: true };\n}\n\nfunction compactMcpText(text: string): string {\n const parsed = parseJson(text);\n return parsed ? JSON.stringify(parsed.value) : text;\n}\n\nfunction readableSpill(text: string): { text: string; extension: \"json\" | \"txt\" } {\n const parsed = parseJson(text);\n return parsed\n ? { text: JSON.stringify(parsed.value, null, 2), extension: \"json\" }\n : { text, extension: \"txt\" };\n}\n\nasync function spillFullResult(\n env: ExecutionEnv | undefined,\n result: string,\n context: Context,\n): Promise<string | undefined> {\n if (!env) return undefined;\n const { text, extension } = readableSpill(result);\n const path = await env.joinPath(\n [env.cwd, ...SPILL_DIR, `${randomBytes(8).toString(\"hex\")}.${extension}`],\n context,\n );\n if (!path.ok) return undefined;\n const written = await env.writeFile(path.value, redactSecrets(text), context);\n return written.ok ? path.value : undefined;\n}\n\nfunction truncationNotice(\n bounded: BoundedMcpText,\n totalBytes: number,\n spillPath: string | undefined,\n): string {\n const view = bounded.digest\n ? `an abbreviated view of ${formatSize(totalBytes)}: long strings, arrays, and deep nesting are shortened; keys, counts, and pagination fields are kept`\n : `the beginning of ${formatSize(totalBytes)}`;\n const full = spillPath\n ? `Full result: ${spillPath} — use read with offset/limit or grep to inspect it`\n : \"The full result could not be saved\";\n return `[MCP result truncated: showing ${view}. ${full}, or re-query with filters or smaller pages.]`;\n}\n\nexport async function guardMcpToolResult(\n result: McpCallResult,\n env: ExecutionEnv | undefined,\n context: Context,\n): Promise<MikanToolResult> {\n const blocks = mcpResultContent(result).map((block) =>\n block.type === \"text\" ? Object.assign(block, { text: compactMcpText(block.text) }) : block,\n );\n const texts = blocks.filter((block): block is TextContent => block.type === \"text\");\n const images = blocks.filter((block): block is ImageContent => block.type === \"image\");\n const combined = texts.map((block) => block.text).join(\"\\n\");\n if (result.isError) {\n throw new Error(boundMcpText(combined, RESULT_LIMITS).text || \"MCP tool call failed\");\n }\n if (fits(combined, RESULT_LIMITS)) return { content: blocks, details: undefined };\n const bounded = boundMcpText(combined, RESULT_LIMITS);\n const spillPath = await spillFullResult(env, combined, context);\n const notice = truncationNotice(bounded, Buffer.byteLength(combined, \"utf8\"), spillPath);\n return {\n content: [{ type: \"text\", text: `${bounded.text}\\n\\n${notice}` }, ...images],\n details: undefined,\n };\n}\n"]}
|
|
1
|
+
{"version":3,"file":"mcp-result.js","sourceRoot":"","sources":["../../src/harness/mcp-result.ts"],"names":[],"mappings":"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","sourcesContent":["import { randomBytes } from \"node:crypto\";\nimport type { ImageContent, JsonValue, TextContent } from \"@earendil-works/pi-ai\";\nimport type { Context } from \"@earendil-works/chord\";\nimport type { ExecutionEnv } from \"@earendil-works/pi-durable/env\";\nimport type { MikanToolResult } from \"./types.js\";\nimport { redactSecrets } from \"./tools/secret-redaction.js\";\nimport { isRecord } from \"../unknown-values.js\";\n\nexport interface McpTextLimits {\n maxBytes: number;\n maxLines: number;\n}\n\nexport interface BoundedMcpText {\n text: string;\n digest?: true;\n}\n\nexport interface McpCallResult {\n content?: unknown;\n structuredContent?: unknown;\n isError?: boolean;\n}\n\nconst SPILL_DIR = [\".mikan\", \"mcp-output\"];\nconst NOTICE_RESERVE_BYTES = 640;\nconst NOTICE_RESERVE_LINES = 4;\nconst TOOL_OUTPUT_MAX_BYTES = 50 * 1024;\nconst TOOL_OUTPUT_MAX_LINES = 2000;\nconst RESULT_LIMITS: McpTextLimits = {\n maxBytes: TOOL_OUTPUT_MAX_BYTES - NOTICE_RESERVE_BYTES,\n maxLines: TOOL_OUTPUT_MAX_LINES - NOTICE_RESERVE_LINES,\n};\n\ninterface DigestLevel {\n stringChars: number;\n arrayItems: number;\n depth: number;\n}\n\nconst DIGEST_LEVELS: readonly DigestLevel[] = [\n { stringChars: 200, arrayItems: 3, depth: 6 },\n { stringChars: 80, arrayItems: 2, depth: 4 },\n { stringChars: 40, arrayItems: 1, depth: 3 },\n { stringChars: 16, arrayItems: 1, depth: 2 },\n];\n\ntype RawBlock = Record<string, unknown>;\n\nfunction isRawBlock(value: unknown): value is RawBlock {\n return isRecord(value);\n}\n\nfunction stringField(block: RawBlock, key: string): string | undefined {\n const value = block[key];\n return typeof value === \"string\" ? value : undefined;\n}\n\nfunction describeResource(resource: RawBlock): string {\n const uri = stringField(resource, \"uri\") ?? \"(no URI)\";\n const text = stringField(resource, \"text\");\n if (text !== undefined) return `[Resource: ${uri}]\\n${text}`;\n const blob = stringField(resource, \"blob\");\n const mimeType = stringField(resource, \"mimeType\") ?? \"unknown type\";\n const size = blob === undefined ? \"no content\" : `${Buffer.byteLength(blob, \"base64\")} bytes`;\n return `[Resource: ${uri} (${mimeType}, ${size}, binary content omitted)]`;\n}\n\nfunction blockContent(block: RawBlock): TextContent | ImageContent {\n const text = stringField(block, \"text\");\n if (block.type === \"text\" && text !== undefined) return { type: \"text\", text };\n const data = stringField(block, \"data\");\n const mimeType = stringField(block, \"mimeType\");\n if (block.type === \"image\" && data !== undefined && mimeType !== undefined) {\n return { type: \"image\", data, mimeType };\n }\n if (block.type === \"resource\" && isRawBlock(block.resource)) {\n return { type: \"text\", text: describeResource(block.resource) };\n }\n if (block.type === \"resource_link\") {\n const uri = stringField(block, \"uri\") ?? \"(no URI)\";\n return { type: \"text\", text: `[Resource link: ${stringField(block, \"name\") ?? uri}] ${uri}` };\n }\n if (block.type === \"audio\") {\n return { type: \"text\", text: `[Audio content omitted: ${mimeType ?? \"audio/*\"}]` };\n }\n return { type: \"text\", text: JSON.stringify(block) };\n}\n\nexport function mcpResultContent(result: McpCallResult): (TextContent | ImageContent)[] {\n const blocks = (Array.isArray(result.content) ? result.content : [])\n .filter(isRawBlock)\n .map(blockContent);\n if (blocks.length > 0) return blocks;\n if (result.structuredContent !== undefined && result.structuredContent !== null) {\n return [{ type: \"text\", text: JSON.stringify(result.structuredContent) }];\n }\n return [{ type: \"text\", text: \"(empty result)\" }];\n}\n\nfunction parseJson(text: string): { value: unknown } | undefined {\n const trimmed = text.trimStart();\n if (!trimmed.startsWith(\"{\") && !trimmed.startsWith(\"[\")) return undefined;\n try {\n return { value: JSON.parse(text) };\n } catch {\n return undefined;\n }\n}\n\nfunction digest(value: unknown, level: DigestLevel, depth = 0): unknown {\n if (typeof value === \"string\") {\n return value.length <= level.stringChars\n ? value\n : `${value.slice(0, level.stringChars)}…[+${value.length - level.stringChars} chars]`;\n }\n if (Array.isArray(value)) {\n if (depth >= level.depth) return `[…${value.length} items]`;\n const kept = value.slice(0, level.arrayItems).map((item) => digest(item, level, depth + 1));\n const hidden = value.length - kept.length;\n return hidden > 0 ? [...kept, `…[+${hidden} more items]`] : kept;\n }\n if (isRawBlock(value)) {\n if (depth >= level.depth) return `{…${Object.keys(value).length} keys}`;\n return Object.fromEntries(\n Object.entries(value).map(([key, item]) => [key, digest(item, level, depth + 1)]),\n );\n }\n return value;\n}\n\nfunction fits(text: string, limits: McpTextLimits): boolean {\n return (\n Buffer.byteLength(text, \"utf8\") <= limits.maxBytes && text.split(\"\\n\").length <= limits.maxLines\n );\n}\n\nfunction sliceToBytes(text: string, maxBytes: number): string {\n const buffer = Buffer.from(text, \"utf8\");\n if (buffer.length <= maxBytes) return text;\n let end = Math.max(0, maxBytes);\n while (end > 0 && (buffer[end]! & 0xc0) === 0x80) end--;\n return buffer.subarray(0, end).toString(\"utf8\");\n}\n\nfunction headTruncate(text: string, limits: McpTextLimits): string {\n const kept: string[] = [];\n let bytes = 0;\n for (const line of text.split(\"\\n\").slice(0, limits.maxLines)) {\n const lineBytes = Buffer.byteLength(line, \"utf8\") + (kept.length > 0 ? 1 : 0);\n if (bytes + lineBytes > limits.maxBytes) break;\n kept.push(line);\n bytes += lineBytes;\n }\n return kept.length === 0 ? sliceToBytes(text, limits.maxBytes) : kept.join(\"\\n\");\n}\n\nfunction formatSize(bytes: number): string {\n if (bytes < 1024) return `${bytes}B`;\n if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)}KB`;\n return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;\n}\n\nexport function boundMcpText(text: string, limits: McpTextLimits): BoundedMcpText {\n const parsed = parseJson(text);\n if (!parsed) {\n return fits(text, limits) ? { text } : { text: headTruncate(text, limits) };\n }\n const compact = JSON.stringify(parsed.value);\n if (fits(compact, limits)) return { text: compact };\n for (const level of DIGEST_LEVELS) {\n const digested = JSON.stringify(digest(parsed.value, level));\n if (fits(digested, limits)) return { text: digested, digest: true };\n }\n const smallest = JSON.stringify(digest(parsed.value, DIGEST_LEVELS.at(-1)!));\n return { text: sliceToBytes(smallest, limits.maxBytes), digest: true };\n}\n\nfunction compactMcpText(text: string): string {\n const parsed = parseJson(text);\n return parsed ? JSON.stringify(parsed.value) : text;\n}\n\nfunction readableSpill(text: string): { text: string; extension: \"json\" | \"txt\" } {\n const parsed = parseJson(text);\n return parsed\n ? { text: JSON.stringify(parsed.value, null, 2), extension: \"json\" }\n : { text, extension: \"txt\" };\n}\n\nasync function spillFullResult(\n env: ExecutionEnv | undefined,\n result: string,\n context: Context,\n): Promise<string | undefined> {\n if (!env) return undefined;\n const { text, extension } = readableSpill(result);\n const path = await env.joinPath(\n [env.cwd, ...SPILL_DIR, `${randomBytes(8).toString(\"hex\")}.${extension}`],\n context,\n );\n if (!path.ok) return undefined;\n const written = await env.writeFile(path.value, redactSecrets(text), context);\n return written.ok ? path.value : undefined;\n}\n\nfunction truncationNotice(\n bounded: BoundedMcpText,\n totalBytes: number,\n spillPath: string | undefined,\n): string {\n const view = bounded.digest\n ? `an abbreviated view of ${formatSize(totalBytes)}: long strings, arrays, and deep nesting are shortened; keys, counts, and pagination fields are kept`\n : `the beginning of ${formatSize(totalBytes)}`;\n const full = spillPath\n ? `Full result: ${spillPath} — use read with offset/limit or grep to inspect it`\n : \"The full result could not be saved\";\n return `[MCP result truncated: showing ${view}. ${full}, or re-query with filters or smaller pages.]`;\n}\n\nfunction scriptResult(result: McpCallResult): JsonValue {\n const copy: JsonValue = JSON.parse(\n JSON.stringify({\n content: Array.isArray(result.content) ? result.content : [],\n structuredContent: result.structuredContent ?? undefined,\n isError: result.isError === true ? true : undefined,\n }),\n );\n return copy;\n}\n\nexport async function guardMcpToolResult(\n result: McpCallResult,\n env: ExecutionEnv | undefined,\n context: Context,\n): Promise<MikanToolResult> {\n const structuredContent = scriptResult(result);\n const blocks = mcpResultContent(result).map((block) =>\n block.type === \"text\" ? Object.assign(block, { text: compactMcpText(block.text) }) : block,\n );\n const texts = blocks.filter((block): block is TextContent => block.type === \"text\");\n const images = blocks.filter((block): block is ImageContent => block.type === \"image\");\n const combined = texts.map((block) => block.text).join(\"\\n\");\n if (result.isError) {\n const text = boundMcpText(combined, RESULT_LIMITS).text || \"MCP tool call failed\";\n return { content: [{ type: \"text\", text }], isError: true, structuredContent };\n }\n if (fits(combined, RESULT_LIMITS))\n return { content: blocks, details: undefined, structuredContent };\n const bounded = boundMcpText(combined, RESULT_LIMITS);\n const spillPath = await spillFullResult(env, combined, context);\n const notice = truncationNotice(bounded, Buffer.byteLength(combined, \"utf8\"), spillPath);\n return {\n content: [{ type: \"text\", text: `${bounded.text}\\n\\n${notice}` }, ...images],\n details: undefined,\n structuredContent,\n };\n}\n"]}
|
package/dist/harness/mcp.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { McpPreset, McpServerConfig,
|
|
1
|
+
import type { McpPreset, McpServerConfig, McpServerSummary, McpToolsResult } from "./types.js";
|
|
2
2
|
export declare function isValidMcpServerName(name: string): boolean;
|
|
3
3
|
export type StandardMcpParseResult = {
|
|
4
4
|
servers: Record<string, McpServerConfig>;
|
|
@@ -12,6 +12,6 @@ export declare function redactMcpUrl(url: string): string;
|
|
|
12
12
|
export declare function listMcpPresets(): readonly McpPreset[];
|
|
13
13
|
export declare function findMcpPreset(id: string): McpPreset | undefined;
|
|
14
14
|
export declare function materializeMcpPreset(preset: McpPreset, values: Record<string, string>): McpServerConfig;
|
|
15
|
-
export declare function
|
|
15
|
+
export declare function renderMcpServersSection(servers: readonly McpServerSummary[]): string;
|
|
16
16
|
export declare function loadMcpTools(servers: Record<string, McpServerConfig>, signal?: AbortSignal): Promise<McpToolsResult>;
|
|
17
17
|
//# sourceMappingURL=mcp.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/harness/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../src/harness/mcp.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,SAAS,EACT,eAAe,EACf,gBAAgB,EAEhB,cAAc,EACf,MAAM,YAAY,CAAC;AAsBpB,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED,MAAM,MAAM,sBAAsB,GAC9B;IAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,GAC/D;IAAE,OAAO,CAAC,EAAE,SAAS,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE3C,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,sBAAsB,CA0C5E;AAMD,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAOhD;AAmCD,wBAAgB,cAAc,IAAI,SAAS,SAAS,EAAE,CAErD;AAED,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAE/D;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC7B,eAAe,CA2BjB;AA2JD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,SAAS,gBAAgB,EAAE,GAAG,MAAM,CA0BpF;AAED,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,EACxC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,cAAc,CAAC,CA+CzB"}
|
package/dist/harness/mcp.js
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { McpClient, McpHttpError, StdioTransport, StreamableHttpTransport, } from "@earendil-works/pi-mcp";
|
|
2
2
|
import { guardMcpToolResult } from "./mcp-result.js";
|
|
3
3
|
import { tagHarnessTool } from "./tools/pi-tools.js";
|
|
4
|
+
import { TOOL_SEARCH_TOOL } from "./tools/tool-search.js";
|
|
4
5
|
import { LABEL_PARAMETER } from "./tools/host-fn-tool.js";
|
|
6
|
+
import { Type } from "typebox";
|
|
5
7
|
import { readStandardEnv } from "../env-manifest.js";
|
|
6
8
|
import * as log from "../log.js";
|
|
7
9
|
import { errorMessage, isRecord } from "../unknown-values.js";
|
|
@@ -51,6 +53,8 @@ export function parseStandardMcpServers(text) {
|
|
|
51
53
|
url: hasUrl ? entry.url : undefined,
|
|
52
54
|
headers: isRecord(entry.headers) ? stringValues(entry.headers) : undefined,
|
|
53
55
|
disabled: entry.disabled === true ? true : undefined,
|
|
56
|
+
exposure: entry.exposure === "deferred" ? "deferred" : undefined,
|
|
57
|
+
description: typeof entry.description === "string" ? entry.description : undefined,
|
|
54
58
|
};
|
|
55
59
|
}
|
|
56
60
|
return { servers };
|
|
@@ -184,6 +188,7 @@ function buildTransport(name, config) {
|
|
|
184
188
|
throw new Error(`server "${name}" sets neither command nor url`);
|
|
185
189
|
}
|
|
186
190
|
async function connectServer(name, config, signal) {
|
|
191
|
+
const exposure = config.exposure ?? "codemode";
|
|
187
192
|
const client = new McpClient({
|
|
188
193
|
name: "mikan",
|
|
189
194
|
version: "1.0.0",
|
|
@@ -196,10 +201,11 @@ async function connectServer(name, config, signal) {
|
|
|
196
201
|
const ownsLabel = Object.hasOwn(schemaProperties(mcpTool.inputSchema), "label");
|
|
197
202
|
return tagHarnessTool({
|
|
198
203
|
name: `mcp__${name}__${mcpTool.name}`,
|
|
199
|
-
exposure
|
|
204
|
+
exposure,
|
|
200
205
|
namespace: name,
|
|
201
206
|
description: mcpTool.description ?? `${mcpTool.name} (MCP server "${name}")`,
|
|
202
207
|
parameters: ownsLabel ? mcpTool.inputSchema : withLabelParameter(mcpTool.inputSchema),
|
|
208
|
+
outputSchema: mcpResultSchema(mcpTool.outputSchema),
|
|
203
209
|
execute: async (params, api, context) => {
|
|
204
210
|
const result = await client.callTool(mcpTool.name, ownsLabel ? params : withoutLabel(params), { timeoutMs: CALL_TIMEOUT_MS, signal: context.abortSignal });
|
|
205
211
|
return guardMcpToolResult(result, api.env, context);
|
|
@@ -237,20 +243,62 @@ function withoutLabel(params) {
|
|
|
237
243
|
const { label: _label, ...rest } = params;
|
|
238
244
|
return rest;
|
|
239
245
|
}
|
|
240
|
-
|
|
241
|
-
|
|
246
|
+
function mcpResultSchema(structuredContent) {
|
|
247
|
+
return Type.Object({
|
|
248
|
+
content: Type.Array(Type.Object({})),
|
|
249
|
+
...(structuredContent
|
|
250
|
+
? { structuredContent: Type.Optional(Type.Unsafe(structuredContent)) }
|
|
251
|
+
: {}),
|
|
252
|
+
isError: Type.Optional(Type.Boolean()),
|
|
253
|
+
_meta: Type.Optional(Type.Object({})),
|
|
254
|
+
});
|
|
255
|
+
}
|
|
256
|
+
const MAX_SERVER_SUMMARY_CHARS = 250;
|
|
257
|
+
const MAX_SERVERS_SECTION_CHARS = 4096;
|
|
258
|
+
function serverReach(server) {
|
|
259
|
+
return server.exposure === "deferred" ? TOOL_SEARCH_TOOL : "codemode";
|
|
260
|
+
}
|
|
261
|
+
function serverSummary(server) {
|
|
262
|
+
const text = server.description?.trim() || server.instructions?.trim() || "";
|
|
263
|
+
return (text.split("\n", 1)[0] ?? "").trim();
|
|
264
|
+
}
|
|
265
|
+
function omittedServers(count) {
|
|
266
|
+
return count > 0 ? [`- … ${count} more servers; find their tools with searchTools()`] : [];
|
|
267
|
+
}
|
|
268
|
+
function truncateSummary(text, max) {
|
|
269
|
+
if (text.length <= max)
|
|
270
|
+
return text;
|
|
271
|
+
return max <= 1 ? "" : `${text.slice(0, max - 1).trimEnd()}…`;
|
|
272
|
+
}
|
|
273
|
+
export function renderMcpServersSection(servers) {
|
|
274
|
+
if (servers.length === 0)
|
|
242
275
|
return "";
|
|
243
|
-
const
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
276
|
+
const listed = servers.toSorted((a, b) => a.name.localeCompare(b.name));
|
|
277
|
+
const reaches = new Set(listed.map(serverReach));
|
|
278
|
+
let intro = "MCP servers whose tools are not declared to you.";
|
|
279
|
+
if (reaches.has("codemode"))
|
|
280
|
+
intro += " Call the tools of `codemode` servers from codemode scripts.";
|
|
281
|
+
if (reaches.has(TOOL_SEARCH_TOOL))
|
|
282
|
+
intro += " Load the tools of `tool_search` servers with `tool_search`.";
|
|
283
|
+
const heads = listed.map((server) => `- mcp__${server.name} (${serverReach(server)})`);
|
|
284
|
+
const size = (kept) => [intro, ...heads.slice(0, kept), ...omittedServers(listed.length - kept)].join("\n").length;
|
|
285
|
+
let kept = listed.length;
|
|
286
|
+
while (kept > 0 && size(kept) > MAX_SERVERS_SECTION_CHARS)
|
|
287
|
+
kept--;
|
|
288
|
+
const perServer = kept === 0
|
|
289
|
+
? 0
|
|
290
|
+
: Math.min(MAX_SERVER_SUMMARY_CHARS, Math.floor((MAX_SERVERS_SECTION_CHARS - size(kept)) / kept) - 2);
|
|
291
|
+
const lines = listed.slice(0, kept).map((server, index) => {
|
|
292
|
+
const summary = perServer > 0 ? truncateSummary(serverSummary(server), perServer) : "";
|
|
293
|
+
return summary ? `${heads[index]}: ${summary}` : heads[index];
|
|
294
|
+
});
|
|
295
|
+
return [intro, ...lines, ...omittedServers(listed.length - kept)].join("\n");
|
|
248
296
|
}
|
|
249
297
|
export async function loadMcpTools(servers, signal) {
|
|
250
298
|
const clients = [];
|
|
251
299
|
const tools = [];
|
|
252
300
|
const errors = [];
|
|
253
|
-
const
|
|
301
|
+
const summaries = [];
|
|
254
302
|
const entries = Object.entries(servers).filter(([, config]) => !config.disabled);
|
|
255
303
|
const results = await Promise.allSettled(entries.map(async ([name, config]) => {
|
|
256
304
|
if (!isValidMcpServerName(name)) {
|
|
@@ -266,14 +314,18 @@ export async function loadMcpTools(servers, signal) {
|
|
|
266
314
|
}
|
|
267
315
|
clients.push(result.value.client);
|
|
268
316
|
tools.push(...result.value.tools);
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
317
|
+
const config = entries[index][1];
|
|
318
|
+
summaries.push({
|
|
319
|
+
name,
|
|
320
|
+
exposure: config.exposure ?? "codemode",
|
|
321
|
+
description: config.description,
|
|
322
|
+
instructions: result.value.instructions,
|
|
323
|
+
});
|
|
272
324
|
}
|
|
273
325
|
return {
|
|
274
326
|
tools,
|
|
275
327
|
errors,
|
|
276
|
-
|
|
328
|
+
servers: summaries,
|
|
277
329
|
dispose: async () => {
|
|
278
330
|
const closes = await Promise.allSettled(clients.map((client) => client.close()));
|
|
279
331
|
for (const close of closes) {
|
package/dist/harness/mcp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/harness/mcp.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n McpPreset,\n McpServerConfig,\n McpLoadError,\n McpServerInstruction,\n McpToolsResult,\n} from \"./types.js\";\nimport {\n McpClient,\n McpHttpError,\n StdioTransport,\n StreamableHttpTransport,\n type McpTransport,\n type Tool as McpTool,\n} from \"@earendil-works/pi-mcp\";\nimport type { MikanHarnessTool } from \"./types.js\";\nimport { guardMcpToolResult } from \"./mcp-result.js\";\nimport { tagHarnessTool } from \"./tools/pi-tools.js\";\nimport { LABEL_PARAMETER } from \"./tools/host-fn-tool.js\";\n\nimport { readStandardEnv } from \"../env-manifest.js\";\nimport * as log from \"../log.js\";\nimport { errorMessage, isRecord } from \"../unknown-values.js\";\n\nconst SERVER_NAME_RE = /^[a-zA-Z][a-zA-Z0-9_-]{0,63}$/;\n\nexport function isValidMcpServerName(name: string): boolean {\n return SERVER_NAME_RE.test(name);\n}\n\nexport type StandardMcpParseResult =\n | { servers: Record<string, McpServerConfig>; error?: undefined }\n | { servers?: undefined; error: string };\n\nexport function parseStandardMcpServers(text: string): StandardMcpParseResult {\n let parsed: unknown;\n try {\n parsed = JSON.parse(text);\n } catch (err) {\n return { error: `not valid JSON: ${errorMessage(err)}` };\n }\n if (!isRecord(parsed)) return { error: \"expected a JSON object at the top level\" };\n const map = \"mcpServers\" in parsed ? parsed.mcpServers : parsed;\n if (!isRecord(map)) return { error: '\"mcpServers\" must be an object keyed by server name' };\n if (Object.keys(map).length === 0) return { error: \"no servers found in the pasted JSON\" };\n const servers: Record<string, McpServerConfig> = {};\n for (const [name, entry] of Object.entries(map)) {\n if (!isValidMcpServerName(name)) {\n return {\n error: `invalid server name \"${name}\" (letters, digits, '_' or '-', starting with a letter)`,\n };\n }\n if (!isRecord(entry)) return { error: `\"${name}\" must be an object` };\n const hasCommand = typeof entry.command === \"string\" && entry.command.trim() !== \"\";\n const hasUrl = typeof entry.url === \"string\";\n if (hasUrl && !URL.canParse(entry.url as string)) {\n return { error: `\"${name}\": url is not a valid URL` };\n }\n if (hasCommand === hasUrl) {\n const detail = hasCommand\n ? \"set only one of command / url\"\n : \"set either command (stdio) or url (HTTP)\";\n return { error: `\"${name}\": ${detail}` };\n }\n servers[name] = {\n command: hasCommand ? (entry.command as string) : undefined,\n args: Array.isArray(entry.args) ? entry.args.map(String) : undefined,\n env: isRecord(entry.env) ? stringValues(entry.env) : undefined,\n url: hasUrl ? (entry.url as string) : undefined,\n headers: isRecord(entry.headers) ? stringValues(entry.headers) : undefined,\n disabled: entry.disabled === true ? true : undefined,\n };\n }\n return { servers };\n}\n\nfunction stringValues(map: Record<string, unknown>): Record<string, string> {\n return Object.fromEntries(Object.entries(map).map(([k, v]) => [k, String(v)]));\n}\n\nexport function redactMcpUrl(url: string): string {\n if (!URL.canParse(url)) return url.replace(/([?&][^=&]+=)[^&]*/g, \"$1<redacted>\");\n const parsed = new URL(url);\n if (!parsed.search) return url;\n const keys = new Set(parsed.searchParams.keys());\n for (const key of keys) parsed.searchParams.set(key, \"<redacted>\");\n return parsed.toString().replace(/%3Credacted%3E/g, \"<redacted>\");\n}\n\nconst MCP_PRESETS: readonly McpPreset[] = [\n {\n id: \"metabase\",\n name: \"Metabase\",\n description: \"Query and explore analytics from your Metabase instance.\",\n category: \"Analytics\",\n serverName: \"metabase\",\n sourceUrl: \"https://github.com/metabase/metabase\",\n setupUrl: \"https://www.metabase.com/docs/latest/ai/mcp\",\n server: { url: \"https://{your-metabase.example.com}/api/metabase-mcp\" },\n credentials: [\n {\n key: \"url\",\n label: \"Metabase MCP server URL\",\n description:\n \"The full endpoint, for example https://metabase.example.com/api/metabase-mcp.\",\n target: \"url\",\n required: true,\n secret: false,\n },\n {\n key: \"x-api-key\",\n label: \"Metabase API key\",\n description:\n \"An API key whose Metabase permissions match the access you want mikan to have.\",\n target: \"header\",\n required: true,\n secret: true,\n },\n ],\n },\n];\n\nexport function listMcpPresets(): readonly McpPreset[] {\n return MCP_PRESETS;\n}\n\nexport function findMcpPreset(id: string): McpPreset | undefined {\n return MCP_PRESETS.find((preset) => preset.id === id);\n}\n\nexport function materializeMcpPreset(\n preset: McpPreset,\n values: Record<string, string>,\n): McpServerConfig {\n const env: Record<string, string> = {};\n const headers: Record<string, string> = {};\n let url = preset.server.url;\n for (const credential of preset.credentials) {\n const value = values[credential.key]?.trim() ?? \"\";\n if (!value) {\n if (credential.required) throw new Error(`${credential.label} is required`);\n continue;\n }\n const formatted = `${credential.valuePrefix ?? \"\"}${value}`;\n if (credential.target === \"env\") env[credential.key] = formatted;\n else if (credential.target === \"header\") headers[credential.key] = formatted;\n else {\n if (!URL.canParse(formatted) || !/^https?:/.test(new URL(formatted).protocol)) {\n throw new Error(`${credential.label} must be a valid HTTP URL`);\n }\n url = formatted;\n }\n }\n return {\n ...preset.server,\n args: preset.server.args ? [...preset.server.args] : undefined,\n url,\n ...(Object.keys(env).length > 0 ? { env } : {}),\n ...(Object.keys(headers).length > 0 ? { headers } : {}),\n };\n}\n\nconst CONNECT_TIMEOUT_MS = 15_000;\n\nconst CALL_TIMEOUT_MS = 120_000;\n\nconst INHERITED_ENV_KEYS = [\"HOME\", \"LOGNAME\", \"PATH\", \"SHELL\", \"TERM\", \"USER\"];\n\nfunction inheritedEnvironment(): Record<string, string> {\n return Object.fromEntries(\n INHERITED_ENV_KEYS.flatMap((key) => {\n const value = readStandardEnv(key);\n return value === undefined || value.startsWith(\"()\") ? [] : [[key, value]];\n }),\n );\n}\n\nconst ERROR_BODY_CHARS = 300;\n\nfunction describeLoadError(error: unknown): string {\n const message = errorMessage(error);\n if (!(error instanceof McpHttpError)) return message;\n const body = error.body.trim().slice(0, ERROR_BODY_CHARS);\n if (!body || message.includes(body.slice(0, 40))) return message;\n return `${message} (HTTP ${error.status}): ${body}`;\n}\n\nfunction untilAborted<T>(work: Promise<T>, signal?: AbortSignal): Promise<T> {\n if (!signal) return work;\n signal.throwIfAborted();\n return new Promise<T>((resolve, reject) => {\n const onAbort = () => reject(signal.reason);\n signal.addEventListener(\"abort\", onAbort, { once: true });\n work.then(resolve, reject).finally(() => signal.removeEventListener(\"abort\", onAbort));\n });\n}\n\nfunction buildTransport(name: string, config: McpServerConfig): McpTransport {\n if (config.command && config.url) {\n throw new Error(`server \"${name}\" sets both command and url; pick one transport`);\n }\n if (config.command) {\n return new StdioTransport({\n command: config.command,\n args: config.args ?? [],\n env: { ...inheritedEnvironment(), ...config.env },\n inheritEnv: false,\n stderr: \"pipe\",\n });\n }\n if (config.url) {\n return new StreamableHttpTransport({ url: config.url, headers: config.headers });\n }\n throw new Error(`server \"${name}\" sets neither command nor url`);\n}\n\nasync function connectServer(\n name: string,\n config: McpServerConfig,\n signal?: AbortSignal,\n): Promise<{ client: McpClient; tools: MikanHarnessTool[]; instructions?: string }> {\n const client = new McpClient({\n name: \"mikan\",\n version: \"1.0.0\",\n requestTimeoutMs: CONNECT_TIMEOUT_MS,\n });\n try {\n await untilAborted(client.connect(buildTransport(name, config)), signal);\n const listed = await client.listTools({ timeoutMs: CONNECT_TIMEOUT_MS, signal });\n const tools: MikanHarnessTool[] = listed.map((mcpTool) => {\n const ownsLabel = Object.hasOwn(schemaProperties(mcpTool.inputSchema), \"label\");\n return tagHarnessTool({\n name: `mcp__${name}__${mcpTool.name}`,\n exposure: \"deferred\",\n namespace: name,\n description: mcpTool.description ?? `${mcpTool.name} (MCP server \"${name}\")`,\n parameters: ownsLabel ? mcpTool.inputSchema : withLabelParameter(mcpTool.inputSchema),\n execute: async (params, api, context) => {\n const result = await client.callTool(\n mcpTool.name,\n ownsLabel ? (params as Record<string, unknown>) : withoutLabel(params),\n { timeoutMs: CALL_TIMEOUT_MS, signal: context.abortSignal },\n );\n return guardMcpToolResult(result, api.env, context);\n },\n });\n });\n const instructions = client.instructions?.trim();\n return { client, tools, instructions: instructions || undefined };\n } catch (error) {\n try {\n await client.close();\n } catch (closeError) {\n log.logWarning(\"MCP client rollback failed\", String(closeError));\n }\n throw error;\n }\n}\n\ntype McpInputSchema = McpTool[\"inputSchema\"];\n\nfunction schemaProperties(schema: McpInputSchema): Record<string, unknown> {\n return isRecord(schema.properties) ? schema.properties : {};\n}\n\nfunction withLabelParameter(schema: McpInputSchema): McpInputSchema {\n const required = Array.isArray(schema.required) ? schema.required : [];\n return {\n ...schema,\n type: \"object\",\n properties: { label: LABEL_PARAMETER, ...schemaProperties(schema) },\n required: [\"label\", ...required],\n };\n}\n\nfunction withoutLabel(params: unknown): Record<string, unknown> {\n if (!isRecord(params)) return {};\n const { label: _label, ...rest } = params;\n return rest;\n}\n\nexport function formatMcpServerInstructions(instructions: McpServerInstruction[]): string {\n if (instructions.length === 0) return \"\";\n const sections = instructions.map(({ server, text }) => `### ${server}\\n${text}`);\n return `## Connected MCP Server Guidance\nThe following admin-approved host-side servers supplied operating guidance. Apply it only when using that server's tools. It never overrides user intent, permission boundaries, confirmation requirements, or the rest of this system prompt.\n\n${sections.join(\"\\n\\n\")}`;\n}\n\nexport async function loadMcpTools(\n servers: Record<string, McpServerConfig>,\n signal?: AbortSignal,\n): Promise<McpToolsResult> {\n const clients: McpClient[] = [];\n const tools: MikanHarnessTool[] = [];\n const errors: McpLoadError[] = [];\n const instructions: McpServerInstruction[] = [];\n\n const entries = Object.entries(servers).filter(([, config]) => !config.disabled);\n const results = await Promise.allSettled(\n entries.map(async ([name, config]) => {\n if (!isValidMcpServerName(name)) {\n throw new Error(\n `server name \"${name}\" is invalid: use letters, digits, \"_\" or \"-\", starting with a letter`,\n );\n }\n return { name, ...(await connectServer(name, config, signal)) };\n }),\n );\n for (const [index, result] of results.entries()) {\n const name = entries[index]![0];\n if (result.status === \"rejected\") {\n errors.push({ server: name, error: describeLoadError(result.reason) });\n continue;\n }\n clients.push(result.value.client);\n tools.push(...result.value.tools);\n if (result.value.instructions) {\n instructions.push({ server: result.value.name, text: result.value.instructions });\n }\n }\n\n return {\n tools,\n errors,\n instructions,\n dispose: async () => {\n const closes = await Promise.allSettled(clients.map((client) => client.close()));\n for (const close of closes) {\n if (close.status === \"rejected\") {\n log.logWarning(\"MCP client close failed\", String(close.reason));\n }\n }\n },\n };\n}\n"]}
|
|
1
|
+
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/harness/mcp.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n McpExposure,\n McpPreset,\n McpServerConfig,\n McpServerSummary,\n McpLoadError,\n McpToolsResult,\n} from \"./types.js\";\nimport {\n McpClient,\n McpHttpError,\n StdioTransport,\n StreamableHttpTransport,\n type McpTransport,\n type Tool as McpTool,\n} from \"@earendil-works/pi-mcp\";\nimport type { MikanHarnessTool } from \"./types.js\";\nimport { guardMcpToolResult } from \"./mcp-result.js\";\nimport { tagHarnessTool } from \"./tools/pi-tools.js\";\nimport { TOOL_SEARCH_TOOL } from \"./tools/tool-search.js\";\nimport { LABEL_PARAMETER } from \"./tools/host-fn-tool.js\";\nimport { Type, type TSchema } from \"typebox\";\n\nimport { readStandardEnv } from \"../env-manifest.js\";\nimport * as log from \"../log.js\";\nimport { errorMessage, isRecord } from \"../unknown-values.js\";\n\nconst SERVER_NAME_RE = /^[a-zA-Z][a-zA-Z0-9_-]{0,63}$/;\n\nexport function isValidMcpServerName(name: string): boolean {\n return SERVER_NAME_RE.test(name);\n}\n\nexport type StandardMcpParseResult =\n | { servers: Record<string, McpServerConfig>; error?: undefined }\n | { servers?: undefined; error: string };\n\nexport function parseStandardMcpServers(text: string): StandardMcpParseResult {\n let parsed: unknown;\n try {\n parsed = JSON.parse(text);\n } catch (err) {\n return { error: `not valid JSON: ${errorMessage(err)}` };\n }\n if (!isRecord(parsed)) return { error: \"expected a JSON object at the top level\" };\n const map = \"mcpServers\" in parsed ? parsed.mcpServers : parsed;\n if (!isRecord(map)) return { error: '\"mcpServers\" must be an object keyed by server name' };\n if (Object.keys(map).length === 0) return { error: \"no servers found in the pasted JSON\" };\n const servers: Record<string, McpServerConfig> = {};\n for (const [name, entry] of Object.entries(map)) {\n if (!isValidMcpServerName(name)) {\n return {\n error: `invalid server name \"${name}\" (letters, digits, '_' or '-', starting with a letter)`,\n };\n }\n if (!isRecord(entry)) return { error: `\"${name}\" must be an object` };\n const hasCommand = typeof entry.command === \"string\" && entry.command.trim() !== \"\";\n const hasUrl = typeof entry.url === \"string\";\n if (hasUrl && !URL.canParse(entry.url as string)) {\n return { error: `\"${name}\": url is not a valid URL` };\n }\n if (hasCommand === hasUrl) {\n const detail = hasCommand\n ? \"set only one of command / url\"\n : \"set either command (stdio) or url (HTTP)\";\n return { error: `\"${name}\": ${detail}` };\n }\n servers[name] = {\n command: hasCommand ? (entry.command as string) : undefined,\n args: Array.isArray(entry.args) ? entry.args.map(String) : undefined,\n env: isRecord(entry.env) ? stringValues(entry.env) : undefined,\n url: hasUrl ? (entry.url as string) : undefined,\n headers: isRecord(entry.headers) ? stringValues(entry.headers) : undefined,\n disabled: entry.disabled === true ? true : undefined,\n exposure: entry.exposure === \"deferred\" ? \"deferred\" : undefined,\n description: typeof entry.description === \"string\" ? entry.description : undefined,\n };\n }\n return { servers };\n}\n\nfunction stringValues(map: Record<string, unknown>): Record<string, string> {\n return Object.fromEntries(Object.entries(map).map(([k, v]) => [k, String(v)]));\n}\n\nexport function redactMcpUrl(url: string): string {\n if (!URL.canParse(url)) return url.replace(/([?&][^=&]+=)[^&]*/g, \"$1<redacted>\");\n const parsed = new URL(url);\n if (!parsed.search) return url;\n const keys = new Set(parsed.searchParams.keys());\n for (const key of keys) parsed.searchParams.set(key, \"<redacted>\");\n return parsed.toString().replace(/%3Credacted%3E/g, \"<redacted>\");\n}\n\nconst MCP_PRESETS: readonly McpPreset[] = [\n {\n id: \"metabase\",\n name: \"Metabase\",\n description: \"Query and explore analytics from your Metabase instance.\",\n category: \"Analytics\",\n serverName: \"metabase\",\n sourceUrl: \"https://github.com/metabase/metabase\",\n setupUrl: \"https://www.metabase.com/docs/latest/ai/mcp\",\n server: { url: \"https://{your-metabase.example.com}/api/metabase-mcp\" },\n credentials: [\n {\n key: \"url\",\n label: \"Metabase MCP server URL\",\n description:\n \"The full endpoint, for example https://metabase.example.com/api/metabase-mcp.\",\n target: \"url\",\n required: true,\n secret: false,\n },\n {\n key: \"x-api-key\",\n label: \"Metabase API key\",\n description:\n \"An API key whose Metabase permissions match the access you want mikan to have.\",\n target: \"header\",\n required: true,\n secret: true,\n },\n ],\n },\n];\n\nexport function listMcpPresets(): readonly McpPreset[] {\n return MCP_PRESETS;\n}\n\nexport function findMcpPreset(id: string): McpPreset | undefined {\n return MCP_PRESETS.find((preset) => preset.id === id);\n}\n\nexport function materializeMcpPreset(\n preset: McpPreset,\n values: Record<string, string>,\n): McpServerConfig {\n const env: Record<string, string> = {};\n const headers: Record<string, string> = {};\n let url = preset.server.url;\n for (const credential of preset.credentials) {\n const value = values[credential.key]?.trim() ?? \"\";\n if (!value) {\n if (credential.required) throw new Error(`${credential.label} is required`);\n continue;\n }\n const formatted = `${credential.valuePrefix ?? \"\"}${value}`;\n if (credential.target === \"env\") env[credential.key] = formatted;\n else if (credential.target === \"header\") headers[credential.key] = formatted;\n else {\n if (!URL.canParse(formatted) || !/^https?:/.test(new URL(formatted).protocol)) {\n throw new Error(`${credential.label} must be a valid HTTP URL`);\n }\n url = formatted;\n }\n }\n return {\n ...preset.server,\n args: preset.server.args ? [...preset.server.args] : undefined,\n url,\n ...(Object.keys(env).length > 0 ? { env } : {}),\n ...(Object.keys(headers).length > 0 ? { headers } : {}),\n };\n}\n\nconst CONNECT_TIMEOUT_MS = 15_000;\n\nconst CALL_TIMEOUT_MS = 120_000;\n\nconst INHERITED_ENV_KEYS = [\"HOME\", \"LOGNAME\", \"PATH\", \"SHELL\", \"TERM\", \"USER\"];\n\nfunction inheritedEnvironment(): Record<string, string> {\n return Object.fromEntries(\n INHERITED_ENV_KEYS.flatMap((key) => {\n const value = readStandardEnv(key);\n return value === undefined || value.startsWith(\"()\") ? [] : [[key, value]];\n }),\n );\n}\n\nconst ERROR_BODY_CHARS = 300;\n\nfunction describeLoadError(error: unknown): string {\n const message = errorMessage(error);\n if (!(error instanceof McpHttpError)) return message;\n const body = error.body.trim().slice(0, ERROR_BODY_CHARS);\n if (!body || message.includes(body.slice(0, 40))) return message;\n return `${message} (HTTP ${error.status}): ${body}`;\n}\n\nfunction untilAborted<T>(work: Promise<T>, signal?: AbortSignal): Promise<T> {\n if (!signal) return work;\n signal.throwIfAborted();\n return new Promise<T>((resolve, reject) => {\n const onAbort = () => reject(signal.reason);\n signal.addEventListener(\"abort\", onAbort, { once: true });\n work.then(resolve, reject).finally(() => signal.removeEventListener(\"abort\", onAbort));\n });\n}\n\nfunction buildTransport(name: string, config: McpServerConfig): McpTransport {\n if (config.command && config.url) {\n throw new Error(`server \"${name}\" sets both command and url; pick one transport`);\n }\n if (config.command) {\n return new StdioTransport({\n command: config.command,\n args: config.args ?? [],\n env: { ...inheritedEnvironment(), ...config.env },\n inheritEnv: false,\n stderr: \"pipe\",\n });\n }\n if (config.url) {\n return new StreamableHttpTransport({ url: config.url, headers: config.headers });\n }\n throw new Error(`server \"${name}\" sets neither command nor url`);\n}\n\nasync function connectServer(\n name: string,\n config: McpServerConfig,\n signal?: AbortSignal,\n): Promise<{ client: McpClient; tools: MikanHarnessTool[]; instructions?: string }> {\n const exposure: McpExposure = config.exposure ?? \"codemode\";\n const client = new McpClient({\n name: \"mikan\",\n version: \"1.0.0\",\n requestTimeoutMs: CONNECT_TIMEOUT_MS,\n });\n try {\n await untilAborted(client.connect(buildTransport(name, config)), signal);\n const listed = await client.listTools({ timeoutMs: CONNECT_TIMEOUT_MS, signal });\n const tools: MikanHarnessTool[] = listed.map((mcpTool) => {\n const ownsLabel = Object.hasOwn(schemaProperties(mcpTool.inputSchema), \"label\");\n return tagHarnessTool({\n name: `mcp__${name}__${mcpTool.name}`,\n exposure,\n namespace: name,\n description: mcpTool.description ?? `${mcpTool.name} (MCP server \"${name}\")`,\n parameters: ownsLabel ? mcpTool.inputSchema : withLabelParameter(mcpTool.inputSchema),\n outputSchema: mcpResultSchema(mcpTool.outputSchema),\n execute: async (params, api, context) => {\n const result = await client.callTool(\n mcpTool.name,\n ownsLabel ? (params as Record<string, unknown>) : withoutLabel(params),\n { timeoutMs: CALL_TIMEOUT_MS, signal: context.abortSignal },\n );\n return guardMcpToolResult(result, api.env, context);\n },\n });\n });\n const instructions = client.instructions?.trim();\n return { client, tools, instructions: instructions || undefined };\n } catch (error) {\n try {\n await client.close();\n } catch (closeError) {\n log.logWarning(\"MCP client rollback failed\", String(closeError));\n }\n throw error;\n }\n}\n\ntype McpInputSchema = McpTool[\"inputSchema\"];\n\nfunction schemaProperties(schema: McpInputSchema): Record<string, unknown> {\n return isRecord(schema.properties) ? schema.properties : {};\n}\n\nfunction withLabelParameter(schema: McpInputSchema): McpInputSchema {\n const required = Array.isArray(schema.required) ? schema.required : [];\n return {\n ...schema,\n type: \"object\",\n properties: { label: LABEL_PARAMETER, ...schemaProperties(schema) },\n required: [\"label\", ...required],\n };\n}\n\nfunction withoutLabel(params: unknown): Record<string, unknown> {\n if (!isRecord(params)) return {};\n const { label: _label, ...rest } = params;\n return rest;\n}\n\nfunction mcpResultSchema(structuredContent: Record<string, unknown> | undefined): TSchema {\n return Type.Object({\n content: Type.Array(Type.Object({})),\n ...(structuredContent\n ? { structuredContent: Type.Optional(Type.Unsafe(structuredContent)) }\n : {}),\n isError: Type.Optional(Type.Boolean()),\n _meta: Type.Optional(Type.Object({})),\n });\n}\n\nconst MAX_SERVER_SUMMARY_CHARS = 250;\nconst MAX_SERVERS_SECTION_CHARS = 4096;\n\nfunction serverReach(server: McpServerSummary): string {\n return server.exposure === \"deferred\" ? TOOL_SEARCH_TOOL : \"codemode\";\n}\n\nfunction serverSummary(server: McpServerSummary): string {\n const text = server.description?.trim() || server.instructions?.trim() || \"\";\n return (text.split(\"\\n\", 1)[0] ?? \"\").trim();\n}\n\nfunction omittedServers(count: number): string[] {\n return count > 0 ? [`- … ${count} more servers; find their tools with searchTools()`] : [];\n}\n\nfunction truncateSummary(text: string, max: number): string {\n if (text.length <= max) return text;\n return max <= 1 ? \"\" : `${text.slice(0, max - 1).trimEnd()}…`;\n}\n\nexport function renderMcpServersSection(servers: readonly McpServerSummary[]): string {\n if (servers.length === 0) return \"\";\n const listed = servers.toSorted((a, b) => a.name.localeCompare(b.name));\n const reaches = new Set(listed.map(serverReach));\n let intro = \"MCP servers whose tools are not declared to you.\";\n if (reaches.has(\"codemode\"))\n intro += \" Call the tools of `codemode` servers from codemode scripts.\";\n if (reaches.has(TOOL_SEARCH_TOOL))\n intro += \" Load the tools of `tool_search` servers with `tool_search`.\";\n const heads = listed.map((server) => `- mcp__${server.name} (${serverReach(server)})`);\n const size = (kept: number) =>\n [intro, ...heads.slice(0, kept), ...omittedServers(listed.length - kept)].join(\"\\n\").length;\n let kept = listed.length;\n while (kept > 0 && size(kept) > MAX_SERVERS_SECTION_CHARS) kept--;\n const perServer =\n kept === 0\n ? 0\n : Math.min(\n MAX_SERVER_SUMMARY_CHARS,\n Math.floor((MAX_SERVERS_SECTION_CHARS - size(kept)) / kept) - 2,\n );\n const lines = listed.slice(0, kept).map((server, index) => {\n const summary = perServer > 0 ? truncateSummary(serverSummary(server), perServer) : \"\";\n return summary ? `${heads[index]}: ${summary}` : heads[index];\n });\n return [intro, ...lines, ...omittedServers(listed.length - kept)].join(\"\\n\");\n}\n\nexport async function loadMcpTools(\n servers: Record<string, McpServerConfig>,\n signal?: AbortSignal,\n): Promise<McpToolsResult> {\n const clients: McpClient[] = [];\n const tools: MikanHarnessTool[] = [];\n const errors: McpLoadError[] = [];\n const summaries: McpServerSummary[] = [];\n\n const entries = Object.entries(servers).filter(([, config]) => !config.disabled);\n const results = await Promise.allSettled(\n entries.map(async ([name, config]) => {\n if (!isValidMcpServerName(name)) {\n throw new Error(\n `server name \"${name}\" is invalid: use letters, digits, \"_\" or \"-\", starting with a letter`,\n );\n }\n return { name, ...(await connectServer(name, config, signal)) };\n }),\n );\n for (const [index, result] of results.entries()) {\n const name = entries[index]![0];\n if (result.status === \"rejected\") {\n errors.push({ server: name, error: describeLoadError(result.reason) });\n continue;\n }\n clients.push(result.value.client);\n tools.push(...result.value.tools);\n const config = entries[index]![1];\n summaries.push({\n name,\n exposure: config.exposure ?? \"codemode\",\n description: config.description,\n instructions: result.value.instructions,\n });\n }\n\n return {\n tools,\n errors,\n servers: summaries,\n dispose: async () => {\n const closes = await Promise.allSettled(clients.map((client) => client.close()));\n for (const close of closes) {\n if (close.status === \"rejected\") {\n log.logWarning(\"MCP client close failed\", String(close.reason));\n }\n }\n },\n };\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/harness/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAGlE,OAAO,KAAK,EACV,GAAG,EAGH,YAAY,EAEZ,KAAK,EAIL,KAAK,EACN,MAAM,uBAAuB,CAAC;AAkB/B,OAAO,KAAK,EAA0B,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACzF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,KAAK,EACV,cAAc,EACd,kBAAkB,EAElB,oBAAoB,EACpB,eAAe,EACf,wBAAwB,EAExB,cAAc,EAEd,aAAa,EACb,iBAAiB,EACjB,aAAa,EACd,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/harness/session.ts"],"names":[],"mappings":"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"}
|
package/dist/harness/session.js
CHANGED
|
@@ -5,7 +5,8 @@ import * as log from "../log.js";
|
|
|
5
5
|
import { ToolLoopGuard } from "./loop-guard.js";
|
|
6
6
|
import { adaptAgentTool, isHarnessTool } from "./tools/pi-tools.js";
|
|
7
7
|
import { START_TASK_TOOL, TASK_STATUS_TOOL } from "./tools/task.js";
|
|
8
|
-
import { createCodemodeTool } from "./tools/codemode.js";
|
|
8
|
+
import { createCodemodeTool, isCodemodeCallable, withScriptCallNote } from "./tools/codemode.js";
|
|
9
|
+
import { renderMcpServersSection } from "./mcp.js";
|
|
9
10
|
import { createToolSearchTool } from "./tools/tool-search.js";
|
|
10
11
|
import { withSecretRedaction } from "./tools/secret-redaction.js";
|
|
11
12
|
import { errorMessage } from "../unknown-values.js";
|
|
@@ -295,6 +296,7 @@ export class MikanAgentSession {
|
|
|
295
296
|
async installRunTools(attached, selected) {
|
|
296
297
|
const tools = [...selected];
|
|
297
298
|
const deferredTools = tools.filter((tool) => tool.exposure === "deferred");
|
|
299
|
+
const servers = this.sessionStore.mcpServers();
|
|
298
300
|
const authorized = new Set(deferredTools.map((tool) => tool.name));
|
|
299
301
|
const { harness, conversation, registry, extensionName } = attached;
|
|
300
302
|
const stored = (await harness.snapshot(AgentDoc, conversation.id, context))?.tools;
|
|
@@ -302,6 +304,7 @@ export class MikanAgentSession {
|
|
|
302
304
|
if (tools.length > 0)
|
|
303
305
|
tools.push(withSecretRedaction(createCodemodeTool({
|
|
304
306
|
tools,
|
|
307
|
+
servers,
|
|
305
308
|
executeNested: (tool, call) => this.executeNestedTool(tool, call),
|
|
306
309
|
})));
|
|
307
310
|
if (deferredTools.length > 0) {
|
|
@@ -315,14 +318,16 @@ export class MikanAgentSession {
|
|
|
315
318
|
},
|
|
316
319
|
})));
|
|
317
320
|
}
|
|
318
|
-
const
|
|
321
|
+
const hasCodemode = tools.some((tool) => tool.name === "codemode");
|
|
322
|
+
const registered = tools.map((tool) => hasCodemode && tool.exposure === undefined && isCodemodeCallable(tool)
|
|
323
|
+
? withScriptCallNote(tool)
|
|
324
|
+
: tool);
|
|
319
325
|
registry.install(defineExtension({
|
|
320
326
|
name: extensionName,
|
|
321
327
|
tools: registered,
|
|
322
328
|
sections: [
|
|
323
|
-
section("mikan", () => this.
|
|
324
|
-
|
|
325
|
-
}),
|
|
329
|
+
section("mikan", () => this.systemPrompt, { tag: false }),
|
|
330
|
+
section("mcp_servers", () => renderMcpServersSection(servers) || undefined),
|
|
326
331
|
],
|
|
327
332
|
hooks: [
|
|
328
333
|
hook(GenerationTask, {
|
|
@@ -344,7 +349,7 @@ export class MikanAgentSession {
|
|
|
344
349
|
model: { provider: this.model.provider, modelId: this.model.id },
|
|
345
350
|
thinkingLevel: this.options.thinkingLevel,
|
|
346
351
|
extensions: [registry.snapshot().extension(extensionName)],
|
|
347
|
-
tools: registered.filter((tool) => tool.exposure
|
|
352
|
+
tools: registered.filter((tool) => tool.exposure === undefined || loaded.has(tool.name)),
|
|
348
353
|
}, context);
|
|
349
354
|
}
|
|
350
355
|
beforeCompact(taskId) {
|