npm - @code-yeongyu/senpi - Versions diffs - 2026.7.17-5 → 2026.7.17 - Mend

@code-yeongyu/senpi 2026.7.17-5 → 2026.7.17

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.

Files changed (193) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,64 +1,5 @@
 # Changelog
-## [2026.7.17-5] - 2026-07-17
-### Breaking Changes
-### Added
-### Changed
-### Fixed
-### Removed
-## [2026.7.17-4] - 2026-07-17
-### Breaking Changes
-### Added
-### Changed
-### Fixed
-- Fixed Kimi/Moonshot function parameters with root object unions by flattening them into a compatible object schema.
-### Removed
-## [2026.7.17-3] - 2026-07-17
-### Breaking Changes
-### Added
-### Changed
-- Renamed the MCP discovery tool from `mcp_search` to `tool_search` so its public name matches its behavior ([#227](https://github.com/code-yeongyu/senpi/pull/227)).
-### Fixed
-- Fixed payload hooks reintroducing Moonshot-incompatible function schemas by normalizing the final tool list after `onPayload` and immediately before request submission.
-### Removed
-## [2026.7.17-2] - 2026-07-17
-### Breaking Changes
-### Added
-- Added a `<workstation>` block (OS/kernel, arch, CPU, GPU, terminal) to the dynamic system prompt, followed by a dialect-tuned execution-context instruction telling the model that `bash`/`eval` run on this workstation while written code may target other machines. Presets pass their model-family dialect (Claude/GLM, GPT, Kimi); the fallback prompt uses a maximum-emphasis default.
-### Changed
-### Fixed
-- Fixed Kimi K3 prompt preset tuning to discourage overthinking and keep concise tool use ([#225](https://github.com/code-yeongyu/senpi/pull/225)).
-- Fixed Moonshot-flavored OpenAI backends by normalizing tool parameters through a dedicated compatibility layer so function schemas and result images are accepted by Moonshot's API ([#225](https://github.com/code-yeongyu/senpi/pull/225)).
-### Removed
 ## [2026.7.17] - 2026-07-17
 ### Breaking Changes

package/dist/core/dynamic-prompt/build.d.ts CHANGED Viewed

@@ -1,6 +1,5 @@
 import type { Skill } from "../skills.ts";
 import type { AvailableTool } from "./types.ts";
-import { type WorkstationDialect } from "./workstation.ts";
 /** Context handed to a `corePrompt` override so it can reuse the dynamic pieces. */
 export interface DynamicPromptCoreContext {
     tools: AvailableTool[];
@@ -24,12 +23,6 @@ export interface BuildDynamicSystemPromptOptions {
      * date, and cwd assembly stay in this builder.
      */
     corePrompt?: (context: DynamicPromptCoreContext) => string;
-    /**
-     * Wording dialect for the workstation execution-context instruction.
-     * Presets pass their model family; the fallback prompt uses `default`
-     * (maximum emphasis).
-     */
-    workstationDialect?: WorkstationDialect;
 }
 export declare function buildDynamicSystemPrompt(options: BuildDynamicSystemPromptOptions): string;
 //# sourceMappingURL=build.d.ts.map

package/dist/core/dynamic-prompt/build.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/core/dynamic-prompt/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAU1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;~~AAEhD~~,~~OAAO,EAA2B,KAAK,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEpF,~~oFAAoF;AACpF,MAAM,WAAW,wBAAwB;IACxC,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,sEAAsE;IACtE,WAAW,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,+BAA+B;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,YAAY,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvD,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,wBAAwB,KAAK,MAAM,CAAC;~~IAC3D;;;;OAIG~~;~~IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;CACxC;~~AAmBD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,+BAA+B,GAAG,MAAM,~~CAyDzF~~"}
1	+ {"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/core/dynamic-prompt/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAU1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAGhD,oFAAoF;AACpF,MAAM,WAAW,wBAAwB;IACxC,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,sEAAsE;IACtE,WAAW,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,+BAA+B;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,YAAY,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvD,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,wBAAwB,KAAK,MAAM,CAAC;CAC3D;AAmBD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,+BAA+B,GAAG,MAAM,CAiDzF"}

package/dist/core/dynamic-prompt/build.js CHANGED Viewed

@@ -8,7 +8,6 @@ import { buildStyleSection } from "./style.js";
 import { categorizeTools } from "./tool-categorization.js";
 import { buildToolSection } from "./tool-section.js";
 import { buildVerificationSection } from "./verification.js";
-import { buildWorkstationSection } from "./workstation.js";
 function buildContextFilesSection(contextFiles) {
     if (contextFiles.length === 0) {
         return "";
@@ -64,10 +63,6 @@ export function buildDynamicSystemPrompt(options) {
     if (skillsSection) {
         sections.push(skillsSection);
     }
-    sections.push("", buildWorkstationSection({
-        selectedTools: options.selectedTools,
-        dialect: options.workstationDialect ?? "default",
-    }));
     sections.push("", `Current date: ${date}`, `Current working directory: ${promptCwd}`);
     return sections.join("\n");
 }

package/dist/core/dynamic-prompt/build.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/core/dynamic-prompt/build.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;~~AAC7D~~,~~OAAO,EAAE,uBAAuB,EAA2B,MAAM,kBAAkB,CAAC;AA+BpF,~~SAAS,wBAAwB,CAAC,YAAsD;IACvF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,EAAE,CAAC;IACX,CAAC;IAED,MAAM,KAAK,GAAG;QACb,oBAAoB;QACpB,EAAE;QACF,sMAAsM;QACtM,EAAE;KACF,CAAC;IACF,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACxC,KAAK,CAAC,IAAI,CAAC,OAAO,WAAW,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAAwC;IAChF,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAClD,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEnD,MAAM,WAAW,GAAG,gBAAgB,CAAC;QACpC,KAAK;QACL,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;KAC1C,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU;QAClC,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QAC9C,CAAC,CAAC;YACA,oBAAoB,EAAE;YACtB,EAAE;YACF,eAAe,CAAC,EAAE,KAAK,EAAE,CAAC;YAC1B,EAAE;YACF,yBAAyB,EAAE;YAC3B,EAAE;YACF,uBAAuB,EAAE;YACzB,EAAE;YACF,wBAAwB,EAAE;YAC1B,EAAE;YACF,WAAW;YACX,EAAE;YACF,oBAAoB,EAAE;YACtB,EAAE;YACF,iBAAiB,EAAE;SACnB,CAAC;IAEJ,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC;IAC7C,IAAI,MAAM,EAAE,CAAC;QACZ,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3B,CAAC;IAED,MAAM,mBAAmB,GAAG,wBAAwB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3E,IAAI,mBAAmB,EAAE,CAAC;QACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,mBAAmB,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,aAAa,GAAG,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5D,IAAI,aAAa,EAAE,CAAC;QACnB,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC9B,CAAC;IAED,QAAQ,CAAC,IAAI,~~CACZ,EAAE,EACF,uBAAuB,~~CAAC~~;QACvB~~,~~aAAa,~~EAAE,~~OAAO,CAAC,aAAa;QACpC,OAAO,~~EAAE,~~OAAO,CAAC,kBAAkB,IAAI,SAAS;KAChD,CAAC,CACF,CAAC;IAEF,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,~~iBAAiB,IAAI,EAAE,EAAE,8BAA8B,SAAS,EAAE,CAAC,CAAC;IAEtF,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC","sourcesContent":["import type { Skill } from \"../skills.ts\";\nimport { formatSkillsForPrompt } from \"../skills.ts\";\nimport { buildExplorationSection } from \"./exploration.ts\";\nimport { buildIdentitySection } from \"./identity.ts\";\nimport { buildIntentGate } from \"./intent-gate.ts\";\nimport { buildParallelToolsSection } from \"./parallel-tools.ts\";\nimport { buildPoliciesSection } from \"./policies.ts\";\nimport { buildStyleSection } from \"./style.ts\";\nimport { categorizeTools } from \"./tool-categorization.ts\";\nimport { buildToolSection } from \"./tool-section.ts\";\nimport type { AvailableTool } from \"./types.ts\";\nimport { buildVerificationSection } from \"./verification.ts\";\~~nimport { buildWorkstationSection, type WorkstationDialect } from \"./workstation.ts\";\~~n\n/** Context handed to a `corePrompt` override so it can reuse the dynamic pieces. /\nexport interface DynamicPromptCoreContext {\n\ttools: AvailableTool[];\n\t/* Rendered \"## Available Tools\" (+ \"## Tool Guidelines\") section. /\n\ttoolSection: string;\n}\n\nexport interface BuildDynamicSystemPromptOptions {\n\tcwd: string;\n\tselectedTools: string[];\n\ttoolSnippets: Record<string, string>;\n\tpromptGuidelines: string[];\n\tcontextFiles: Array<{ path: string; content: string }>;\n\tskills: Skill[];\n\ttuningSection?: string;\n\t/\n\t Replaces the default core sections (identity through style) with a\n\t * model-specific full rewrite. Tool section, tuning, context files, skills,\n\t * date, and cwd assembly stay in this builder.\n\t /\n\tcorePrompt?: (context: DynamicPromptCoreContext) => string;\n\t/\n\t Wording dialect for the workstation execution-context instruction.\n\t * Presets pass their model family; the fallback prompt uses `default`\n\t * (maximum emphasis).\n\t */\n\tworkstationDialect?: WorkstationDialect;\n}\n\nfunction buildContextFilesSection(contextFiles: Array<{ path: string; content: string }>): string {\n\tif (contextFiles.length === 0) {\n\t\treturn \"\";\n\t}\n\n\tconst lines = [\n\t\t\"## Project Context\",\n\t\t\"\",\n\t\t\"Project instruction files (below, and in [Directory Context: ...] blocks injected during reads) bind files under their directory; deeper files win on conflict; explicit user instructions override.\",\n\t\t\"\",\n\t];\n\tfor (const contextFile of contextFiles) {\n\t\tlines.push(`### ${contextFile.path}`, \"\", contextFile.content.trimEnd(), \"\");\n\t}\n\treturn lines.join(\"\\n\").trimEnd();\n}\n\nexport function buildDynamicSystemPrompt(options: BuildDynamicSystemPromptOptions): string {\n\tconst promptCwd = options.cwd.replace(/\\\\/g, \"/\");\n\tconst tools = categorizeTools(options.selectedTools);\n\tconst date = new Date().toISOString().slice(0, 10);\n\n\tconst toolSection = buildToolSection({\n\t\ttools,\n\t\ttoolSnippets: options.toolSnippets,\n\t\tpromptGuidelines: options.promptGuidelines,\n\t});\n\n\tconst sections = options.corePrompt\n\t\t? [options.corePrompt({ tools, toolSection })]\n\t\t: [\n\t\t\t\tbuildIdentitySection(),\n\t\t\t\t\"\",\n\t\t\t\tbuildIntentGate({ tools }),\n\t\t\t\t\"\",\n\t\t\t\tbuildParallelToolsSection(),\n\t\t\t\t\"\",\n\t\t\t\tbuildExplorationSection(),\n\t\t\t\t\"\",\n\t\t\t\tbuildVerificationSection(),\n\t\t\t\t\"\",\n\t\t\t\ttoolSection,\n\t\t\t\t\"\",\n\t\t\t\tbuildPoliciesSection(),\n\t\t\t\t\"\",\n\t\t\t\tbuildStyleSection(),\n\t\t\t];\n\n\tconst tuning = options.tuningSection?.trim();\n\tif (tuning) {\n\t\tsections.push(\"\", tuning);\n\t}\n\n\tconst contextFilesSection = buildContextFilesSection(options.contextFiles);\n\tif (contextFilesSection) {\n\t\tsections.push(\"\", contextFilesSection);\n\t}\n\n\tconst skillsSection = formatSkillsForPrompt(options.skills);\n\tif (skillsSection) {\n\t\tsections.push(skillsSection);\n\t}\n\n\tsections.push(\~~n\t\t\~~"\"~~,\n\t\tbuildWorkstationSection({\n\t\t\tselectedTools: options.selectedTools,\n\t\t\tdialect: options.workstationDialect ?? \"default\",\n\t\t}),\n\t);\n\n\tsections.push(\"\"~~, `Current date: ${date}`, `Current working directory: ${promptCwd}`);\n\n\treturn sections.join(\"\\n\");\n}\n"]}
1	+ {"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/core/dynamic-prompt/build.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Skill } from \"../skills.ts\";\nimport { formatSkillsForPrompt } from \"../skills.ts\";\nimport { buildExplorationSection } from \"./exploration.ts\";\nimport { buildIdentitySection } from \"./identity.ts\";\nimport { buildIntentGate } from \"./intent-gate.ts\";\nimport { buildParallelToolsSection } from \"./parallel-tools.ts\";\nimport { buildPoliciesSection } from \"./policies.ts\";\nimport { buildStyleSection } from \"./style.ts\";\nimport { categorizeTools } from \"./tool-categorization.ts\";\nimport { buildToolSection } from \"./tool-section.ts\";\nimport type { AvailableTool } from \"./types.ts\";\nimport { buildVerificationSection } from \"./verification.ts\";\n\n/** Context handed to a `corePrompt` override so it can reuse the dynamic pieces. /\nexport interface DynamicPromptCoreContext {\n\ttools: AvailableTool[];\n\t/* Rendered \"## Available Tools\" (+ \"## Tool Guidelines\") section. /\n\ttoolSection: string;\n}\n\nexport interface BuildDynamicSystemPromptOptions {\n\tcwd: string;\n\tselectedTools: string[];\n\ttoolSnippets: Record<string, string>;\n\tpromptGuidelines: string[];\n\tcontextFiles: Array<{ path: string; content: string }>;\n\tskills: Skill[];\n\ttuningSection?: string;\n\t/\n\t Replaces the default core sections (identity through style) with a\n\t * model-specific full rewrite. Tool section, tuning, context files, skills,\n\t * date, and cwd assembly stay in this builder.\n\t */\n\tcorePrompt?: (context: DynamicPromptCoreContext) => string;\n}\n\nfunction buildContextFilesSection(contextFiles: Array<{ path: string; content: string }>): string {\n\tif (contextFiles.length === 0) {\n\t\treturn \"\";\n\t}\n\n\tconst lines = [\n\t\t\"## Project Context\",\n\t\t\"\",\n\t\t\"Project instruction files (below, and in [Directory Context: ...] blocks injected during reads) bind files under their directory; deeper files win on conflict; explicit user instructions override.\",\n\t\t\"\",\n\t];\n\tfor (const contextFile of contextFiles) {\n\t\tlines.push(`### ${contextFile.path}`, \"\", contextFile.content.trimEnd(), \"\");\n\t}\n\treturn lines.join(\"\\n\").trimEnd();\n}\n\nexport function buildDynamicSystemPrompt(options: BuildDynamicSystemPromptOptions): string {\n\tconst promptCwd = options.cwd.replace(/\\\\/g, \"/\");\n\tconst tools = categorizeTools(options.selectedTools);\n\tconst date = new Date().toISOString().slice(0, 10);\n\n\tconst toolSection = buildToolSection({\n\t\ttools,\n\t\ttoolSnippets: options.toolSnippets,\n\t\tpromptGuidelines: options.promptGuidelines,\n\t});\n\n\tconst sections = options.corePrompt\n\t\t? [options.corePrompt({ tools, toolSection })]\n\t\t: [\n\t\t\t\tbuildIdentitySection(),\n\t\t\t\t\"\",\n\t\t\t\tbuildIntentGate({ tools }),\n\t\t\t\t\"\",\n\t\t\t\tbuildParallelToolsSection(),\n\t\t\t\t\"\",\n\t\t\t\tbuildExplorationSection(),\n\t\t\t\t\"\",\n\t\t\t\tbuildVerificationSection(),\n\t\t\t\t\"\",\n\t\t\t\ttoolSection,\n\t\t\t\t\"\",\n\t\t\t\tbuildPoliciesSection(),\n\t\t\t\t\"\",\n\t\t\t\tbuildStyleSection(),\n\t\t\t];\n\n\tconst tuning = options.tuningSection?.trim();\n\tif (tuning) {\n\t\tsections.push(\"\", tuning);\n\t}\n\n\tconst contextFilesSection = buildContextFilesSection(options.contextFiles);\n\tif (contextFilesSection) {\n\t\tsections.push(\"\", contextFilesSection);\n\t}\n\n\tconst skillsSection = formatSkillsForPrompt(options.skills);\n\tif (skillsSection) {\n\t\tsections.push(skillsSection);\n\t}\n\n\tsections.push(\"\", `Current date: ${date}`, `Current working directory: ${promptCwd}`);\n\n\treturn sections.join(\"\\n\");\n}\n"]}

package/dist/core/extensions/builtin/compaction/repair-tool-pairs.d.ts CHANGED Viewed

@@ -1,5 +1,4 @@
 import type { Message } from "@earendil-works/pi-ai";
 export declare const TOOL_RESULT_PLACEHOLDER = "Tool output unavailable (context compacted)";
-/** Repairs orphaned tool results and dangling tool calls. */
 export declare function repairOrphanedToolResults(messages: Message[]): Message[];
 //# sourceMappingURL=repair-tool-pairs.d.ts.map

package/dist/core/extensions/builtin/compaction/repair-tool-pairs.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"repair-tool-pairs.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/compaction/repair-tool-pairs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAe,MAAM,uBAAuB,CAAC;AAElE,eAAO,MAAM,uBAAuB,gDAAgD,CAAC;~~AAgBrF~~,~~6DAA6D;AAC7D,~~wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,~~CAkDxE~~"}
1	+ {"version":3,"file":"repair-tool-pairs.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/compaction/repair-tool-pairs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAe,MAAM,uBAAuB,CAAC;AAElE,eAAO,MAAM,uBAAuB,gDAAgD,CAAC;AAErF,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CA8CxE"}

package/dist/core/extensions/builtin/compaction/repair-tool-pairs.js CHANGED Viewed

@@ -1,18 +1,4 @@
 export const TOOL_RESULT_PLACEHOLDER = "Tool output unavailable (context compacted)";
-/**
- * Retry diagnostic for a dangling tool call flagged `incomplete` by the text
- * tool-call middleware (truncated and unrecoverable at stream end). Tells the
- * model the call never ran and should be re-issued with complete arguments.
- * Duplicated verbatim in the sibling pair-repair copy — the two packages
- * intentionally do not share this constant (no new cross-package dependency).
- */
-function incompleteToolCallRetryText(name, errorMessage) {
-    if (errorMessage !== undefined) {
-        return `${errorMessage}${errorMessage.endsWith(".") ? "" : "."} Re-issue the tool call with complete arguments.`;
-    }
-    return `Tool call "${name}" was not executed: the response ended before the tool call was complete. Re-issue the tool call with complete arguments.`;
-}
-/** Repairs orphaned tool results and dangling tool calls. */
 export function repairOrphanedToolResults(messages) {
     const toolCallIds = new Set();
     const toolResultIds = new Set();
@@ -45,16 +31,12 @@ export function repairOrphanedToolResults(messages) {
             for (const block of message.content) {
                 if (block.type !== "toolCall" || !dangling.has(block.id))
                     continue;
-                const incomplete = block.incomplete === true;
-                const text = incomplete
-                    ? incompleteToolCallRetryText(block.name, block.errorMessage)
-                    : TOOL_RESULT_PLACEHOLDER;
                 output.push({
                     role: "toolResult",
                     toolCallId: block.id,
                     toolName: block.name,
-                    content: [{ type: "text", text }],
-                    isError: incomplete,
+                    content: [{ type: "text", text: TOOL_RESULT_PLACEHOLDER }],
+                    isError: false,
                     timestamp: message.timestamp ? message.timestamp + 1 : Date.now(),
                 });
                 dangling.delete(block.id);

package/dist/core/extensions/builtin/compaction/repair-tool-pairs.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"repair-tool-pairs.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/compaction/repair-tool-pairs.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,uBAAuB,GAAG,6CAA6C,CAAC;AAErF~~;;;;;;GAMG;AACH~~,SAAS,2BAA2B,CAAC,IAAY,EAAE,YAAqB;IACvE,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO,GAAG,YAAY,GAAG,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,kDAAkD,CAAC;IAClH,CAAC;IACD,OAAO,cAAc,IAAI,2HAA2H,CAAC;AACtJ,CAAC;AAED,6DAA6D;AAC7D,MAAM,UAAU,yBAAyB,CAAC,QAAmB;IAC5D,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IACtC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IACxC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAChC,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAClC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACrC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;oBAAE,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC1D,CAAC;QACF,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY;YAAE,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAElF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAChC,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YACnC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC1C,MAAM,CAAC,IAAI,CAAC;oBACX,GAAG,OAAO;oBACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAyB;iBAClF,CAAC,CAAC;gBACH,SAAS;YACV,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACrB,SAAS;QACV,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAClC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACrC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;oBAAE,SAAS;gBACnE,MAAM,~~UAAU,GAAG,KAAK,~~CAAC,~~UAAU,KAAK,~~IAAI,CAAC;~~gBAC7C,MAAM,IAAI,GAAG,UAAU;oBACtB,CAAC,CAAC,2BAA2B,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC;oBAC7D,CAAC,CAAC,uBAAuB,CAAC;gBAC3B,MAAM,CAAC,IAAI,CAAC;~~oBACX,IAAI,EAAE,YAAY;oBAClB,UAAU,EAAE,KAAK,CAAC,EAAE;oBACpB,QAAQ,EAAE,KAAK,CAAC,IAAI;oBACpB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;~~oBACjC~~,OAAO,EAAE,~~UAAU~~;~~oBACnB~~,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;iBACjE,CAAC,CAAC;gBACH,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC3B,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC","sourcesContent":["import type { Message, TextContent } from \"@earendil-works/pi-ai\";\n\nexport const TOOL_RESULT_PLACEHOLDER = \"Tool output unavailable (context compacted)\";\n\n/*\n Retry diagnostic for a dangling tool call flagged `incomplete` by the text\n * tool-call middleware (truncated and unrecoverable at stream end). Tells the\n * model the call never ran and should be re-issued with complete arguments.\n * Duplicated verbatim in the sibling pair-repair copy — the two packages\n * intentionally do not share this constant (no new cross-package dependency).\n /\nfunction incompleteToolCallRetryText(name: string, errorMessage?: string): string {\n\tif (errorMessage !== undefined) {\n\t\treturn `${errorMessage}${errorMessage.endsWith(\".\") ? \"\" : \".\"} Re-issue the tool call with complete arguments.`;\n\t}\n\treturn `Tool call \"${name}\" was not executed: the response ended before the tool call was complete. Re-issue the tool call with complete arguments.`;\n}\n\n/* Repairs orphaned tool results and dangling tool calls. */\nexport function repairOrphanedToolResults(messages: Message[]): Message[] {\n\tconst toolCallIds = new Set<string>();\n\tconst toolResultIds = new Set<string>();\n\tfor (const message of messages) {\n\t\tif (message.role === \"assistant\") {\n\t\t\tfor (const block of message.content) {\n\t\t\t\tif (block.type === \"toolCall\") toolCallIds.add(block.id);\n\t\t\t}\n\t\t}\n\t\tif (message.role === \"toolResult\") toolResultIds.add(message.toolCallId);\n\t}\n\n\tconst output: Message[] = [];\n\tconst dangling = new Set([...toolCallIds].filter((id) => !toolResultIds.has(id)));\n\n\tfor (const message of messages) {\n\t\tif (message.role === \"toolResult\") {\n\t\t\tif (!toolCallIds.has(message.toolCallId)) {\n\t\t\t\toutput.push({\n\t\t\t\t\t...message,\n\t\t\t\t\tcontent: [{ type: \"text\", text: TOOL_RESULT_PLACEHOLDER }] satisfies TextContent[],\n\t\t\t\t});\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\toutput.push(message);\n\t\t\tcontinue;\n\t\t}\n\n\t\toutput.push(message);\n\t\tif (message.role === \"assistant\") {\n\t\t\tfor (const block of message.content) {\n\t\t\t\tif (block.type !== \"toolCall\" \|\| !dangling.has(block.id)) continue;\n\t\t\t\~~tconst incomplete = block.incomplete === true;\n\t\t\t\tconst text = incomplete\n\t\t\t\t\t? incompleteToolCallRetryText(block.name, block.errorMessage)\n\t\t\t\t\t: TOOL_RESULT_PLACEHOLDER;\n\t\t\t\~~toutput.push({\n\t\t\t\t\trole: \"toolResult\",\n\t\t\t\t\ttoolCallId: block.id,\n\t\t\t\t\ttoolName: block.name,\n\t\t\t\t\tcontent: [{ type: \"text\", text }],\n\t\t\t\t\tisError: ~~incomplete~~,\n\t\t\t\t\ttimestamp: message.timestamp ? message.timestamp + 1 : Date.now(),\n\t\t\t\t});\n\t\t\t\tdangling.delete(block.id);\n\t\t\t}\n\t\t}\n\t}\n\n\treturn output;\n}\n"]}
1	+ {"version":3,"file":"repair-tool-pairs.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/compaction/repair-tool-pairs.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,uBAAuB,GAAG,6CAA6C,CAAC;AAErF,MAAM,UAAU,yBAAyB,CAAC,QAAmB;IAC5D,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IACtC,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;IACxC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAChC,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAClC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACrC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU;oBAAE,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC1D,CAAC;QACF,CAAC;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY;YAAE,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAElF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAChC,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YACnC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC1C,MAAM,CAAC,IAAI,CAAC;oBACX,GAAG,OAAO;oBACV,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAyB;iBAClF,CAAC,CAAC;gBACH,SAAS;YACV,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACrB,SAAS;QACV,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrB,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YAClC,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACrC,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;oBAAE,SAAS;gBACnE,MAAM,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,YAAY;oBAClB,UAAU,EAAE,KAAK,CAAC,EAAE;oBACpB,QAAQ,EAAE,KAAK,CAAC,IAAI;oBACpB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC;oBAC1D,OAAO,EAAE,KAAK;oBACd,SAAS,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;iBACjE,CAAC,CAAC;gBACH,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAC3B,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,MAAM,CAAC;AACf,CAAC","sourcesContent":["import type { Message, TextContent } from \"@earendil-works/pi-ai\";\n\nexport const TOOL_RESULT_PLACEHOLDER = \"Tool output unavailable (context compacted)\";\n\nexport function repairOrphanedToolResults(messages: Message[]): Message[] {\n\tconst toolCallIds = new Set<string>();\n\tconst toolResultIds = new Set<string>();\n\tfor (const message of messages) {\n\t\tif (message.role === \"assistant\") {\n\t\t\tfor (const block of message.content) {\n\t\t\t\tif (block.type === \"toolCall\") toolCallIds.add(block.id);\n\t\t\t}\n\t\t}\n\t\tif (message.role === \"toolResult\") toolResultIds.add(message.toolCallId);\n\t}\n\n\tconst output: Message[] = [];\n\tconst dangling = new Set([...toolCallIds].filter((id) => !toolResultIds.has(id)));\n\n\tfor (const message of messages) {\n\t\tif (message.role === \"toolResult\") {\n\t\t\tif (!toolCallIds.has(message.toolCallId)) {\n\t\t\t\toutput.push({\n\t\t\t\t\t...message,\n\t\t\t\t\tcontent: [{ type: \"text\", text: TOOL_RESULT_PLACEHOLDER }] satisfies TextContent[],\n\t\t\t\t});\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\toutput.push(message);\n\t\t\tcontinue;\n\t\t}\n\n\t\toutput.push(message);\n\t\tif (message.role === \"assistant\") {\n\t\t\tfor (const block of message.content) {\n\t\t\t\tif (block.type !== \"toolCall\" \|\| !dangling.has(block.id)) continue;\n\t\t\t\toutput.push({\n\t\t\t\t\trole: \"toolResult\",\n\t\t\t\t\ttoolCallId: block.id,\n\t\t\t\t\ttoolName: block.name,\n\t\t\t\t\tcontent: [{ type: \"text\", text: TOOL_RESULT_PLACEHOLDER }],\n\t\t\t\t\tisError: false,\n\t\t\t\t\ttimestamp: message.timestamp ? message.timestamp + 1 : Date.now(),\n\t\t\t\t});\n\t\t\t\tdangling.delete(block.id);\n\t\t\t}\n\t\t}\n\t}\n\n\treturn output;\n}\n"]}

package/dist/core/extensions/builtin/mcp/config-schema.d.ts CHANGED Viewed

@@ -96,10 +96,8 @@ export type McpServerConfig = Static<typeof ServerSchema> & {
     exposure: "auto" | "direct" | "search" | "proxy";
     logLevel: Static<typeof LogLevelSchema>;
 };
-/** Public raw type for extension-declared MCP servers. */
-export type McpServerDeclaration = Static<typeof ServerSchema>;
 export type McpSettings = Required<Pick<Static<typeof SettingsSchema>, "toolPrefix">> & Omit<Static<typeof SettingsSchema>, "toolPrefix">;
-export type McpServerSource = "global" | "claude" | "project" | "skill" | "extension";
+export type McpServerSource = "global" | "claude" | "project" | "skill";
 export type McpServerState = "enabled" | "disabled" | "untrusted";
 export interface ResolvedMcpServer {
     name: string;
@@ -249,11 +247,6 @@ export declare const validateConfig: import("typebox/compile").Validator<{}, Typ
         logLevel?: "alert" | "critical" | "debug" | "emergency" | "error" | "info" | "notice" | "warning" | undefined;
     }> | undefined;
 }>;
-/**
- * Validate a single extension-declared MCP server.
- * Returns a descriptive error string, or null when valid.
- */
-export declare function validateMcpServerDeclaration(name: string, raw: unknown): string | null;
 export declare const defaultSettings: McpSettings;
 export {};
 //# sourceMappingURL=config-schema.d.ts.map

package/dist/core/extensions/builtin/mcp/config-schema.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"config-schema.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/config-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAG5C,eAAO,MAAM,cAAc,wNASzB,CAAC;AAaH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BxB,CAAC;AAEF,QAAA,MAAM,cAAc;;;;;;;;;;;;EAoBnB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMxB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,CAAC;AACpD,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,GAAG;IAC3D,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,OAAO,GAAG,YAAY,CAAC;IAC3C,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;IACjD,QAAQ,EAAE,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;CACxC,CAAC;AACF,~~0DAA0D;AAC1D,~~MAAM,MAAM,~~oBAAoB,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,CAAC;AAC/D,MAAM,MAAM,~~WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,cAAc,CAAC,EAAE,YAAY,CAAC,CAAC,GACpF,IAAI,CAAC,MAAM,CAAC,OAAO,cAAc,CAAC,EAAE,YAAY,CAAC,CAAC;AACnD,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,~~GAAG,WAAW,~~CAAC;~~AACtF~~,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,UAAU,GAAG,WAAW,CAAC;AAElE,MAAM,WAAW,iBAAiB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,cAAc,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,EAAE,WAAW,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC3C,WAAW,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IACzC,cAAc,EAAE,OAAO,CAAC;CACxB;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAYtF;AAED,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAwB,CAAC;~~AAGpD;;;GAGG;AACH~~,~~wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAkBtF;AAED,~~eAAO,MAAM,eAAe,EAAE,WAI7B,CAAC"}
1	+ {"version":3,"file":"config-schema.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/config-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAG5C,eAAO,MAAM,cAAc,wNASzB,CAAC;AAaH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BxB,CAAC;AAEF,QAAA,MAAM,cAAc;;;;;;;;;;;;EAoBnB,CAAC;AAEF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMxB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,CAAC;AACpD,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,GAAG;IAC3D,IAAI,EAAE,OAAO,GAAG,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,GAAG,OAAO,GAAG,YAAY,CAAC;IAC3C,gBAAgB,EAAE,MAAM,CAAC;IACzB,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;IACjD,QAAQ,EAAE,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;CACxC,CAAC;AACF,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,cAAc,CAAC,EAAE,YAAY,CAAC,CAAC,GACpF,IAAI,CAAC,MAAM,CAAC,OAAO,cAAc,CAAC,EAAE,YAAY,CAAC,CAAC;AACnD,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC;AACxE,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,UAAU,GAAG,WAAW,CAAC;AAElE,MAAM,WAAW,iBAAiB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,cAAc,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,eAAe,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,EAAE,WAAW,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC3C,WAAW,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IACzC,cAAc,EAAE,OAAO,CAAC;CACxB;AAED,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,GAAG,SAAS,CAYtF;AAED,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAAwB,CAAC;AACpD,eAAO,MAAM,eAAe,EAAE,WAI7B,CAAC"}

package/dist/core/extensions/builtin/mcp/config-schema.js CHANGED Viewed

@@ -71,29 +71,6 @@ export function getServerEndpointValidationError(config) {
     return undefined;
 }
 export const validateConfig = Compile(ConfigSchema);
-const validateServer = Compile(ServerSchema);
-/**
- * Validate a single extension-declared MCP server.
- * Returns a descriptive error string, or null when valid.
- */
-export function validateMcpServerDeclaration(name, raw) {
-    if (!validateServer.Check(raw)) {
-        const error = Array.from(validateServer.Errors(raw))[0];
-        const path = error.instancePath
-            .replace(/^\//, "")
-            .split("/")
-            .map((p) => p.replace(/~1/g, "/").replace(/~0/g, "~"))
-            .join(".") || "$";
-        const message = error.message === "must be array" ? "Expected array" : error.message;
-        return `Invalid MCP server declaration "${name}": ${path}: ${message}`;
-    }
-    const server = raw;
-    const endpointError = getServerEndpointValidationError({ mcpServers: { [name]: server } });
-    if (endpointError) {
-        return `Invalid MCP server declaration "${name}": ${endpointError}`;
-    }
-    return null;
-}
 export const defaultSettings = {
     outputGuard: { maxBytes: 50 * 1024, maxLines: 2000 },
     searchThreshold: 10,

package/dist/core/extensions/builtin/mcp/config-schema.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"config-schema.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/config-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,IAAI,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,MAAM,CAAC,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC;IACxC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IACrB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;IACpB,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;IACtB,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;IACvB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IACrB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;IACxB,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;IACrB,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;CACzB,CAAC,CAAC;AAEH,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAC9B;IACC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IACtC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAC1E,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC/C,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;CAC3F,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAC/B,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CACtC;IACC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC9E,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IACjC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IACrC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9C,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAC7D,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IACjC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACjE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACrG,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC5C,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;IACjC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IACtC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC/G,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC5C,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC9C,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC9C,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACtD,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACtD,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;IACnF,QAAQ,EAAE,IAAI,CAAC,QAAQ,CACtB,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CACzG;IACD,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC;CACvC,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAC/B,CAAC;AAEF,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CACjC;IACC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IACxC,eAAe,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC7C,WAAW,EAAE,IAAI,CAAC,QAAQ,CACzB,IAAI,CAAC,MAAM,CACV;QACC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACtC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;QACtC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;KACvC,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAC/B,CACD;IACD,aAAa,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChE,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC9C,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IACvC,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;CACnF,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAC/B,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CACtC;IACC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC;IACvC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,YAAY,CAAC,CAAC;CACnE,EACD,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAC/B,CAAC;AA4CF,MAAM,UAAU,gCAAgC,CAAC,MAAiB;IACjE,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,CAAC;QACtE,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK;YAAE,SAAS;QACvC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAC5D,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;YAC9F,OAAO,cAAc,IAAI,6CAA6C,CAAC;QACxE,CAAC;QACD,IAAI,IAAI,KAAK,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,KAAK,SAAS,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;YACrF,OAAO,cAAc,IAAI,wCAAwC,CAAC;QACnE,CAAC;IACF,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AACpD,MAAM,cAAc,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;AAE7C;;;GAGG;AACH,MAAM,UAAU,4BAA4B,CAAC,IAAY,EAAE,GAAY;IACtE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,MAAM,IAAI,GACT,KAAK,CAAC,YAAY;aAChB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;aAClB,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;aACrD,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;QACpB,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,KAAK,eAAe,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;QACrF,OAAO,mCAAmC,IAAI,MAAM,IAAI,KAAK,OAAO,EAAE,CAAC;IACxE,CAAC;IACD,MAAM,MAAM,GAAG,GAA2B,CAAC;IAC3C,MAAM,aAAa,GAAG,gCAAgC,CAAC,EAAE,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAC3F,IAAI,aAAa,EAAE,CAAC;QACnB,OAAO,mCAAmC,IAAI,MAAM,aAAa,EAAE,CAAC;IACrE,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAgB;IAC3C,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;IACpD,eAAe,EAAE,EAAE;IACnB,UAAU,EAAE,KAAK;CACjB,CAAC","sourcesContent":["import { type Static, Type } from \"typebox\";\nimport { Compile } from \"typebox/compile\";\n\nexport const LogLevelSchema = Type.Union([\n\tType.Literal(\"debug\"),\n\tType.Literal(\"info\"),\n\tType.Literal(\"notice\"),\n\tType.Literal(\"warning\"),\n\tType.Literal(\"error\"),\n\tType.Literal(\"critical\"),\n\tType.Literal(\"alert\"),\n\tType.Literal(\"emergency\"),\n]);\n\nconst OAuthSchema = Type.Object(\n\t{\n\t\tclientId: Type.Optional(Type.String()),\n\t\tcallbackPort: Type.Optional(Type.Integer({ minimum: 0, maximum: 65_535 })),\n\t\tscopes: Type.Optional(Type.Array(Type.String())),\n\t\tclientMetadataUrl: Type.Optional(Type.String()),\n\t\tflow: Type.Optional(Type.Union([Type.Literal(\"code\"), Type.Literal(\"client_credentials\")])),\n\t},\n\t{ additionalProperties: false },\n);\n\nexport const ServerSchema = Type.Object(\n\t{\n\t\ttype: Type.Optional(Type.Union([Type.Literal(\"stdio\"), Type.Literal(\"http\")])),\n\t\turl: Type.Optional(Type.String()),\n\t\tcommand: Type.Optional(Type.String()),\n\t\targs: Type.Optional(Type.Array(Type.String())),\n\t\tenv: Type.Optional(Type.Record(Type.String(), Type.String())),\n\t\tcwd: Type.Optional(Type.String()),\n\t\theaders: Type.Optional(Type.Record(Type.String(), Type.String())),\n\t\tauth: Type.Optional(Type.Union([Type.Literal(\"bearer\"), Type.Literal(\"oauth\"), Type.Literal(false)])),\n\t\tbearerTokenEnv: Type.Optional(Type.String()),\n\t\toauth: Type.Optional(OAuthSchema),\n\t\tenabled: Type.Optional(Type.Boolean()),\n\t\tlifecycle: Type.Optional(Type.Union([Type.Literal(\"lazy\"), Type.Literal(\"eager\"), Type.Literal(\"keep-alive\")])),\n\t\tidleTimeoutMin: Type.Optional(Type.Number()),\n\t\trequestTimeoutMs: Type.Optional(Type.Number()),\n\t\tconnectTimeoutMs: Type.Optional(Type.Number()),\n\t\tincludeTools: Type.Optional(Type.Array(Type.String())),\n\t\texcludeTools: Type.Optional(Type.Array(Type.String())),\n\t\tdirectTools: Type.Optional(Type.Union([Type.Boolean(), Type.Array(Type.String())])),\n\t\texposure: Type.Optional(\n\t\t\tType.Union([Type.Literal(\"auto\"), Type.Literal(\"direct\"), Type.Literal(\"search\"), Type.Literal(\"proxy\")]),\n\t\t),\n\t\tlogLevel: Type.Optional(LogLevelSchema),\n\t},\n\t{ additionalProperties: false },\n);\n\nconst SettingsSchema = Type.Object(\n\t{\n\t\ttoolPrefix: Type.Optional(Type.String()),\n\t\tsearchThreshold: Type.Optional(Type.Number()),\n\t\toutputGuard: Type.Optional(\n\t\t\tType.Object(\n\t\t\t\t{\n\t\t\t\t\tmaxBytes: Type.Optional(Type.Number()),\n\t\t\t\t\tmaxLines: Type.Optional(Type.Number()),\n\t\t\t\t\tmaxTokens: Type.Optional(Type.Number()),\n\t\t\t\t},\n\t\t\t\t{ additionalProperties: false },\n\t\t\t),\n\t\t),\n\t\timportConfigs: Type.Optional(Type.Array(Type.Literal(\"claude\"))),\n\t\toauthCallbackUrl: Type.Optional(Type.String()),\n\t\tstubSwap: Type.Optional(Type.Boolean()),\n\t\tnativeToolSearch: Type.Optional(Type.Union([Type.Literal(\"auto\"), Type.Boolean()])),\n\t},\n\t{ additionalProperties: false },\n);\n\nexport const ConfigSchema = Type.Object(\n\t{\n\t\tsettings: Type.Optional(SettingsSchema),\n\t\tmcpServers: Type.Optional(Type.Record(Type.String(), ServerSchema)),\n\t},\n\t{ additionalProperties: false },\n);\n\nexport type RawConfig = Static<typeof ConfigSchema>;\nexport type McpServerConfig = Static<typeof ServerSchema> & {\n\ttype: \"stdio\" \| \"http\";\n\targs: string[];\n\tenabled: boolean;\n\tlifecycle: \"lazy\" \| \"eager\" \| \"keep-alive\";\n\tconnectTimeoutMs: number;\n\trequestTimeoutMs: number;\n\tidleTimeoutMin: number;\n\texposure: \"auto\" \| \"direct\" \| \"search\" \| \"proxy\";\n\tlogLevel: Static<typeof LogLevelSchema>;\n};\n/** Public raw type for extension-declared MCP servers. /\nexport type McpServerDeclaration = Static<typeof ServerSchema>;\nexport type McpSettings = Required<Pick<Static<typeof SettingsSchema>, \"toolPrefix\">> &\n\tOmit<Static<typeof SettingsSchema>, \"toolPrefix\">;\nexport type McpServerSource = \"global\" \| \"claude\" \| \"project\" \| \"skill\" \| \"extension\";\nexport type McpServerState = \"enabled\" \| \"disabled\" \| \"untrusted\";\n\nexport interface ResolvedMcpServer {\n\tname: string;\n\tsource: McpServerSource;\n\tsourcePath: string;\n\tstate: McpServerState;\n\ttransport?: \"stdio\" \| \"http\";\n\tconfigHash?: string;\n\tconfig?: McpServerConfig;\n}\n\nexport interface ResolvedMcpConfig {\n\tsettings: McpSettings;\n\tservers: Record<string, ResolvedMcpServer>;\n\tdiagnostics: string[];\n}\n\nexport interface LoadMcpConfigOptions {\n\tcwd: string;\n\tagentDir?: string;\n\tenv?: Record<string, string \| undefined>;\n\tprojectTrusted: boolean;\n}\n\nexport function getServerEndpointValidationError(config: RawConfig): string \| undefined {\n\tfor (const [name, server] of Object.entries(config.mcpServers ?? {})) {\n\t\tif (server.enabled === false) continue;\n\t\tconst type = server.type ?? (server.url ? \"http\" : \"stdio\");\n\t\tif (type === \"stdio\" && (server.command === undefined \|\| server.command.trim().length === 0)) {\n\t\t\treturn `mcpServers.${name}.command: Required for enabled stdio server`;\n\t\t}\n\t\tif (type === \"http\" && (server.url === undefined \|\| server.url.trim().length === 0)) {\n\t\t\treturn `mcpServers.${name}.url: Required for enabled http server`;\n\t\t}\n\t}\n\treturn undefined;\n}\n\nexport const validateConfig = Compile(ConfigSchema);\nconst validateServer = Compile(ServerSchema);\n\n/\n Validate a single extension-declared MCP server.\n * Returns a descriptive error string, or null when valid.\n /\nexport function validateMcpServerDeclaration(name: string, raw: unknown): string \| null {\n\tif (!validateServer.Check(raw)) {\n\t\tconst error = Array.from(validateServer.Errors(raw))[0];\n\t\tconst path =\n\t\t\terror.instancePath\n\t\t\t\t.replace(/^\\//, \"\")\n\t\t\t\t.split(\"/\")\n\t\t\t\t.map((p) => p.replace(/~1/g, \"/\").replace(/~0/g, \"~\"))\n\t\t\t\t.join(\".\") \|\| \"$\";\n\t\tconst message = error.message === \"must be array\" ? \"Expected array\" : error.message;\n\t\treturn `Invalid MCP server declaration \"${name}\": ${path}: ${message}`;\n\t}\n\tconst server = raw as McpServerDeclaration;\n\tconst endpointError = getServerEndpointValidationError({ mcpServers: { [name]: server } });\n\tif (endpointError) {\n\t\treturn `Invalid MCP server declaration \"${name}\": ${endpointError}`;\n\t}\n\treturn null;\n}\n\nexport const defaultSettings: McpSettings = {\n\toutputGuard: { maxBytes: 50 1024, maxLines: 2000 },\n\tsearchThreshold: 10,\n\ttoolPrefix: \"mcp\",\n};\n"]}
1	+ {"version":3,"file":"config-schema.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/config-schema.ts"],"names":[],"mappings":"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","sourcesContent":["import { type Static, Type } from \"typebox\";\nimport { Compile } from \"typebox/compile\";\n\nexport const LogLevelSchema = Type.Union([\n\tType.Literal(\"debug\"),\n\tType.Literal(\"info\"),\n\tType.Literal(\"notice\"),\n\tType.Literal(\"warning\"),\n\tType.Literal(\"error\"),\n\tType.Literal(\"critical\"),\n\tType.Literal(\"alert\"),\n\tType.Literal(\"emergency\"),\n]);\n\nconst OAuthSchema = Type.Object(\n\t{\n\t\tclientId: Type.Optional(Type.String()),\n\t\tcallbackPort: Type.Optional(Type.Integer({ minimum: 0, maximum: 65_535 })),\n\t\tscopes: Type.Optional(Type.Array(Type.String())),\n\t\tclientMetadataUrl: Type.Optional(Type.String()),\n\t\tflow: Type.Optional(Type.Union([Type.Literal(\"code\"), Type.Literal(\"client_credentials\")])),\n\t},\n\t{ additionalProperties: false },\n);\n\nexport const ServerSchema = Type.Object(\n\t{\n\t\ttype: Type.Optional(Type.Union([Type.Literal(\"stdio\"), Type.Literal(\"http\")])),\n\t\turl: Type.Optional(Type.String()),\n\t\tcommand: Type.Optional(Type.String()),\n\t\targs: Type.Optional(Type.Array(Type.String())),\n\t\tenv: Type.Optional(Type.Record(Type.String(), Type.String())),\n\t\tcwd: Type.Optional(Type.String()),\n\t\theaders: Type.Optional(Type.Record(Type.String(), Type.String())),\n\t\tauth: Type.Optional(Type.Union([Type.Literal(\"bearer\"), Type.Literal(\"oauth\"), Type.Literal(false)])),\n\t\tbearerTokenEnv: Type.Optional(Type.String()),\n\t\toauth: Type.Optional(OAuthSchema),\n\t\tenabled: Type.Optional(Type.Boolean()),\n\t\tlifecycle: Type.Optional(Type.Union([Type.Literal(\"lazy\"), Type.Literal(\"eager\"), Type.Literal(\"keep-alive\")])),\n\t\tidleTimeoutMin: Type.Optional(Type.Number()),\n\t\trequestTimeoutMs: Type.Optional(Type.Number()),\n\t\tconnectTimeoutMs: Type.Optional(Type.Number()),\n\t\tincludeTools: Type.Optional(Type.Array(Type.String())),\n\t\texcludeTools: Type.Optional(Type.Array(Type.String())),\n\t\tdirectTools: Type.Optional(Type.Union([Type.Boolean(), Type.Array(Type.String())])),\n\t\texposure: Type.Optional(\n\t\t\tType.Union([Type.Literal(\"auto\"), Type.Literal(\"direct\"), Type.Literal(\"search\"), Type.Literal(\"proxy\")]),\n\t\t),\n\t\tlogLevel: Type.Optional(LogLevelSchema),\n\t},\n\t{ additionalProperties: false },\n);\n\nconst SettingsSchema = Type.Object(\n\t{\n\t\ttoolPrefix: Type.Optional(Type.String()),\n\t\tsearchThreshold: Type.Optional(Type.Number()),\n\t\toutputGuard: Type.Optional(\n\t\t\tType.Object(\n\t\t\t\t{\n\t\t\t\t\tmaxBytes: Type.Optional(Type.Number()),\n\t\t\t\t\tmaxLines: Type.Optional(Type.Number()),\n\t\t\t\t\tmaxTokens: Type.Optional(Type.Number()),\n\t\t\t\t},\n\t\t\t\t{ additionalProperties: false },\n\t\t\t),\n\t\t),\n\t\timportConfigs: Type.Optional(Type.Array(Type.Literal(\"claude\"))),\n\t\toauthCallbackUrl: Type.Optional(Type.String()),\n\t\tstubSwap: Type.Optional(Type.Boolean()),\n\t\tnativeToolSearch: Type.Optional(Type.Union([Type.Literal(\"auto\"), Type.Boolean()])),\n\t},\n\t{ additionalProperties: false },\n);\n\nexport const ConfigSchema = Type.Object(\n\t{\n\t\tsettings: Type.Optional(SettingsSchema),\n\t\tmcpServers: Type.Optional(Type.Record(Type.String(), ServerSchema)),\n\t},\n\t{ additionalProperties: false },\n);\n\nexport type RawConfig = Static<typeof ConfigSchema>;\nexport type McpServerConfig = Static<typeof ServerSchema> & {\n\ttype: \"stdio\" \| \"http\";\n\targs: string[];\n\tenabled: boolean;\n\tlifecycle: \"lazy\" \| \"eager\" \| \"keep-alive\";\n\tconnectTimeoutMs: number;\n\trequestTimeoutMs: number;\n\tidleTimeoutMin: number;\n\texposure: \"auto\" \| \"direct\" \| \"search\" \| \"proxy\";\n\tlogLevel: Static<typeof LogLevelSchema>;\n};\nexport type McpSettings = Required<Pick<Static<typeof SettingsSchema>, \"toolPrefix\">> &\n\tOmit<Static<typeof SettingsSchema>, \"toolPrefix\">;\nexport type McpServerSource = \"global\" \| \"claude\" \| \"project\" \| \"skill\";\nexport type McpServerState = \"enabled\" \| \"disabled\" \| \"untrusted\";\n\nexport interface ResolvedMcpServer {\n\tname: string;\n\tsource: McpServerSource;\n\tsourcePath: string;\n\tstate: McpServerState;\n\ttransport?: \"stdio\" \| \"http\";\n\tconfigHash?: string;\n\tconfig?: McpServerConfig;\n}\n\nexport interface ResolvedMcpConfig {\n\tsettings: McpSettings;\n\tservers: Record<string, ResolvedMcpServer>;\n\tdiagnostics: string[];\n}\n\nexport interface LoadMcpConfigOptions {\n\tcwd: string;\n\tagentDir?: string;\n\tenv?: Record<string, string \| undefined>;\n\tprojectTrusted: boolean;\n}\n\nexport function getServerEndpointValidationError(config: RawConfig): string \| undefined {\n\tfor (const [name, server] of Object.entries(config.mcpServers ?? {})) {\n\t\tif (server.enabled === false) continue;\n\t\tconst type = server.type ?? (server.url ? \"http\" : \"stdio\");\n\t\tif (type === \"stdio\" && (server.command === undefined \|\| server.command.trim().length === 0)) {\n\t\t\treturn `mcpServers.${name}.command: Required for enabled stdio server`;\n\t\t}\n\t\tif (type === \"http\" && (server.url === undefined \|\| server.url.trim().length === 0)) {\n\t\t\treturn `mcpServers.${name}.url: Required for enabled http server`;\n\t\t}\n\t}\n\treturn undefined;\n}\n\nexport const validateConfig = Compile(ConfigSchema);\nexport const defaultSettings: McpSettings = {\n\toutputGuard: { maxBytes: 50 * 1024, maxLines: 2000 },\n\tsearchThreshold: 10,\n\ttoolPrefix: \"mcp\",\n};\n"]}

package/dist/core/extensions/builtin/mcp/config.d.ts CHANGED Viewed

@@ -1,22 +1,9 @@
-import type { RegisteredMcpServerDeclaration } from "../../types.ts";
 import { type LoadMcpConfigOptions, type RawConfig, type ResolvedMcpConfig, type ResolvedMcpServer } from "./config-schema.ts";
 export declare class McpConfigValidationError extends Error {
     constructor(message: string);
 }
 export declare function loadMcpConfig(options: LoadMcpConfigOptions): ResolvedMcpConfig;
 export declare function visitSpawnableMcpServers(config: ResolvedMcpConfig, visit: (name: string, server: ResolvedMcpServer) => void): void;
-/**
- * Resolve an extension-declared MCP server. Preserves the declared exposure,
- * directTools, filters, lifecycle, and enabled state. A stdio declaration
- * without an explicit `cwd` defaults to the extension's registration cwd.
- */
-export declare function resolveExtensionMcpServer(name: string, raw: NonNullable<RawConfig["mcpServers"]>[string], sourcePath: string, registrationCwd: string): ResolvedMcpServer;
-/**
- * Merge extension-declared MCP servers into a resolved config. Trusted file
- * sources (global/claude/project) win, including disabled entries. An
- * extension entry replaces an untrusted placeholder and records a diagnostic.
- */
-export declare function mergeExtensionMcpServers(result: ResolvedMcpConfig, declarations: readonly RegisteredMcpServerDeclaration[]): void;
 /**
  * Resolve a skill-declared MCP server (mcp.json sidecar or SKILL.md
  * frontmatter). Exposure is forced to search with no directTools so the

package/dist/core/extensions/builtin/mcp/config.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/config.ts"],"names":[],"mappings":"AAKA,OAAO,~~KAAK,EAAE,8BAA8B,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,~~EAGN,KAAK,oBAAoB,EAIzB,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EAEtB,MAAM,oBAAoB,CAAC;AAE5B,qBAAa,wBAAyB,SAAQ,KAAK;IAClD,YAAY,OAAO,EAAE,MAAM,EAG1B;CACD;AASD,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,iBAAiB,CAqD9E;AAED,wBAAgB,wBAAwB,CACvC,MAAM,EAAE,iBAAiB,EACzB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,KAAK,IAAI,GACtD,IAAI,CAMN;AA6GD;;;;GAIG;AACH,wBAAgB,yBAAyB,CACxC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,EACjD,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,MAAM,GACrB,iBAAiB,CAYnB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACvC,MAAM,EAAE,iBAAiB,EACzB,YAAY,EAAE,SAAS,8BAA8B,EAAE,GACrD,IAAI,CAqBN;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACpC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,EACjD,UAAU,EAAE,MAAM,GAChB,iBAAiB,CAWnB"}
1	+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/config.ts"],"names":[],"mappings":"AAKA,OAAO,EAGN,KAAK,oBAAoB,EAIzB,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,iBAAiB,EAEtB,MAAM,oBAAoB,CAAC;AAE5B,qBAAa,wBAAyB,SAAQ,KAAK;IAClD,YAAY,OAAO,EAAE,MAAM,EAG1B;CACD;AASD,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,iBAAiB,CAqD9E;AAED,wBAAgB,wBAAwB,CACvC,MAAM,EAAE,iBAAiB,EACzB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,KAAK,IAAI,GACtD,IAAI,CAMN;AA6GD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACpC,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,WAAW,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,EACjD,UAAU,EAAE,MAAM,GAChB,iBAAiB,CAWnB"}

package/dist/core/extensions/builtin/mcp/config.js CHANGED Viewed

@@ -151,42 +151,6 @@ function readServerNames(raw) {
         return [];
     return Object.keys(servers);
 }
-/**
- * Resolve an extension-declared MCP server. Preserves the declared exposure,
- * directTools, filters, lifecycle, and enabled state. A stdio declaration
- * without an explicit `cwd` defaults to the extension's registration cwd.
- */
-export function resolveExtensionMcpServer(name, raw, sourcePath, registrationCwd) {
-    const withCwd = { ...raw, cwd: raw.cwd ?? registrationCwd };
-    const config = normalizeServer(withCwd);
-    return {
-        config,
-        configHash: hashConfig(config),
-        name,
-        source: "extension",
-        sourcePath,
-        state: config.enabled ? "enabled" : "disabled",
-        transport: config.type,
-    };
-}
-/**
- * Merge extension-declared MCP servers into a resolved config. Trusted file
- * sources (global/claude/project) win, including disabled entries. An
- * extension entry replaces an untrusted placeholder and records a diagnostic.
- */
-export function mergeExtensionMcpServers(result, declarations) {
-    for (const decl of declarations) {
-        const existing = result.servers[decl.name];
-        if (existing !== undefined && existing.state !== "untrusted") {
-            result.diagnostics.push(`Extension MCP server '${decl.name}' from ${decl.extensionPath} skipped; ${existing.source} config at ${existing.sourcePath} wins.`);
-            continue;
-        }
-        if (existing !== undefined) {
-            result.diagnostics.push(`Extension MCP server '${decl.name}' from ${decl.extensionPath} replaces untrusted ${existing.source} placeholder from ${existing.sourcePath}.`);
-        }
-        result.servers[decl.name] = resolveExtensionMcpServer(decl.name, decl.config, decl.extensionPath, decl.registrationCwd);
-    }
-}
 /**
  * Resolve a skill-declared MCP server (mcp.json sidecar or SKILL.md
  * frontmatter). Exposure is forced to search with no directTools so the

package/dist/core/extensions/builtin/mcp/config.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/config.ts"],"names":[],"mappings":"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","sourcesContent":["import { createHash } from \"node:crypto\";\nimport { existsSync, readFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport type { TLocalizedValidationError } from \"typebox/error\";\nimport { CONFIG_DIR_NAME, getAgentDir } from \"../../../../config.ts\";\nimport type { RegisteredMcpServerDeclaration } from \"../../types.ts\";\nimport {\n\tdefaultSettings,\n\tgetServerEndpointValidationError,\n\ttype LoadMcpConfigOptions,\n\ttype McpServerConfig,\n\ttype McpServerSource,\n\ttype McpSettings,\n\ttype RawConfig,\n\ttype ResolvedMcpConfig,\n\ttype ResolvedMcpServer,\n\tvalidateConfig,\n} from \"./config-schema.ts\";\n\nexport class McpConfigValidationError extends Error {\n\tconstructor(message: string) {\n\t\tsuper(message);\n\t\tthis.name = \"McpConfigValidationError\";\n\t}\n}\n\ninterface JsonReadResult {\n\traw: unknown;\n\tdiagnostic?: string;\n}\n\nconst trustedEnv = process.env as Record<string, string \| undefined>;\n\nexport function loadMcpConfig(options: LoadMcpConfigOptions): ResolvedMcpConfig {\n\tconst agentDir = options.agentDir ?? getAgentDir();\n\tconst env = options.env ?? trustedEnv;\n\tconst globalPath = join(agentDir, \"mcp.json\");\n\tconst projectPath = join(options.cwd, CONFIG_DIR_NAME, \"mcp.json\");\n\tconst claudePath = join(options.cwd, \".mcp.json\");\n\tconst globalConfig = readTrustedConfig(globalPath, env);\n\tconst projectRead = readConfigJson(projectPath, options.projectTrusted);\n\tconst projectRaw = projectRead.raw;\n\tconst preliminary = mergeConfigs(\n\t\tglobalConfig,\n\t\toptions.projectTrusted ? validateRaw(projectRaw, projectPath) : undefined,\n\t);\n\tconst shouldImportClaude = preliminary.settings?.importConfigs?.includes(\"claude\") === true;\n\tconst claudeRead = shouldImportClaude ? readConfigJson(claudePath, options.projectTrusted) : { raw: undefined };\n\tconst claudeRaw = claudeRead.raw;\n\tconst sources = [\n\t\t{ config: globalConfig, path: globalPath, source: \"global\" as const, trusted: true },\n\t\t{\n\t\t\tconfig:\n\t\t\t\toptions.projectTrusted && shouldImportClaude ? readTrustedConfig(claudePath, env, claudeRaw) : undefined,\n\t\t\tpath: claudePath,\n\t\t\tsource: \"claude\" as const,\n\t\t\ttrusted: options.projectTrusted,\n\t\t},\n\t\t{\n\t\t\tconfig: options.projectTrusted ? readTrustedConfig(projectPath, env, projectRaw) : undefined,\n\t\t\tpath: projectPath,\n\t\t\tsource: \"project\" as const,\n\t\t\ttrusted: options.projectTrusted,\n\t\t},\n\t];\n\tconst merged = mergeConfigs(...sources.map((item) => item.config));\n\tconst result: ResolvedMcpConfig = { diagnostics: [], servers: {}, settings: normalizeSettings(merged.settings) };\n\tfor (const diagnostic of [projectRead.diagnostic, claudeRead.diagnostic]) {\n\t\tif (diagnostic) result.diagnostics.push(diagnostic);\n\t}\n\n\tfor (const item of sources) {\n\t\tif (item.trusted && item.config?.mcpServers) {\n\t\t\taddTrustedServers(result, item.config.mcpServers, item.source, item.path);\n\t\t\tcontinue;\n\t\t}\n\t\tif (!item.trusted) {\n\t\t\taddUntrustedServers(\n\t\t\t\tresult,\n\t\t\t\treadServerNames(item.source === \"claude\" ? claudeRaw : projectRaw),\n\t\t\t\titem.source,\n\t\t\t\titem.path,\n\t\t\t);\n\t\t}\n\t}\n\treturn result;\n}\n\nexport function visitSpawnableMcpServers(\n\tconfig: ResolvedMcpConfig,\n\tvisit: (name: string, server: ResolvedMcpServer) => void,\n): void {\n\tfor (const [name, server] of Object.entries(config.servers)) {\n\t\tif (server.state === \"enabled\") {\n\t\t\tvisit(name, server);\n\t\t}\n\t}\n}\n\nfunction readTrustedConfig(\n\tpath: string,\n\tenv: Record<string, string \| undefined>,\n\traw = readConfigJson(path, true).raw,\n): RawConfig \| undefined {\n\tconst config = interpolateConfig(validateRaw(raw, path), env);\n\tconst endpointError = config ? getServerEndpointValidationError(config) : undefined;\n\tif (endpointError) throw new McpConfigValidationError(`Invalid MCP config at ${endpointError}`);\n\treturn config;\n}\n\nfunction readConfigJson(path: string, trusted: boolean): JsonReadResult {\n\tif (!existsSync(path)) return { raw: undefined };\n\ttry {\n\t\tconst raw: unknown = JSON.parse(readFileSync(path, \"utf-8\"));\n\t\treturn { raw };\n\t} catch (error) {\n\t\tconst reason = error instanceof Error ? error.message : String(error);\n\t\tif (trusted) throw new McpConfigValidationError(`Invalid MCP config at ${path}: ${reason}`);\n\t\treturn { raw: undefined, diagnostic: `Blocked untrusted MCP config at ${path}: invalid JSON (${reason})` };\n\t}\n}\n\nfunction validateRaw(raw: unknown, _path: string): RawConfig \| undefined {\n\tif (raw === undefined) return undefined;\n\tif (validateConfig.Check(raw)) {\n\t\tconst config = raw as RawConfig;\n\t\tconst endpointError = getServerEndpointValidationError(config);\n\t\tif (endpointError) throw new McpConfigValidationError(`Invalid MCP config at ${endpointError}`);\n\t\treturn config;\n\t}\n\tconst error = Array.from(validateConfig.Errors(raw))[0];\n\tthrow new McpConfigValidationError(`Invalid MCP config at ${formatErrorPath(error)}: ${formatErrorMessage(error)}`);\n}\n\nfunction formatErrorPath(error: TLocalizedValidationError): string {\n\tconst trimmed = error.instancePath.replace(/^\\//, \"\");\n\treturn trimmed.length === 0 ? \"$\" : trimmed.split(\"/\").map(decodePathPart).join(\".\");\n}\n\nfunction decodePathPart(part: string): string {\n\treturn part.replace(/~1/g, \"/\").replace(/~0/g, \"~\");\n}\n\nfunction formatErrorMessage(error: TLocalizedValidationError): string {\n\treturn error.message === \"must be array\" ? \"Expected array\" : error.message;\n}\n\nfunction mergeConfigs(...configs: (RawConfig \| undefined)[]): RawConfig {\n\tconst merged: RawConfig = {};\n\tfor (const config of configs) {\n\t\tif (!config) continue;\n\t\tmerged.settings = { ...(merged.settings ?? {}), ...(config.settings ?? {}) };\n\t\tmerged.mcpServers = { ...(merged.mcpServers ?? {}), ...(config.mcpServers ?? {}) };\n\t}\n\treturn merged;\n}\n\nfunction normalizeSettings(settings: RawConfig[\"settings\"]): McpSettings {\n\treturn { ...defaultSettings, ...settings };\n}\n\nfunction addTrustedServers(\n\tresult: ResolvedMcpConfig,\n\tservers: NonNullable<RawConfig[\"mcpServers\"]>,\n\tsource: McpServerSource,\n\tsourcePath: string,\n): void {\n\tfor (const [name, server] of Object.entries(servers)) {\n\t\tconst config = normalizeServer(server);\n\t\tresult.servers[name] = {\n\t\t\tconfig,\n\t\t\tconfigHash: hashConfig(config),\n\t\t\tname,\n\t\t\tsource,\n\t\t\tsourcePath,\n\t\t\tstate: config.enabled ? \"enabled\" : \"disabled\",\n\t\t\ttransport: config.type,\n\t\t};\n\t}\n}\n\nfunction addUntrustedServers(\n\tresult: ResolvedMcpConfig,\n\tnames: readonly string[],\n\tsource: McpServerSource,\n\tsourcePath: string,\n): void {\n\tfor (const name of names) {\n\t\tconst existing = result.servers[name];\n\t\tif (existing && existing.state !== \"untrusted\") {\n\t\t\tresult.diagnostics.push(\n\t\t\t\t`Blocked untrusted ${source} MCP server '${name}' from shadowing trusted ${existing.source} server.`,\n\t\t\t);\n\t\t\tcontinue;\n\t\t}\n\t\tresult.servers[name] = { name, source, sourcePath, state: \"untrusted\" };\n\t}\n}\n\nfunction readServerNames(raw: unknown): string[] {\n\tif (typeof raw !== \"object\" \|\| raw === null \|\| Array.isArray(raw)) return [];\n\tconst servers = (raw as { mcpServers?: unknown }).mcpServers;\n\tif (typeof servers !== \"object\" \|\| servers === null \|\| Array.isArray(servers)) return [];\n\treturn Object.keys(servers);\n}\n\n/*\n Resolve an extension-declared MCP server. Preserves the declared exposure,\n * directTools, filters, lifecycle, and enabled state. A stdio declaration\n * without an explicit `cwd` defaults to the extension's registration cwd.\n /\nexport function resolveExtensionMcpServer(\n\tname: string,\n\traw: NonNullable<RawConfig[\"mcpServers\"]>[string],\n\tsourcePath: string,\n\tregistrationCwd: string,\n): ResolvedMcpServer {\n\tconst withCwd = { ...raw, cwd: raw.cwd ?? registrationCwd };\n\tconst config = normalizeServer(withCwd);\n\treturn {\n\t\tconfig,\n\t\tconfigHash: hashConfig(config),\n\t\tname,\n\t\tsource: \"extension\",\n\t\tsourcePath,\n\t\tstate: config.enabled ? \"enabled\" : \"disabled\",\n\t\ttransport: config.type,\n\t};\n}\n\n/\n Merge extension-declared MCP servers into a resolved config. Trusted file\n * sources (global/claude/project) win, including disabled entries. An\n * extension entry replaces an untrusted placeholder and records a diagnostic.\n /\nexport function mergeExtensionMcpServers(\n\tresult: ResolvedMcpConfig,\n\tdeclarations: readonly RegisteredMcpServerDeclaration[],\n): void {\n\tfor (const decl of declarations) {\n\t\tconst existing = result.servers[decl.name];\n\t\tif (existing !== undefined && existing.state !== \"untrusted\") {\n\t\t\tresult.diagnostics.push(\n\t\t\t\t`Extension MCP server '${decl.name}' from ${decl.extensionPath} skipped; ${existing.source} config at ${existing.sourcePath} wins.`,\n\t\t\t);\n\t\t\tcontinue;\n\t\t}\n\t\tif (existing !== undefined) {\n\t\t\tresult.diagnostics.push(\n\t\t\t\t`Extension MCP server '${decl.name}' from ${decl.extensionPath} replaces untrusted ${existing.source} placeholder from ${existing.sourcePath}.`,\n\t\t\t);\n\t\t}\n\t\tresult.servers[decl.name] = resolveExtensionMcpServer(\n\t\t\tdecl.name,\n\t\t\tdecl.config,\n\t\t\tdecl.extensionPath,\n\t\t\tdecl.registrationCwd,\n\t\t);\n\t}\n}\n\n/\n Resolve a skill-declared MCP server (mcp.json sidecar or SKILL.md\n * frontmatter). Exposure is forced to search with no directTools so the\n * catalog registers with ZERO active tools until the owning skill loads\n * (0 pre-load payload tokens); lifecycle stays lazy.\n /\nexport function resolveSkillMcpServer(\n\tname: string,\n\traw: NonNullable<RawConfig[\"mcpServers\"]>[string],\n\tsourcePath: string,\n): ResolvedMcpServer {\n\tconst config = { ...normalizeServer(raw), directTools: [], exposure: \"search\" as const };\n\treturn {\n\t\tconfig,\n\t\tconfigHash: hashConfig(config),\n\t\tname,\n\t\tsource: \"skill\",\n\t\tsourcePath,\n\t\tstate: config.enabled ? \"enabled\" : \"disabled\",\n\t\ttransport: config.type,\n\t};\n}\n\nfunction normalizeServer(server: NonNullable<RawConfig[\"mcpServers\"]>[string]): McpServerConfig {\n\tconst type = server.type ?? (server.url ? \"http\" : \"stdio\");\n\treturn {\n\t\targs: server.args ?? [],\n\t\tconnectTimeoutMs: server.connectTimeoutMs ?? 15_000,\n\t\tenabled: server.enabled ?? true,\n\t\texposure: server.exposure ?? \"auto\",\n\t\tidleTimeoutMin: server.idleTimeoutMin ?? 10,\n\t\tlifecycle: server.lifecycle ?? \"lazy\",\n\t\tlogLevel: server.logLevel ?? \"info\",\n\t\trequestTimeoutMs: server.requestTimeoutMs ?? 30_000,\n\t\ttype,\n\t\t...server,\n\t};\n}\n\nfunction interpolateConfig(\n\tconfig: RawConfig \| undefined,\n\tenv: Record<string, string \| undefined>,\n): RawConfig \| undefined {\n\treturn interpolateValue(config, \"mcp\", env) as RawConfig \| undefined;\n}\n\nfunction interpolateValue(value: unknown, path: string, env: Record<string, string \| undefined>): unknown {\n\tif (typeof value === \"string\") return interpolateString(value, path, env);\n\tif (Array.isArray(value)) return value.map((item, index) => interpolateValue(item, `${path}.${index}`, env));\n\tif (typeof value === \"object\" && value !== null) {\n\t\tconst out: Record<string, unknown> = {};\n\t\tfor (const [key, item] of Object.entries(value)) out[key] = interpolateValue(item, `${path}.${key}`, env);\n\t\treturn out;\n\t}\n\treturn value;\n}\n\nfunction interpolateString(value: string, path: string, env: Record<string, string \| undefined>): string {\n\tif (value.trimStart().startsWith(\"!\") \|\| value.includes(\"$(\")) {\n\t\tconst displayPath = path.replace(/^mcp\\./, \"\");\n\t\tthrow new McpConfigValidationError(\n\t\t\t`MCP config interpolation rejected command substitution at ${displayPath}: config values may reference only environment variables for security; shell commands are never executed.`,\n\t\t);\n\t}\n\treturn value.replace(\n\t\t/\\$\\{([A-Za-z_][A-Za-z0-9_])(:-([^}]*))?\\}/g,\n\t\t(_match, name: string, _fallback: string, fallbackValue: string \| undefined) => {\n\t\t\treturn env[name] ?? fallbackValue ?? \"\";\n\t\t},\n\t);\n}\n\nfunction hashConfig(config: McpServerConfig): string {\n\treturn createHash(\"sha256\").update(stableStringify(config)).digest(\"hex\");\n}\n\nfunction stableStringify(value: unknown): string {\n\tif (Array.isArray(value)) return `[${value.map(stableStringify).join(\",\")}]`;\n\tif (typeof value === \"object\" && value !== null) {\n\t\treturn `{${Object.keys(value)\n\t\t\t.sort()\n\t\t\t.map((key) => `${JSON.stringify(key)}:${stableStringify((value as Record<string, unknown>)[key])}`)\n\t\t\t.join(\",\")}}`;\n\t}\n\treturn JSON.stringify(value);\n}\n"]}
1	+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/mcp/config.ts"],"names":[],"mappings":"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","sourcesContent":["import { createHash } from \"node:crypto\";\nimport { existsSync, readFileSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport type { TLocalizedValidationError } from \"typebox/error\";\nimport { CONFIG_DIR_NAME, getAgentDir } from \"../../../../config.ts\";\nimport {\n\tdefaultSettings,\n\tgetServerEndpointValidationError,\n\ttype LoadMcpConfigOptions,\n\ttype McpServerConfig,\n\ttype McpServerSource,\n\ttype McpSettings,\n\ttype RawConfig,\n\ttype ResolvedMcpConfig,\n\ttype ResolvedMcpServer,\n\tvalidateConfig,\n} from \"./config-schema.ts\";\n\nexport class McpConfigValidationError extends Error {\n\tconstructor(message: string) {\n\t\tsuper(message);\n\t\tthis.name = \"McpConfigValidationError\";\n\t}\n}\n\ninterface JsonReadResult {\n\traw: unknown;\n\tdiagnostic?: string;\n}\n\nconst trustedEnv = process.env as Record<string, string \| undefined>;\n\nexport function loadMcpConfig(options: LoadMcpConfigOptions): ResolvedMcpConfig {\n\tconst agentDir = options.agentDir ?? getAgentDir();\n\tconst env = options.env ?? trustedEnv;\n\tconst globalPath = join(agentDir, \"mcp.json\");\n\tconst projectPath = join(options.cwd, CONFIG_DIR_NAME, \"mcp.json\");\n\tconst claudePath = join(options.cwd, \".mcp.json\");\n\tconst globalConfig = readTrustedConfig(globalPath, env);\n\tconst projectRead = readConfigJson(projectPath, options.projectTrusted);\n\tconst projectRaw = projectRead.raw;\n\tconst preliminary = mergeConfigs(\n\t\tglobalConfig,\n\t\toptions.projectTrusted ? validateRaw(projectRaw, projectPath) : undefined,\n\t);\n\tconst shouldImportClaude = preliminary.settings?.importConfigs?.includes(\"claude\") === true;\n\tconst claudeRead = shouldImportClaude ? readConfigJson(claudePath, options.projectTrusted) : { raw: undefined };\n\tconst claudeRaw = claudeRead.raw;\n\tconst sources = [\n\t\t{ config: globalConfig, path: globalPath, source: \"global\" as const, trusted: true },\n\t\t{\n\t\t\tconfig:\n\t\t\t\toptions.projectTrusted && shouldImportClaude ? readTrustedConfig(claudePath, env, claudeRaw) : undefined,\n\t\t\tpath: claudePath,\n\t\t\tsource: \"claude\" as const,\n\t\t\ttrusted: options.projectTrusted,\n\t\t},\n\t\t{\n\t\t\tconfig: options.projectTrusted ? readTrustedConfig(projectPath, env, projectRaw) : undefined,\n\t\t\tpath: projectPath,\n\t\t\tsource: \"project\" as const,\n\t\t\ttrusted: options.projectTrusted,\n\t\t},\n\t];\n\tconst merged = mergeConfigs(...sources.map((item) => item.config));\n\tconst result: ResolvedMcpConfig = { diagnostics: [], servers: {}, settings: normalizeSettings(merged.settings) };\n\tfor (const diagnostic of [projectRead.diagnostic, claudeRead.diagnostic]) {\n\t\tif (diagnostic) result.diagnostics.push(diagnostic);\n\t}\n\n\tfor (const item of sources) {\n\t\tif (item.trusted && item.config?.mcpServers) {\n\t\t\taddTrustedServers(result, item.config.mcpServers, item.source, item.path);\n\t\t\tcontinue;\n\t\t}\n\t\tif (!item.trusted) {\n\t\t\taddUntrustedServers(\n\t\t\t\tresult,\n\t\t\t\treadServerNames(item.source === \"claude\" ? claudeRaw : projectRaw),\n\t\t\t\titem.source,\n\t\t\t\titem.path,\n\t\t\t);\n\t\t}\n\t}\n\treturn result;\n}\n\nexport function visitSpawnableMcpServers(\n\tconfig: ResolvedMcpConfig,\n\tvisit: (name: string, server: ResolvedMcpServer) => void,\n): void {\n\tfor (const [name, server] of Object.entries(config.servers)) {\n\t\tif (server.state === \"enabled\") {\n\t\t\tvisit(name, server);\n\t\t}\n\t}\n}\n\nfunction readTrustedConfig(\n\tpath: string,\n\tenv: Record<string, string \| undefined>,\n\traw = readConfigJson(path, true).raw,\n): RawConfig \| undefined {\n\tconst config = interpolateConfig(validateRaw(raw, path), env);\n\tconst endpointError = config ? getServerEndpointValidationError(config) : undefined;\n\tif (endpointError) throw new McpConfigValidationError(`Invalid MCP config at ${endpointError}`);\n\treturn config;\n}\n\nfunction readConfigJson(path: string, trusted: boolean): JsonReadResult {\n\tif (!existsSync(path)) return { raw: undefined };\n\ttry {\n\t\tconst raw: unknown = JSON.parse(readFileSync(path, \"utf-8\"));\n\t\treturn { raw };\n\t} catch (error) {\n\t\tconst reason = error instanceof Error ? error.message : String(error);\n\t\tif (trusted) throw new McpConfigValidationError(`Invalid MCP config at ${path}: ${reason}`);\n\t\treturn { raw: undefined, diagnostic: `Blocked untrusted MCP config at ${path}: invalid JSON (${reason})` };\n\t}\n}\n\nfunction validateRaw(raw: unknown, _path: string): RawConfig \| undefined {\n\tif (raw === undefined) return undefined;\n\tif (validateConfig.Check(raw)) {\n\t\tconst config = raw as RawConfig;\n\t\tconst endpointError = getServerEndpointValidationError(config);\n\t\tif (endpointError) throw new McpConfigValidationError(`Invalid MCP config at ${endpointError}`);\n\t\treturn config;\n\t}\n\tconst error = Array.from(validateConfig.Errors(raw))[0];\n\tthrow new McpConfigValidationError(`Invalid MCP config at ${formatErrorPath(error)}: ${formatErrorMessage(error)}`);\n}\n\nfunction formatErrorPath(error: TLocalizedValidationError): string {\n\tconst trimmed = error.instancePath.replace(/^\\//, \"\");\n\treturn trimmed.length === 0 ? \"$\" : trimmed.split(\"/\").map(decodePathPart).join(\".\");\n}\n\nfunction decodePathPart(part: string): string {\n\treturn part.replace(/~1/g, \"/\").replace(/~0/g, \"~\");\n}\n\nfunction formatErrorMessage(error: TLocalizedValidationError): string {\n\treturn error.message === \"must be array\" ? \"Expected array\" : error.message;\n}\n\nfunction mergeConfigs(...configs: (RawConfig \| undefined)[]): RawConfig {\n\tconst merged: RawConfig = {};\n\tfor (const config of configs) {\n\t\tif (!config) continue;\n\t\tmerged.settings = { ...(merged.settings ?? {}), ...(config.settings ?? {}) };\n\t\tmerged.mcpServers = { ...(merged.mcpServers ?? {}), ...(config.mcpServers ?? {}) };\n\t}\n\treturn merged;\n}\n\nfunction normalizeSettings(settings: RawConfig[\"settings\"]): McpSettings {\n\treturn { ...defaultSettings, ...settings };\n}\n\nfunction addTrustedServers(\n\tresult: ResolvedMcpConfig,\n\tservers: NonNullable<RawConfig[\"mcpServers\"]>,\n\tsource: McpServerSource,\n\tsourcePath: string,\n): void {\n\tfor (const [name, server] of Object.entries(servers)) {\n\t\tconst config = normalizeServer(server);\n\t\tresult.servers[name] = {\n\t\t\tconfig,\n\t\t\tconfigHash: hashConfig(config),\n\t\t\tname,\n\t\t\tsource,\n\t\t\tsourcePath,\n\t\t\tstate: config.enabled ? \"enabled\" : \"disabled\",\n\t\t\ttransport: config.type,\n\t\t};\n\t}\n}\n\nfunction addUntrustedServers(\n\tresult: ResolvedMcpConfig,\n\tnames: readonly string[],\n\tsource: McpServerSource,\n\tsourcePath: string,\n): void {\n\tfor (const name of names) {\n\t\tconst existing = result.servers[name];\n\t\tif (existing && existing.state !== \"untrusted\") {\n\t\t\tresult.diagnostics.push(\n\t\t\t\t`Blocked untrusted ${source} MCP server '${name}' from shadowing trusted ${existing.source} server.`,\n\t\t\t);\n\t\t\tcontinue;\n\t\t}\n\t\tresult.servers[name] = { name, source, sourcePath, state: \"untrusted\" };\n\t}\n}\n\nfunction readServerNames(raw: unknown): string[] {\n\tif (typeof raw !== \"object\" \|\| raw === null \|\| Array.isArray(raw)) return [];\n\tconst servers = (raw as { mcpServers?: unknown }).mcpServers;\n\tif (typeof servers !== \"object\" \|\| servers === null \|\| Array.isArray(servers)) return [];\n\treturn Object.keys(servers);\n}\n\n/*\n Resolve a skill-declared MCP server (mcp.json sidecar or SKILL.md\n * frontmatter). Exposure is forced to search with no directTools so the\n * catalog registers with ZERO active tools until the owning skill loads\n * (0 pre-load payload tokens); lifecycle stays lazy.\n /\nexport function resolveSkillMcpServer(\n\tname: string,\n\traw: NonNullable<RawConfig[\"mcpServers\"]>[string],\n\tsourcePath: string,\n): ResolvedMcpServer {\n\tconst config = { ...normalizeServer(raw), directTools: [], exposure: \"search\" as const };\n\treturn {\n\t\tconfig,\n\t\tconfigHash: hashConfig(config),\n\t\tname,\n\t\tsource: \"skill\",\n\t\tsourcePath,\n\t\tstate: config.enabled ? \"enabled\" : \"disabled\",\n\t\ttransport: config.type,\n\t};\n}\n\nfunction normalizeServer(server: NonNullable<RawConfig[\"mcpServers\"]>[string]): McpServerConfig {\n\tconst type = server.type ?? (server.url ? \"http\" : \"stdio\");\n\treturn {\n\t\targs: server.args ?? [],\n\t\tconnectTimeoutMs: server.connectTimeoutMs ?? 15_000,\n\t\tenabled: server.enabled ?? true,\n\t\texposure: server.exposure ?? \"auto\",\n\t\tidleTimeoutMin: server.idleTimeoutMin ?? 10,\n\t\tlifecycle: server.lifecycle ?? \"lazy\",\n\t\tlogLevel: server.logLevel ?? \"info\",\n\t\trequestTimeoutMs: server.requestTimeoutMs ?? 30_000,\n\t\ttype,\n\t\t...server,\n\t};\n}\n\nfunction interpolateConfig(\n\tconfig: RawConfig \| undefined,\n\tenv: Record<string, string \| undefined>,\n): RawConfig \| undefined {\n\treturn interpolateValue(config, \"mcp\", env) as RawConfig \| undefined;\n}\n\nfunction interpolateValue(value: unknown, path: string, env: Record<string, string \| undefined>): unknown {\n\tif (typeof value === \"string\") return interpolateString(value, path, env);\n\tif (Array.isArray(value)) return value.map((item, index) => interpolateValue(item, `${path}.${index}`, env));\n\tif (typeof value === \"object\" && value !== null) {\n\t\tconst out: Record<string, unknown> = {};\n\t\tfor (const [key, item] of Object.entries(value)) out[key] = interpolateValue(item, `${path}.${key}`, env);\n\t\treturn out;\n\t}\n\treturn value;\n}\n\nfunction interpolateString(value: string, path: string, env: Record<string, string \| undefined>): string {\n\tif (value.trimStart().startsWith(\"!\") \|\| value.includes(\"$(\")) {\n\t\tconst displayPath = path.replace(/^mcp\\./, \"\");\n\t\tthrow new McpConfigValidationError(\n\t\t\t`MCP config interpolation rejected command substitution at ${displayPath}: config values may reference only environment variables for security; shell commands are never executed.`,\n\t\t);\n\t}\n\treturn value.replace(\n\t\t/\\$\\{([A-Za-z_][A-Za-z0-9_])(:-([^}]*))?\\}/g,\n\t\t(_match, name: string, _fallback: string, fallbackValue: string \| undefined) => {\n\t\t\treturn env[name] ?? fallbackValue ?? \"\";\n\t\t},\n\t);\n}\n\nfunction hashConfig(config: McpServerConfig): string {\n\treturn createHash(\"sha256\").update(stableStringify(config)).digest(\"hex\");\n}\n\nfunction stableStringify(value: unknown): string {\n\tif (Array.isArray(value)) return `[${value.map(stableStringify).join(\",\")}]`;\n\tif (typeof value === \"object\" && value !== null) {\n\t\treturn `{${Object.keys(value)\n\t\t\t.sort()\n\t\t\t.map((key) => `${JSON.stringify(key)}:${stableStringify((value as Record<string, unknown>)[key])}`)\n\t\t\t.join(\",\")}}`;\n\t}\n\treturn JSON.stringify(value);\n}\n"]}

package/dist/core/extensions/builtin/mcp/expose/native-search.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ export declare const ANTHROPIC_TOOL_SEARCH_NAME = "tool_search";
 /** Anthropic caps a request at 10k tools; beyond that native search is invalid. */
 export declare const ANTHROPIC_MAX_TOOLS = 10000;
 export interface AnthropicNativeInjectionConfig {
-    /** Never defer this tool (our custom tool_search), and it is non-deferrable. */
+    /** Never defer this tool (our custom mcp_search), and it is non-deferrable. */
     readonly searchToolName?: string;
     /** True for MCP catalog tools eligible for deferral. */
     readonly isDeferrable: (toolName: string) => boolean;

package/dist/core/extensions/builtin/mcp/expose/native-search.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"native-search.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/native-search.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,0BAA0B,mCAAmC,CAAC;AAC3E,eAAO,MAAM,0BAA0B,gBAAgB,CAAC;AACxD,mFAAmF;AACnF,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC,MAAM,WAAW,8BAA8B;IAC9C~~,gFAAgF~~;~~IAChF~~,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,wDAAwD;IACxD,QAAQ,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;CACrD;AAMD;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAC3C,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,8BAA8B,GACpC,OAAO,CAUT;AAaD;6EAC6E;AAC7E,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,CAE7G;AAED,MAAM,WAAW,0BAA2B,SAAQ,8BAA8B;IACjF,+EAA+E;IAC/E,OAAO,IAAI,OAAO,CAAC;IACnB,gEAAgE;IAChE,UAAU,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAED;;;;;GAKG;AACH,qBAAa,gCAAgC;;IAM5C,YAAY,IAAI,EAAE,0BAA0B,EAE3C;IAED,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAMrE;IAED,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAMvC;IAED,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,IAAI,cAAc,IAAI,MAAM,GAAG,IAAI,CAElC;CACD"}
1	+ {"version":3,"file":"native-search.d.ts","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/native-search.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,0BAA0B,mCAAmC,CAAC;AAC3E,eAAO,MAAM,0BAA0B,gBAAgB,CAAC;AACxD,mFAAmF;AACnF,eAAO,MAAM,mBAAmB,QAAQ,CAAC;AAEzC,MAAM,WAAW,8BAA8B;IAC9C,+EAA+E;IAC/E,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,wDAAwD;IACxD,QAAQ,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC;CACrD;AAMD;;;;;;GAMG;AACH,wBAAgB,4BAA4B,CAC3C,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,8BAA8B,GACpC,OAAO,CAUT;AAaD;6EAC6E;AAC7E,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG;IAAE,IAAI,EAAE,gBAAgB,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,CAE7G;AAED,MAAM,WAAW,0BAA2B,SAAQ,8BAA8B;IACjF,+EAA+E;IAC/E,OAAO,IAAI,OAAO,CAAC;IACnB,gEAAgE;IAChE,UAAU,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAED;;;;;GAKG;AACH,qBAAa,gCAAgC;;IAM5C,YAAY,IAAI,EAAE,0BAA0B,EAE3C;IAED,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAMrE;IAED,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAMvC;IAED,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED,IAAI,cAAc,IAAI,MAAM,GAAG,IAAI,CAElC;CACD"}

package/dist/core/extensions/builtin/mcp/expose/native-search.js CHANGED Viewed

@@ -85,7 +85,7 @@ export class AnthropicNativeToolSearchAdapter {
             return;
         this.#disabled = true;
         this.#fallbackReason =
-            "Anthropic returned 400 for native tool-search; disabled it and fell back to local tool_search for this session.";
+            "Anthropic returned 400 for native tool-search; disabled it and fell back to local mcp_search for this session.";
         this.#deps.onFallback?.(this.#fallbackReason);
     }
     get disabled() {

package/dist/core/extensions/builtin/mcp/expose/native-search.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"native-search.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/native-search.ts"],"names":[],"mappings":"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~~iHAAiH~~,CAAC;~~QACnH~~,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,IAAI,cAAc;QACjB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC7B,CAAC;CACD","sourcesContent":["// Native provider tool-search adapters (todo 33 — Anthropic half).\n//\n// Gated on the todo-29 spike verdict: Anthropic Messages is GO-pure-extension —\n// server_tool_use / tool_search_tool_result blocks round-trip pi-ai's\n// parse->persist->re-serialise cycle untouched (native-search-spike.md), so this\n// adapter injects request-side fields via the extension before_provider_request\n// event ONLY (the sole ExtensionAPI payload surface) with no pi-ai change.\n//\n// It injects Anthropic's native `tool_search_tool_bm25_20251119` tool and marks\n// deferrable MCP tools `defer_loading:true`, honouring the API HARD RULES, and\n// auto-falls-back to local Tier-B on a 400. The OpenAI half is deferred\n// (spike = GO-with-ai-seam; see native-search-spike.md).\n\nexport const ANTHROPIC_TOOL_SEARCH_TYPE = \"tool_search_tool_bm25_20251119\";\nexport const ANTHROPIC_TOOL_SEARCH_NAME = \"tool_search\";\n/** Anthropic caps a request at 10k tools; beyond that native search is invalid. /\nexport const ANTHROPIC_MAX_TOOLS = 10000;\n\nexport interface AnthropicNativeInjectionConfig {\n\t/* Never defer this tool (our custom ~~tool_search~~), and it is non-deferrable. /\n\treadonly searchToolName?: string;\n\t/* True for MCP catalog tools eligible for deferral. /\n\treadonly isDeferrable: (toolName: string) => boolean;\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null;\n}\n\n/\n Pure payload transform. Adds exactly one native tool-search tool (idempotent)\n * and sets `defer_loading:true` on eligible MCP tools, enforcing the HARD RULES:\n * never defer the search tool, never combine defer_loading with cache_control\n * (400), keep >=1 non-deferred tool (the native search tool guarantees this),\n * and skip entirely above the 10k tool cap.\n /\nexport function addAnthropicNativeToolSearch(\n\tapi: string \| undefined,\n\tpayload: unknown,\n\tconfig: AnthropicNativeInjectionConfig,\n): unknown {\n\tif (api !== \"anthropic-messages\" \|\| !isRecord(payload)) return payload;\n\tconst tools = Array.isArray(payload.tools) ? payload.tools : [];\n\tif (tools.length > ANTHROPIC_MAX_TOOLS) return payload;\n\tconst deferred = tools.map((tool) => maybeDefer(tool, config));\n\tconst hasSearchTool = deferred.some((tool) => isRecord(tool) && tool.type === ANTHROPIC_TOOL_SEARCH_TYPE);\n\tconst nextTools = hasSearchTool\n\t\t? deferred\n\t\t: [...deferred, { type: ANTHROPIC_TOOL_SEARCH_TYPE, name: ANTHROPIC_TOOL_SEARCH_NAME }];\n\treturn { ...payload, tools: nextTools };\n}\n\nfunction maybeDefer(tool: unknown, config: AnthropicNativeInjectionConfig): unknown {\n\tif (!isRecord(tool)) return tool;\n\tconst name = typeof tool.name === \"string\" ? tool.name : undefined;\n\tif (name === undefined) return tool; // server/native tools are type-based, never deferred\n\tif (name === config.searchToolName) return tool; // never defer the search tool\n\tif (!config.isDeferrable(name)) return tool; // non-MCP tools untouched\n\tif (\"cache_control\" in tool) return tool; // never defer_loading + cache_control (400)\n\tif (tool.defer_loading === true) return tool; // idempotent\n\treturn { ...tool, defer_loading: true };\n}\n\n/* `tool_reference` blocks emitted inside a tool_result so the API expands the\n * referenced (deferred) tools — the cache-prefix-safe custom-search path. /\nexport function buildToolReferenceBlocks(names: readonly string[]): { type: \"tool_reference\"; name: string }[] {\n\treturn names.map((name) => ({ type: \"tool_reference\", name }));\n}\n\nexport interface AnthropicNativeAdapterDeps extends AnthropicNativeInjectionConfig {\n\t/* Resolved config gate (nativeToolSearch auto\|true AND provider supports). /\n\tenabled(): boolean;\n\t/* Invoked once when a 400 forces the local-search fallback. /\n\tonFallback?(reason: string): void;\n}\n\n/\n Stateful adapter driving the before_provider_request injection and the\n * after_provider_response 400 detector. Once a 400 lands on a request we\n * injected, native search is disabled for the rest of the session and the\n * extension falls back to local Tier-B (which is always registered).\n */\nexport class AnthropicNativeToolSearchAdapter {\n\t#disabled = false;\n\t#injectedLastRequest = false;\n\t#fallbackReason: string \| null = null;\n\treadonly #deps: AnthropicNativeAdapterDeps;\n\n\tconstructor(deps: AnthropicNativeAdapterDeps) {\n\t\tthis.#deps = deps;\n\t}\n\n\tapplyBeforeRequest(api: string \| undefined, payload: unknown): unknown {\n\t\tthis.#injectedLastRequest = false;\n\t\tif (this.#disabled \|\| !this.#deps.enabled()) return payload;\n\t\tconst next = addAnthropicNativeToolSearch(api, payload, this.#deps);\n\t\tthis.#injectedLastRequest = next !== payload;\n\t\treturn next;\n\t}\n\n\tnoteResponseStatus(status: number): void {\n\t\tif (status !== 400 \|\| !this.#injectedLastRequest \|\| this.#disabled) return;\n\t\tthis.#disabled = true;\n\t\tthis.#fallbackReason =\n\t\t\t\"Anthropic returned 400 for native tool-search; disabled it and fell back to local ~~tool_search~~ for this session.\";\n\t\tthis.#deps.onFallback?.(this.#fallbackReason);\n\t}\n\n\tget disabled(): boolean {\n\t\treturn this.#disabled;\n\t}\n\n\tget fallbackReason(): string \| null {\n\t\treturn this.#fallbackReason;\n\t}\n}\n"]}
1	+ {"version":3,"file":"native-search.js","sourceRoot":"","sources":["../../../../../../src/core/extensions/builtin/mcp/expose/native-search.ts"],"names":[],"mappings":"AAAA,mEAAmE;AACnE,EAAE;AACF,gFAAgF;AAChF,sEAAsE;AACtE,iFAAiF;AACjF,gFAAgF;AAChF,2EAA2E;AAC3E,EAAE;AACF,gFAAgF;AAChF,+EAA+E;AAC/E,wEAAwE;AACxE,yDAAyD;AAEzD,MAAM,CAAC,MAAM,0BAA0B,GAAG,gCAAgC,CAAC;AAC3E,MAAM,CAAC,MAAM,0BAA0B,GAAG,aAAa,CAAC;AACxD,mFAAmF;AACnF,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,CAAC;AASzC,SAAS,QAAQ,CAAC,KAAc;IAC/B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACpD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,4BAA4B,CAC3C,GAAuB,EACvB,OAAgB,EAChB,MAAsC;IAEtC,IAAI,GAAG,KAAK,oBAAoB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,OAAO,CAAC;IACvE,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAChE,IAAI,KAAK,CAAC,MAAM,GAAG,mBAAmB;QAAE,OAAO,OAAO,CAAC;IACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IAC/D,MAAM,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,0BAA0B,CAAC,CAAC;IAC1G,MAAM,SAAS,GAAG,aAAa;QAC9B,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,EAAE,IAAI,EAAE,0BAA0B,EAAE,IAAI,EAAE,0BAA0B,EAAE,CAAC,CAAC;IACzF,OAAO,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AACzC,CAAC;AAED,SAAS,UAAU,CAAC,IAAa,EAAE,MAAsC;IACxE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACjC,MAAM,IAAI,GAAG,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACnE,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC,CAAC,qDAAqD;IAC1F,IAAI,IAAI,KAAK,MAAM,CAAC,cAAc;QAAE,OAAO,IAAI,CAAC,CAAC,8BAA8B;IAC/E,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC,CAAC,0BAA0B;IACvE,IAAI,eAAe,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC,CAAC,4CAA4C;IACtF,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC,CAAC,aAAa;IAC3D,OAAO,EAAE,GAAG,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;AACzC,CAAC;AAED;6EAC6E;AAC7E,MAAM,UAAU,wBAAwB,CAAC,KAAwB;IAChE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAChE,CAAC;AASD;;;;;GAKG;AACH,MAAM,OAAO,gCAAgC;IAC5C,SAAS,GAAG,KAAK,CAAC;IAClB,oBAAoB,GAAG,KAAK,CAAC;IAC7B,eAAe,GAAkB,IAAI,CAAC;IAC7B,KAAK,CAA6B;IAE3C,YAAY,IAAgC;QAC3C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,kBAAkB,CAAC,GAAuB,EAAE,OAAgB;QAC3D,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;QAClC,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;YAAE,OAAO,OAAO,CAAC;QAC5D,MAAM,IAAI,GAAG,4BAA4B,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QACpE,IAAI,CAAC,oBAAoB,GAAG,IAAI,KAAK,OAAO,CAAC;QAC7C,OAAO,IAAI,CAAC;IACb,CAAC;IAED,kBAAkB,CAAC,MAAc;QAChC,IAAI,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO;QAC3E,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,eAAe;YACnB,gHAAgH,CAAC;QAClH,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,QAAQ;QACX,OAAO,IAAI,CAAC,SAAS,CAAC;IACvB,CAAC;IAED,IAAI,cAAc;QACjB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC7B,CAAC;CACD","sourcesContent":["// Native provider tool-search adapters (todo 33 — Anthropic half).\n//\n// Gated on the todo-29 spike verdict: Anthropic Messages is GO-pure-extension —\n// server_tool_use / tool_search_tool_result blocks round-trip pi-ai's\n// parse->persist->re-serialise cycle untouched (native-search-spike.md), so this\n// adapter injects request-side fields via the extension before_provider_request\n// event ONLY (the sole ExtensionAPI payload surface) with no pi-ai change.\n//\n// It injects Anthropic's native `tool_search_tool_bm25_20251119` tool and marks\n// deferrable MCP tools `defer_loading:true`, honouring the API HARD RULES, and\n// auto-falls-back to local Tier-B on a 400. The OpenAI half is deferred\n// (spike = GO-with-ai-seam; see native-search-spike.md).\n\nexport const ANTHROPIC_TOOL_SEARCH_TYPE = \"tool_search_tool_bm25_20251119\";\nexport const ANTHROPIC_TOOL_SEARCH_NAME = \"tool_search\";\n/** Anthropic caps a request at 10k tools; beyond that native search is invalid. /\nexport const ANTHROPIC_MAX_TOOLS = 10000;\n\nexport interface AnthropicNativeInjectionConfig {\n\t/* Never defer this tool (our custom mcp_search), and it is non-deferrable. /\n\treadonly searchToolName?: string;\n\t/* True for MCP catalog tools eligible for deferral. /\n\treadonly isDeferrable: (toolName: string) => boolean;\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n\treturn typeof value === \"object\" && value !== null;\n}\n\n/\n Pure payload transform. Adds exactly one native tool-search tool (idempotent)\n * and sets `defer_loading:true` on eligible MCP tools, enforcing the HARD RULES:\n * never defer the search tool, never combine defer_loading with cache_control\n * (400), keep >=1 non-deferred tool (the native search tool guarantees this),\n * and skip entirely above the 10k tool cap.\n /\nexport function addAnthropicNativeToolSearch(\n\tapi: string \| undefined,\n\tpayload: unknown,\n\tconfig: AnthropicNativeInjectionConfig,\n): unknown {\n\tif (api !== \"anthropic-messages\" \|\| !isRecord(payload)) return payload;\n\tconst tools = Array.isArray(payload.tools) ? payload.tools : [];\n\tif (tools.length > ANTHROPIC_MAX_TOOLS) return payload;\n\tconst deferred = tools.map((tool) => maybeDefer(tool, config));\n\tconst hasSearchTool = deferred.some((tool) => isRecord(tool) && tool.type === ANTHROPIC_TOOL_SEARCH_TYPE);\n\tconst nextTools = hasSearchTool\n\t\t? deferred\n\t\t: [...deferred, { type: ANTHROPIC_TOOL_SEARCH_TYPE, name: ANTHROPIC_TOOL_SEARCH_NAME }];\n\treturn { ...payload, tools: nextTools };\n}\n\nfunction maybeDefer(tool: unknown, config: AnthropicNativeInjectionConfig): unknown {\n\tif (!isRecord(tool)) return tool;\n\tconst name = typeof tool.name === \"string\" ? tool.name : undefined;\n\tif (name === undefined) return tool; // server/native tools are type-based, never deferred\n\tif (name === config.searchToolName) return tool; // never defer the search tool\n\tif (!config.isDeferrable(name)) return tool; // non-MCP tools untouched\n\tif (\"cache_control\" in tool) return tool; // never defer_loading + cache_control (400)\n\tif (tool.defer_loading === true) return tool; // idempotent\n\treturn { ...tool, defer_loading: true };\n}\n\n/* `tool_reference` blocks emitted inside a tool_result so the API expands the\n * referenced (deferred) tools — the cache-prefix-safe custom-search path. /\nexport function buildToolReferenceBlocks(names: readonly string[]): { type: \"tool_reference\"; name: string }[] {\n\treturn names.map((name) => ({ type: \"tool_reference\", name }));\n}\n\nexport interface AnthropicNativeAdapterDeps extends AnthropicNativeInjectionConfig {\n\t/* Resolved config gate (nativeToolSearch auto\|true AND provider supports). /\n\tenabled(): boolean;\n\t/* Invoked once when a 400 forces the local-search fallback. /\n\tonFallback?(reason: string): void;\n}\n\n/\n Stateful adapter driving the before_provider_request injection and the\n * after_provider_response 400 detector. Once a 400 lands on a request we\n * injected, native search is disabled for the rest of the session and the\n * extension falls back to local Tier-B (which is always registered).\n */\nexport class AnthropicNativeToolSearchAdapter {\n\t#disabled = false;\n\t#injectedLastRequest = false;\n\t#fallbackReason: string \| null = null;\n\treadonly #deps: AnthropicNativeAdapterDeps;\n\n\tconstructor(deps: AnthropicNativeAdapterDeps) {\n\t\tthis.#deps = deps;\n\t}\n\n\tapplyBeforeRequest(api: string \| undefined, payload: unknown): unknown {\n\t\tthis.#injectedLastRequest = false;\n\t\tif (this.#disabled \|\| !this.#deps.enabled()) return payload;\n\t\tconst next = addAnthropicNativeToolSearch(api, payload, this.#deps);\n\t\tthis.#injectedLastRequest = next !== payload;\n\t\treturn next;\n\t}\n\n\tnoteResponseStatus(status: number): void {\n\t\tif (status !== 400 \|\| !this.#injectedLastRequest \|\| this.#disabled) return;\n\t\tthis.#disabled = true;\n\t\tthis.#fallbackReason =\n\t\t\t\"Anthropic returned 400 for native tool-search; disabled it and fell back to local mcp_search for this session.\";\n\t\tthis.#deps.onFallback?.(this.#fallbackReason);\n\t}\n\n\tget disabled(): boolean {\n\t\treturn this.#disabled;\n\t}\n\n\tget fallbackReason(): string \| null {\n\t\treturn this.#fallbackReason;\n\t}\n}\n"]}