Skip to content

fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI#4007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
likun666661 merged 3 commits into from
Aug 28, 2026
+171 −133
Merged

fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI #4007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86e97b9
fix(cli): split MCP capability provider to avoid pulling runtime-host…
me2seeks Aug 27, 2026
1073fb0
style(cli): collapse mcp-capability-provider type import
me2seeks Aug 27, 2026
532dbc2
test(cli): guard TUI MCP import boundary
me2seeks Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions packages/cli/src/__tests__/runtime-host-capability-provider-command.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,25 @@
*/

import assert from 'node:assert/strict';
import { readFile } from 'node:fs/promises';
import { test } from 'node:test';
import type { McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import { createMcpCapabilityProvider as createPureMcpCapabilityProvider } from '../mcp-capability-provider.js';
import { createMcpCapabilityProvider } from '../runtime-host-capability-provider-command.js';

test('TUI MCP control keeps its capability provider on the pure import boundary', async () => {
const [tuiSource, providerSource] = await Promise.all([
readFile(new URL('../tui-mcp-control.js', import.meta.url), 'utf8'),
readFile(new URL('../mcp-capability-provider.js', import.meta.url), 'utf8'),
]);

assert.equal(createMcpCapabilityProvider, createPureMcpCapabilityProvider);
assert.match(tuiSource, /from ['"]\.\/mcp-capability-provider\.js['"]/u);
assert.doesNotMatch(tuiSource, /@maka\/runtime-host\/server/u);
assert.doesNotMatch(providerSource, /@maka\/runtime-host\/server/u);
});

test('MCP capability publication freezes an accepted callable tool snapshot', async () => {
let accepted = false;
const binding = 'binding-1' as McpToolBinding;
Expand Down
154 changes: 154 additions & 0 deletions packages/cli/src/mcp-capability-provider.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

import { createHash } from 'node:crypto';
import type { McpBoundTool, McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
CLIENT_CAPABILITY_MAX_TOOLS,
CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
decodeClientCapabilityReplaceInput,
type ClientCapabilityCallResult,
type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import type { McpCallResult, McpToolDescriptor } from '@maka/core/mcp';

const CAPABILITY_VERSION = '0';

export function createMcpCapabilityProvider(
manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
const toolSnapshot = manager.toolSnapshot();
const tools = [...toolSnapshot.tools].sort(
(left, right) =>
left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
left.descriptor.name.localeCompare(right.descriptor.name),
);
const toolCount = tools.length;
if (toolCount === 0) return undefined;
if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
throw new Error(
`MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
);
}

const projectedIdentities = new Set<string>();
const projected: Array<{
readonly source: McpBoundTool;
readonly descriptor: ReturnType<typeof projectMcpTool>;
}> = [];
for (const source of tools) {
const descriptor = projectMcpTool(
source.descriptor,
capabilityEntityId(source.descriptor.serverId),
);
const identity = `${descriptor.serverId}\0${descriptor.name}`;
if (projectedIdentities.has(identity)) {
throw new Error('MCP tools collide after Client Capability identity normalization');
}
projectedIdentities.add(identity);
projected.push({ source, descriptor });
}

const bindings = new Map<string, McpToolBinding>();
const offers: ClientCapabilityOffer[] = [];
for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
offers.push({
offerId,
version: CAPABILITY_VERSION,
affinity: 'session',
hostPathAccess: 'none',
label:
servers.size === 1
? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
: `MCP tools (${servers.size} servers)`,
description: 'Use tools provided by connected MCP servers.',
tools: chunk.map(({ descriptor }) => descriptor),
});
for (const { source, descriptor } of chunk) {
bindings.set(
capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
source.binding,
);
}
}
const canonical = decodeClientCapabilityReplaceInput({
registrationId: '00000000-0000-4000-8000-000000000000',
offers,
});

return {
offers: () => canonical.offers,
call: async (frame, options) => {
const binding = bindings.get(
capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
);
if (!binding) throw new Error('MCP capability is not part of the published snapshot');
await options.accept();
return projectMcpResult(
await manager.callTool(binding, frame.arguments, { signal: options.signal }),
);
},
};
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
return {
serverId: wireServerId,
name: capabilityEntityId(tool.name),
...(tool.description ? { description: tool.description } : {}),
inputSchema: structuredClone(tool.inputSchema),
...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
};
}

function capabilityEntityId(value: string): string {
if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
return {
content: result.content.map((block) => structuredClone(block)),
...(result.structuredContent === undefined
? {}
: { structuredContent: structuredClone(result.structuredContent) }),
};
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
for (const { source } of tools)
hash
.update('\0')
.update(source.descriptor.serverId)
.update('\0')
.update(source.descriptor.name);
return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
return `${offerId}\0${serverId}\0${toolName}`;
}
134 changes: 2 additions & 132 deletions packages/cli/src/runtime-host-capability-provider-command.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ import { createHash } from 'node:crypto';
import { readFile } from 'node:fs/promises';
import { homedir } from 'node:os';
import { dirname, join, resolve } from 'node:path';
import type {
McpBoundTool,
McpCallResult,
McpToolBinding,
McpToolDescriptor,
} from '@maka/core/mcp';
import { createCredentialMcpOAuthStorage, McpClientManager } from '@maka/mcp';
import { createFileCredentialStore } from '@maka/storage/credential-store';
import { normalizeMcpConfig } from '@maka/storage/mcp-config-store';
Expand All@@ -36,20 +30,15 @@ import {
remoteRuntimeHostUnavailableError,
RuntimeHostPermanentReconnectError,
startRuntimeHostCapabilityProviderService,
type ClientCapabilityProvider,
type RuntimeHostConnection,
} from '@maka/runtime-host/client';
import {
CLIENT_CAPABILITY_MAX_TOOLS,
CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
decodeClientCapabilityReplaceInput,
INTERACTIVE_RUNTIME_HOST_COMPOSITION_ID,
RUNTIME_HOST_COMPATIBILITY_EPOCH,
RUNTIME_HOST_PROTOCOL_VERSION,
type ClientCapabilityCallResult,
type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import { runRuntimeHostProcessLifecycle } from '@maka/runtime-host/server';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const DEFAULT_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';
const CAPABILITY_VERSION = '0';
Expand DownExpand Up@@ -199,126 +188,7 @@ async function connectRemoteCapabilityProvider(input: {
throw new Error('Runtime Host is draining');
}

export function createMcpCapabilityProvider(
manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
const toolSnapshot = manager.toolSnapshot();
const tools = [...toolSnapshot.tools].sort(
(left, right) =>
left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
left.descriptor.name.localeCompare(right.descriptor.name),
);
const toolCount = tools.length;
if (toolCount === 0) return undefined;
if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
throw new Error(
`MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
);
}

const projectedIdentities = new Set<string>();
const projected: Array<{
readonly source: McpBoundTool;
readonly descriptor: ReturnType<typeof projectMcpTool>;
}> = [];
for (const source of tools) {
const descriptor = projectMcpTool(
source.descriptor,
capabilityEntityId(source.descriptor.serverId),
);
const identity = `${descriptor.serverId}\0${descriptor.name}`;
if (projectedIdentities.has(identity)) {
throw new Error('MCP tools collide after Client Capability identity normalization');
}
projectedIdentities.add(identity);
projected.push({ source, descriptor });
}

const bindings = new Map<string, McpToolBinding>();
const offers: ClientCapabilityOffer[] = [];
for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
offers.push({
offerId,
version: CAPABILITY_VERSION,
affinity: 'session',
hostPathAccess: 'none',
label:
servers.size === 1
? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
: `MCP tools (${servers.size} servers)`,
description: 'Use tools provided by connected MCP servers.',
tools: chunk.map(({ descriptor }) => descriptor),
});
for (const { source, descriptor } of chunk) {
bindings.set(
capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
source.binding,
);
}
}
const canonical = decodeClientCapabilityReplaceInput({
registrationId: '00000000-0000-4000-8000-000000000000',
offers,
});

return {
offers: () => canonical.offers,
call: async (frame, options) => {
const binding = bindings.get(
capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
);
if (!binding) throw new Error('MCP capability is not part of the published snapshot');
await options.accept();
return projectMcpResult(
await manager.callTool(binding, frame.arguments, { signal: options.signal }),
);
},
};
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
return {
serverId: wireServerId,
name: capabilityEntityId(tool.name),
...(tool.description ? { description: tool.description } : {}),
inputSchema: structuredClone(tool.inputSchema),
...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
};
}

function capabilityEntityId(value: string): string {
if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
return {
content: result.content.map((block) => structuredClone(block)),
...(result.structuredContent === undefined
? {}
: { structuredContent: structuredClone(result.structuredContent) }),
};
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
for (const { source } of tools)
hash
.update('\0')
.update(source.descriptor.serverId)
.update('\0')
.update(source.descriptor.name);
return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
return `${offerId}\0${serverId}\0${toolName}`;
}
export { createMcpCapabilityProvider } from './mcp-capability-provider.js';

function reportRefreshFailure(error: unknown): void {
const message = error instanceof Error ? error.message : String(error);
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/tui-mcp-control.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import type {
RuntimeHostConnectionAvailability,
RuntimeHostReconnectingConnection,
} from '@maka/runtime-host/client';
import { createMcpCapabilityProvider } from './runtime-host-capability-provider-command.js';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const RUNTIME_HOST_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI by me2seeks · Pull Request #4007 · apache/maka · GitHub
Skip to content
fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI#4007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

likun666661
merged 3 commits into

from

Aug 28, 2026

+171

−133

 Merged


fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI
#4007
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
86e97b9

fix(cli): split MCP capability provider to avoid pulling runtime-host…


me2seeks Aug 27, 2026
1073fb0

style(cli): collapse mcp-capability-provider type import


me2seeks Aug 27, 2026
532dbc2

test(cli): guard TUI MCP import boundary


me2seeks Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 14 additions & 0 deletions
packages/cli/src/__tests__/runtime-host-capability-provider-command.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,25 @@
 */

import assert from 'node:assert/strict';
import { readFile } from 'node:fs/promises';
import { test } from 'node:test';
import type { McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import { createMcpCapabilityProvider as createPureMcpCapabilityProvider } from '../mcp-capability-provider.js';
import { createMcpCapabilityProvider } from '../runtime-host-capability-provider-command.js';

test('TUI MCP control keeps its capability provider on the pure import boundary', async () => {
 const [tuiSource, providerSource] = await Promise.all([
 readFile(new URL('../tui-mcp-control.js', import.meta.url), 'utf8'),
 readFile(new URL('../mcp-capability-provider.js', import.meta.url), 'utf8'),
 ]);

 assert.equal(createMcpCapabilityProvider, createPureMcpCapabilityProvider);
 assert.match(tuiSource, /from ['"]\.\/mcp-capability-provider\.js['"]/u);
 assert.doesNotMatch(tuiSource, /@maka\/runtime-host\/server/u);
 assert.doesNotMatch(providerSource, /@maka\/runtime-host\/server/u);
});

test('MCP capability publication freezes an accepted callable tool snapshot', async () => {
 let accepted = false;
 const binding = 'binding-1' as McpToolBinding;
Expand Down

154 changes: 154 additions & 0 deletions
packages/cli/src/mcp-capability-provider.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

import { createHash } from 'node:crypto';
import type { McpBoundTool, McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
 CLIENT_CAPABILITY_MAX_TOOLS,
 CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
 decodeClientCapabilityReplaceInput,
 type ClientCapabilityCallResult,
 type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import type { McpCallResult, McpToolDescriptor } from '@maka/core/mcp';

const CAPABILITY_VERSION = '0';

export function createMcpCapabilityProvider(
 manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
 const toolSnapshot = manager.toolSnapshot();
 const tools = [...toolSnapshot.tools].sort(
 (left, right) =>
 left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
 left.descriptor.name.localeCompare(right.descriptor.name),
 );
 const toolCount = tools.length;
 if (toolCount === 0) return undefined;
 if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
 throw new Error(
 `MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
 );
 }

 const projectedIdentities = new Set<string>();
 const projected: Array<{
 readonly source: McpBoundTool;
 readonly descriptor: ReturnType<typeof projectMcpTool>;
 }> = [];
 for (const source of tools) {
 const descriptor = projectMcpTool(
 source.descriptor,
 capabilityEntityId(source.descriptor.serverId),
 );
 const identity = `${descriptor.serverId}\0${descriptor.name}`;
 if (projectedIdentities.has(identity)) {
 throw new Error('MCP tools collide after Client Capability identity normalization');
 }
 projectedIdentities.add(identity);
 projected.push({ source, descriptor });
 }

 const bindings = new Map<string, McpToolBinding>();
 const offers: ClientCapabilityOffer[] = [];
 for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
 const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
 offers.push({
 offerId,
 version: CAPABILITY_VERSION,
 affinity: 'session',
 hostPathAccess: 'none',
 label:
 servers.size === 1
 ? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
 : `MCP tools (${servers.size} servers)`,
 description: 'Use tools provided by connected MCP servers.',
 tools: chunk.map(({ descriptor }) => descriptor),
 });
 for (const { source, descriptor } of chunk) {
 bindings.set(
 capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
 source.binding,
 );
 }
 }
 const canonical = decodeClientCapabilityReplaceInput({
 registrationId: '00000000-0000-4000-8000-000000000000',
 offers,
 });

 return {
 offers: () => canonical.offers,
 call: async (frame, options) => {
 const binding = bindings.get(
 capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
 );
 if (!binding) throw new Error('MCP capability is not part of the published snapshot');
 await options.accept();
 return projectMcpResult(
 await manager.callTool(binding, frame.arguments, { signal: options.signal }),
 );
 },
 };
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
 return {
 serverId: wireServerId,
 name: capabilityEntityId(tool.name),
 ...(tool.description ? { description: tool.description } : {}),
 inputSchema: structuredClone(tool.inputSchema),
 ...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
 };
}

function capabilityEntityId(value: string): string {
 if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
 const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
 const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
 return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
 return {
 content: result.content.map((block) => structuredClone(block)),
 ...(result.structuredContent === undefined
 ? {}
 : { structuredContent: structuredClone(result.structuredContent) }),
 };
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
 const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
 for (const { source } of tools)
 hash
 .update('\0')
 .update(source.descriptor.serverId)
 .update('\0')
 .update(source.descriptor.name);
 return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
 return `${offerId}\0${serverId}\0${toolName}`;
}

134 changes: 2 additions & 132 deletions
packages/cli/src/runtime-host-capability-provider-command.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ import { createHash } from 'node:crypto';
import { readFile } from 'node:fs/promises';
import { homedir } from 'node:os';
import { dirname, join, resolve } from 'node:path';
import type {
 McpBoundTool,
 McpCallResult,
 McpToolBinding,
 McpToolDescriptor,
} from '@maka/core/mcp';
import { createCredentialMcpOAuthStorage, McpClientManager } from '@maka/mcp';
import { createFileCredentialStore } from '@maka/storage/credential-store';
import { normalizeMcpConfig } from '@maka/storage/mcp-config-store';
Expand All@@ -36,20 +30,15 @@ import {
 remoteRuntimeHostUnavailableError,
 RuntimeHostPermanentReconnectError,
 startRuntimeHostCapabilityProviderService,
 type ClientCapabilityProvider,
 type RuntimeHostConnection,
} from '@maka/runtime-host/client';
import {
 CLIENT_CAPABILITY_MAX_TOOLS,
 CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
 decodeClientCapabilityReplaceInput,
 INTERACTIVE_RUNTIME_HOST_COMPOSITION_ID,
 RUNTIME_HOST_COMPATIBILITY_EPOCH,
 RUNTIME_HOST_PROTOCOL_VERSION,
 type ClientCapabilityCallResult,
 type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import { runRuntimeHostProcessLifecycle } from '@maka/runtime-host/server';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const DEFAULT_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';
const CAPABILITY_VERSION = '0';
Expand DownExpand Up@@ -199,126 +188,7 @@ async function connectRemoteCapabilityProvider(input: {
 throw new Error('Runtime Host is draining');
}

export function createMcpCapabilityProvider(
 manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
 const toolSnapshot = manager.toolSnapshot();
 const tools = [...toolSnapshot.tools].sort(
 (left, right) =>
 left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
 left.descriptor.name.localeCompare(right.descriptor.name),
 );
 const toolCount = tools.length;
 if (toolCount === 0) return undefined;
 if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
 throw new Error(
 `MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
 );
 }

 const projectedIdentities = new Set<string>();
 const projected: Array<{
 readonly source: McpBoundTool;
 readonly descriptor: ReturnType<typeof projectMcpTool>;
 }> = [];
 for (const source of tools) {
 const descriptor = projectMcpTool(
 source.descriptor,
 capabilityEntityId(source.descriptor.serverId),
 );
 const identity = `${descriptor.serverId}\0${descriptor.name}`;
 if (projectedIdentities.has(identity)) {
 throw new Error('MCP tools collide after Client Capability identity normalization');
 }
 projectedIdentities.add(identity);
 projected.push({ source, descriptor });
 }

 const bindings = new Map<string, McpToolBinding>();
 const offers: ClientCapabilityOffer[] = [];
 for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
 const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
 offers.push({
 offerId,
 version: CAPABILITY_VERSION,
 affinity: 'session',
 hostPathAccess: 'none',
 label:
 servers.size === 1
 ? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
 : `MCP tools (${servers.size} servers)`,
 description: 'Use tools provided by connected MCP servers.',
 tools: chunk.map(({ descriptor }) => descriptor),
 });
 for (const { source, descriptor } of chunk) {
 bindings.set(
 capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
 source.binding,
 );
 }
 }
 const canonical = decodeClientCapabilityReplaceInput({
 registrationId: '00000000-0000-4000-8000-000000000000',
 offers,
 });

 return {
 offers: () => canonical.offers,
 call: async (frame, options) => {
 const binding = bindings.get(
 capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
 );
 if (!binding) throw new Error('MCP capability is not part of the published snapshot');
 await options.accept();
 return projectMcpResult(
 await manager.callTool(binding, frame.arguments, { signal: options.signal }),
 );
 },
 };
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
 return {
 serverId: wireServerId,
 name: capabilityEntityId(tool.name),
 ...(tool.description ? { description: tool.description } : {}),
 inputSchema: structuredClone(tool.inputSchema),
 ...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
 };
}

function capabilityEntityId(value: string): string {
 if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
 const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
 const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
 return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
 return {
 content: result.content.map((block) => structuredClone(block)),
 ...(result.structuredContent === undefined
 ? {}
 : { structuredContent: structuredClone(result.structuredContent) }),
 };
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
 const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
 for (const { source } of tools)
 hash
 .update('\0')
 .update(source.descriptor.serverId)
 .update('\0')
 .update(source.descriptor.name);
 return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
 return `${offerId}\0${serverId}\0${toolName}`;
}
export { createMcpCapabilityProvider } from './mcp-capability-provider.js';

function reportRefreshFailure(error: unknown): void {
 const message = error instanceof Error ? error.message : String(error);
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli/src/tui-mcp-control.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import type {
 RuntimeHostConnectionAvailability,
 RuntimeHostReconnectingConnection,
} from '@maka/runtime-host/client';
import { createMcpCapabilityProvider } from './runtime-host-capability-provider-command.js';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const RUNTIME_HOST_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI by me2seeks · Pull Request #4007 · apache/maka · GitHub
Skip to content
fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI#4007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

likun666661
merged 3 commits into

from

Aug 28, 2026

+171

−133

 Merged


fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI
#4007
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
86e97b9

fix(cli): split MCP capability provider to avoid pulling runtime-host…


me2seeks Aug 27, 2026
1073fb0

style(cli): collapse mcp-capability-provider type import


me2seeks Aug 27, 2026
532dbc2

test(cli): guard TUI MCP import boundary


me2seeks Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 14 additions & 0 deletions
packages/cli/src/__tests__/runtime-host-capability-provider-command.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,25 @@
 */

import assert from 'node:assert/strict';
import { readFile } from 'node:fs/promises';
import { test } from 'node:test';
import type { McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import { createMcpCapabilityProvider as createPureMcpCapabilityProvider } from '../mcp-capability-provider.js';
import { createMcpCapabilityProvider } from '../runtime-host-capability-provider-command.js';

test('TUI MCP control keeps its capability provider on the pure import boundary', async () => {
 const [tuiSource, providerSource] = await Promise.all([
 readFile(new URL('../tui-mcp-control.js', import.meta.url), 'utf8'),
 readFile(new URL('../mcp-capability-provider.js', import.meta.url), 'utf8'),
 ]);

 assert.equal(createMcpCapabilityProvider, createPureMcpCapabilityProvider);
 assert.match(tuiSource, /from ['"]\.\/mcp-capability-provider\.js['"]/u);
 assert.doesNotMatch(tuiSource, /@maka\/runtime-host\/server/u);
 assert.doesNotMatch(providerSource, /@maka\/runtime-host\/server/u);
});

test('MCP capability publication freezes an accepted callable tool snapshot', async () => {
 let accepted = false;
 const binding = 'binding-1' as McpToolBinding;
Expand Down

154 changes: 154 additions & 0 deletions
packages/cli/src/mcp-capability-provider.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

import { createHash } from 'node:crypto';
import type { McpBoundTool, McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
 CLIENT_CAPABILITY_MAX_TOOLS,
 CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
 decodeClientCapabilityReplaceInput,
 type ClientCapabilityCallResult,
 type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import type { McpCallResult, McpToolDescriptor } from '@maka/core/mcp';

const CAPABILITY_VERSION = '0';

export function createMcpCapabilityProvider(
 manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
 const toolSnapshot = manager.toolSnapshot();
 const tools = [...toolSnapshot.tools].sort(
 (left, right) =>
 left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
 left.descriptor.name.localeCompare(right.descriptor.name),
 );
 const toolCount = tools.length;
 if (toolCount === 0) return undefined;
 if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
 throw new Error(
 `MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
 );
 }

 const projectedIdentities = new Set<string>();
 const projected: Array<{
 readonly source: McpBoundTool;
 readonly descriptor: ReturnType<typeof projectMcpTool>;
 }> = [];
 for (const source of tools) {
 const descriptor = projectMcpTool(
 source.descriptor,
 capabilityEntityId(source.descriptor.serverId),
 );
 const identity = `${descriptor.serverId}\0${descriptor.name}`;
 if (projectedIdentities.has(identity)) {
 throw new Error('MCP tools collide after Client Capability identity normalization');
 }
 projectedIdentities.add(identity);
 projected.push({ source, descriptor });
 }

 const bindings = new Map<string, McpToolBinding>();
 const offers: ClientCapabilityOffer[] = [];
 for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
 const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
 offers.push({
 offerId,
 version: CAPABILITY_VERSION,
 affinity: 'session',
 hostPathAccess: 'none',
 label:
 servers.size === 1
 ? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
 : `MCP tools (${servers.size} servers)`,
 description: 'Use tools provided by connected MCP servers.',
 tools: chunk.map(({ descriptor }) => descriptor),
 });
 for (const { source, descriptor } of chunk) {
 bindings.set(
 capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
 source.binding,
 );
 }
 }
 const canonical = decodeClientCapabilityReplaceInput({
 registrationId: '00000000-0000-4000-8000-000000000000',
 offers,
 });

 return {
 offers: () => canonical.offers,
 call: async (frame, options) => {
 const binding = bindings.get(
 capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
 );
 if (!binding) throw new Error('MCP capability is not part of the published snapshot');
 await options.accept();
 return projectMcpResult(
 await manager.callTool(binding, frame.arguments, { signal: options.signal }),
 );
 },
 };
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
 return {
 serverId: wireServerId,
 name: capabilityEntityId(tool.name),
 ...(tool.description ? { description: tool.description } : {}),
 inputSchema: structuredClone(tool.inputSchema),
 ...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
 };
}

function capabilityEntityId(value: string): string {
 if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
 const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
 const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
 return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
 return {
 content: result.content.map((block) => structuredClone(block)),
 ...(result.structuredContent === undefined
 ? {}
 : { structuredContent: structuredClone(result.structuredContent) }),
 };
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
 const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
 for (const { source } of tools)
 hash
 .update('\0')
 .update(source.descriptor.serverId)
 .update('\0')
 .update(source.descriptor.name);
 return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
 return `${offerId}\0${serverId}\0${toolName}`;
}

134 changes: 2 additions & 132 deletions
packages/cli/src/runtime-host-capability-provider-command.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ import { createHash } from 'node:crypto';
import { readFile } from 'node:fs/promises';
import { homedir } from 'node:os';
import { dirname, join, resolve } from 'node:path';
import type {
 McpBoundTool,
 McpCallResult,
 McpToolBinding,
 McpToolDescriptor,
} from '@maka/core/mcp';
import { createCredentialMcpOAuthStorage, McpClientManager } from '@maka/mcp';
import { createFileCredentialStore } from '@maka/storage/credential-store';
import { normalizeMcpConfig } from '@maka/storage/mcp-config-store';
Expand All@@ -36,20 +30,15 @@ import {
 remoteRuntimeHostUnavailableError,
 RuntimeHostPermanentReconnectError,
 startRuntimeHostCapabilityProviderService,
 type ClientCapabilityProvider,
 type RuntimeHostConnection,
} from '@maka/runtime-host/client';
import {
 CLIENT_CAPABILITY_MAX_TOOLS,
 CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
 decodeClientCapabilityReplaceInput,
 INTERACTIVE_RUNTIME_HOST_COMPOSITION_ID,
 RUNTIME_HOST_COMPATIBILITY_EPOCH,
 RUNTIME_HOST_PROTOCOL_VERSION,
 type ClientCapabilityCallResult,
 type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import { runRuntimeHostProcessLifecycle } from '@maka/runtime-host/server';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const DEFAULT_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';
const CAPABILITY_VERSION = '0';
Expand DownExpand Up@@ -199,126 +188,7 @@ async function connectRemoteCapabilityProvider(input: {
 throw new Error('Runtime Host is draining');
}

export function createMcpCapabilityProvider(
 manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
 const toolSnapshot = manager.toolSnapshot();
 const tools = [...toolSnapshot.tools].sort(
 (left, right) =>
 left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
 left.descriptor.name.localeCompare(right.descriptor.name),
 );
 const toolCount = tools.length;
 if (toolCount === 0) return undefined;
 if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
 throw new Error(
 `MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
 );
 }

 const projectedIdentities = new Set<string>();
 const projected: Array<{
 readonly source: McpBoundTool;
 readonly descriptor: ReturnType<typeof projectMcpTool>;
 }> = [];
 for (const source of tools) {
 const descriptor = projectMcpTool(
 source.descriptor,
 capabilityEntityId(source.descriptor.serverId),
 );
 const identity = `${descriptor.serverId}\0${descriptor.name}`;
 if (projectedIdentities.has(identity)) {
 throw new Error('MCP tools collide after Client Capability identity normalization');
 }
 projectedIdentities.add(identity);
 projected.push({ source, descriptor });
 }

 const bindings = new Map<string, McpToolBinding>();
 const offers: ClientCapabilityOffer[] = [];
 for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
 const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
 offers.push({
 offerId,
 version: CAPABILITY_VERSION,
 affinity: 'session',
 hostPathAccess: 'none',
 label:
 servers.size === 1
 ? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
 : `MCP tools (${servers.size} servers)`,
 description: 'Use tools provided by connected MCP servers.',
 tools: chunk.map(({ descriptor }) => descriptor),
 });
 for (const { source, descriptor } of chunk) {
 bindings.set(
 capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
 source.binding,
 );
 }
 }
 const canonical = decodeClientCapabilityReplaceInput({
 registrationId: '00000000-0000-4000-8000-000000000000',
 offers,
 });

 return {
 offers: () => canonical.offers,
 call: async (frame, options) => {
 const binding = bindings.get(
 capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
 );
 if (!binding) throw new Error('MCP capability is not part of the published snapshot');
 await options.accept();
 return projectMcpResult(
 await manager.callTool(binding, frame.arguments, { signal: options.signal }),
 );
 },
 };
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
 return {
 serverId: wireServerId,
 name: capabilityEntityId(tool.name),
 ...(tool.description ? { description: tool.description } : {}),
 inputSchema: structuredClone(tool.inputSchema),
 ...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
 };
}

function capabilityEntityId(value: string): string {
 if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
 const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
 const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
 return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
 return {
 content: result.content.map((block) => structuredClone(block)),
 ...(result.structuredContent === undefined
 ? {}
 : { structuredContent: structuredClone(result.structuredContent) }),
 };
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
 const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
 for (const { source } of tools)
 hash
 .update('\0')
 .update(source.descriptor.serverId)
 .update('\0')
 .update(source.descriptor.name);
 return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
 return `${offerId}\0${serverId}\0${toolName}`;
}
export { createMcpCapabilityProvider } from './mcp-capability-provider.js';

function reportRefreshFailure(error: unknown): void {
 const message = error instanceof Error ? error.message : String(error);
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli/src/tui-mcp-control.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import type {
 RuntimeHostConnectionAvailability,
 RuntimeHostReconnectingConnection,
} from '@maka/runtime-host/client';
import { createMcpCapabilityProvider } from './runtime-host-capability-provider-command.js';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const RUNTIME_HOST_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI by me2seeks · Pull Request #4007 · apache/maka · GitHub
Skip to content
fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI#4007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

likun666661
merged 3 commits into

from

Aug 28, 2026

+171

−133

 Merged


fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI
#4007
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
86e97b9

fix(cli): split MCP capability provider to avoid pulling runtime-host…


me2seeks Aug 27, 2026
1073fb0

style(cli): collapse mcp-capability-provider type import


me2seeks Aug 27, 2026
532dbc2

test(cli): guard TUI MCP import boundary


me2seeks Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 14 additions & 0 deletions
packages/cli/src/__tests__/runtime-host-capability-provider-command.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,25 @@
 */

import assert from 'node:assert/strict';
import { readFile } from 'node:fs/promises';
import { test } from 'node:test';
import type { McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import { createMcpCapabilityProvider as createPureMcpCapabilityProvider } from '../mcp-capability-provider.js';
import { createMcpCapabilityProvider } from '../runtime-host-capability-provider-command.js';

test('TUI MCP control keeps its capability provider on the pure import boundary', async () => {
 const [tuiSource, providerSource] = await Promise.all([
 readFile(new URL('../tui-mcp-control.js', import.meta.url), 'utf8'),
 readFile(new URL('../mcp-capability-provider.js', import.meta.url), 'utf8'),
 ]);

 assert.equal(createMcpCapabilityProvider, createPureMcpCapabilityProvider);
 assert.match(tuiSource, /from ['"]\.\/mcp-capability-provider\.js['"]/u);
 assert.doesNotMatch(tuiSource, /@maka\/runtime-host\/server/u);
 assert.doesNotMatch(providerSource, /@maka\/runtime-host\/server/u);
});

test('MCP capability publication freezes an accepted callable tool snapshot', async () => {
 let accepted = false;
 const binding = 'binding-1' as McpToolBinding;
Expand Down

154 changes: 154 additions & 0 deletions
packages/cli/src/mcp-capability-provider.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

import { createHash } from 'node:crypto';
import type { McpBoundTool, McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
 CLIENT_CAPABILITY_MAX_TOOLS,
 CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
 decodeClientCapabilityReplaceInput,
 type ClientCapabilityCallResult,
 type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import type { McpCallResult, McpToolDescriptor } from '@maka/core/mcp';

const CAPABILITY_VERSION = '0';

export function createMcpCapabilityProvider(
 manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
 const toolSnapshot = manager.toolSnapshot();
 const tools = [...toolSnapshot.tools].sort(
 (left, right) =>
 left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
 left.descriptor.name.localeCompare(right.descriptor.name),
 );
 const toolCount = tools.length;
 if (toolCount === 0) return undefined;
 if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
 throw new Error(
 `MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
 );
 }

 const projectedIdentities = new Set<string>();
 const projected: Array<{
 readonly source: McpBoundTool;
 readonly descriptor: ReturnType<typeof projectMcpTool>;
 }> = [];
 for (const source of tools) {
 const descriptor = projectMcpTool(
 source.descriptor,
 capabilityEntityId(source.descriptor.serverId),
 );
 const identity = `${descriptor.serverId}\0${descriptor.name}`;
 if (projectedIdentities.has(identity)) {
 throw new Error('MCP tools collide after Client Capability identity normalization');
 }
 projectedIdentities.add(identity);
 projected.push({ source, descriptor });
 }

 const bindings = new Map<string, McpToolBinding>();
 const offers: ClientCapabilityOffer[] = [];
 for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
 const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
 offers.push({
 offerId,
 version: CAPABILITY_VERSION,
 affinity: 'session',
 hostPathAccess: 'none',
 label:
 servers.size === 1
 ? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
 : `MCP tools (${servers.size} servers)`,
 description: 'Use tools provided by connected MCP servers.',
 tools: chunk.map(({ descriptor }) => descriptor),
 });
 for (const { source, descriptor } of chunk) {
 bindings.set(
 capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
 source.binding,
 );
 }
 }
 const canonical = decodeClientCapabilityReplaceInput({
 registrationId: '00000000-0000-4000-8000-000000000000',
 offers,
 });

 return {
 offers: () => canonical.offers,
 call: async (frame, options) => {
 const binding = bindings.get(
 capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
 );
 if (!binding) throw new Error('MCP capability is not part of the published snapshot');
 await options.accept();
 return projectMcpResult(
 await manager.callTool(binding, frame.arguments, { signal: options.signal }),
 );
 },
 };
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
 return {
 serverId: wireServerId,
 name: capabilityEntityId(tool.name),
 ...(tool.description ? { description: tool.description } : {}),
 inputSchema: structuredClone(tool.inputSchema),
 ...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
 };
}

function capabilityEntityId(value: string): string {
 if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
 const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
 const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
 return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
 return {
 content: result.content.map((block) => structuredClone(block)),
 ...(result.structuredContent === undefined
 ? {}
 : { structuredContent: structuredClone(result.structuredContent) }),
 };
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
 const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
 for (const { source } of tools)
 hash
 .update('\0')
 .update(source.descriptor.serverId)
 .update('\0')
 .update(source.descriptor.name);
 return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
 return `${offerId}\0${serverId}\0${toolName}`;
}

134 changes: 2 additions & 132 deletions
packages/cli/src/runtime-host-capability-provider-command.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ import { createHash } from 'node:crypto';
import { readFile } from 'node:fs/promises';
import { homedir } from 'node:os';
import { dirname, join, resolve } from 'node:path';
import type {
 McpBoundTool,
 McpCallResult,
 McpToolBinding,
 McpToolDescriptor,
} from '@maka/core/mcp';
import { createCredentialMcpOAuthStorage, McpClientManager } from '@maka/mcp';
import { createFileCredentialStore } from '@maka/storage/credential-store';
import { normalizeMcpConfig } from '@maka/storage/mcp-config-store';
Expand All@@ -36,20 +30,15 @@ import {
 remoteRuntimeHostUnavailableError,
 RuntimeHostPermanentReconnectError,
 startRuntimeHostCapabilityProviderService,
 type ClientCapabilityProvider,
 type RuntimeHostConnection,
} from '@maka/runtime-host/client';
import {
 CLIENT_CAPABILITY_MAX_TOOLS,
 CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
 decodeClientCapabilityReplaceInput,
 INTERACTIVE_RUNTIME_HOST_COMPOSITION_ID,
 RUNTIME_HOST_COMPATIBILITY_EPOCH,
 RUNTIME_HOST_PROTOCOL_VERSION,
 type ClientCapabilityCallResult,
 type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import { runRuntimeHostProcessLifecycle } from '@maka/runtime-host/server';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const DEFAULT_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';
const CAPABILITY_VERSION = '0';
Expand DownExpand Up@@ -199,126 +188,7 @@ async function connectRemoteCapabilityProvider(input: {
 throw new Error('Runtime Host is draining');
}

export function createMcpCapabilityProvider(
 manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
 const toolSnapshot = manager.toolSnapshot();
 const tools = [...toolSnapshot.tools].sort(
 (left, right) =>
 left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
 left.descriptor.name.localeCompare(right.descriptor.name),
 );
 const toolCount = tools.length;
 if (toolCount === 0) return undefined;
 if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
 throw new Error(
 `MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
 );
 }

 const projectedIdentities = new Set<string>();
 const projected: Array<{
 readonly source: McpBoundTool;
 readonly descriptor: ReturnType<typeof projectMcpTool>;
 }> = [];
 for (const source of tools) {
 const descriptor = projectMcpTool(
 source.descriptor,
 capabilityEntityId(source.descriptor.serverId),
 );
 const identity = `${descriptor.serverId}\0${descriptor.name}`;
 if (projectedIdentities.has(identity)) {
 throw new Error('MCP tools collide after Client Capability identity normalization');
 }
 projectedIdentities.add(identity);
 projected.push({ source, descriptor });
 }

 const bindings = new Map<string, McpToolBinding>();
 const offers: ClientCapabilityOffer[] = [];
 for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
 const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
 offers.push({
 offerId,
 version: CAPABILITY_VERSION,
 affinity: 'session',
 hostPathAccess: 'none',
 label:
 servers.size === 1
 ? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
 : `MCP tools (${servers.size} servers)`,
 description: 'Use tools provided by connected MCP servers.',
 tools: chunk.map(({ descriptor }) => descriptor),
 });
 for (const { source, descriptor } of chunk) {
 bindings.set(
 capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
 source.binding,
 );
 }
 }
 const canonical = decodeClientCapabilityReplaceInput({
 registrationId: '00000000-0000-4000-8000-000000000000',
 offers,
 });

 return {
 offers: () => canonical.offers,
 call: async (frame, options) => {
 const binding = bindings.get(
 capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
 );
 if (!binding) throw new Error('MCP capability is not part of the published snapshot');
 await options.accept();
 return projectMcpResult(
 await manager.callTool(binding, frame.arguments, { signal: options.signal }),
 );
 },
 };
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
 return {
 serverId: wireServerId,
 name: capabilityEntityId(tool.name),
 ...(tool.description ? { description: tool.description } : {}),
 inputSchema: structuredClone(tool.inputSchema),
 ...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
 };
}

function capabilityEntityId(value: string): string {
 if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
 const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
 const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
 return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
 return {
 content: result.content.map((block) => structuredClone(block)),
 ...(result.structuredContent === undefined
 ? {}
 : { structuredContent: structuredClone(result.structuredContent) }),
 };
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
 const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
 for (const { source } of tools)
 hash
 .update('\0')
 .update(source.descriptor.serverId)
 .update('\0')
 .update(source.descriptor.name);
 return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
 return `${offerId}\0${serverId}\0${toolName}`;
}
export { createMcpCapabilityProvider } from './mcp-capability-provider.js';

function reportRefreshFailure(error: unknown): void {
 const message = error instanceof Error ? error.message : String(error);
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli/src/tui-mcp-control.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import type {
 RuntimeHostConnectionAvailability,
 RuntimeHostReconnectingConnection,
} from '@maka/runtime-host/client';
import { createMcpCapabilityProvider } from './runtime-host-capability-provider-command.js';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const RUNTIME_HOST_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI by me2seeks · Pull Request #4007 · apache/maka · GitHub
Skip to content
fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI#4007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

likun666661
merged 3 commits into

from

Aug 28, 2026

+171

−133

 Merged


fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI
#4007
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
86e97b9

fix(cli): split MCP capability provider to avoid pulling runtime-host…


me2seeks Aug 27, 2026
1073fb0

style(cli): collapse mcp-capability-provider type import


me2seeks Aug 27, 2026
532dbc2

test(cli): guard TUI MCP import boundary


me2seeks Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 14 additions & 0 deletions
packages/cli/src/__tests__/runtime-host-capability-provider-command.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,25 @@
 */

import assert from 'node:assert/strict';
import { readFile } from 'node:fs/promises';
import { test } from 'node:test';
import type { McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import { createMcpCapabilityProvider as createPureMcpCapabilityProvider } from '../mcp-capability-provider.js';
import { createMcpCapabilityProvider } from '../runtime-host-capability-provider-command.js';

test('TUI MCP control keeps its capability provider on the pure import boundary', async () => {
 const [tuiSource, providerSource] = await Promise.all([
 readFile(new URL('../tui-mcp-control.js', import.meta.url), 'utf8'),
 readFile(new URL('../mcp-capability-provider.js', import.meta.url), 'utf8'),
 ]);

 assert.equal(createMcpCapabilityProvider, createPureMcpCapabilityProvider);
 assert.match(tuiSource, /from ['"]\.\/mcp-capability-provider\.js['"]/u);
 assert.doesNotMatch(tuiSource, /@maka\/runtime-host\/server/u);
 assert.doesNotMatch(providerSource, /@maka\/runtime-host\/server/u);
});

test('MCP capability publication freezes an accepted callable tool snapshot', async () => {
 let accepted = false;
 const binding = 'binding-1' as McpToolBinding;
Expand Down

154 changes: 154 additions & 0 deletions
packages/cli/src/mcp-capability-provider.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

import { createHash } from 'node:crypto';
import type { McpBoundTool, McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
 CLIENT_CAPABILITY_MAX_TOOLS,
 CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
 decodeClientCapabilityReplaceInput,
 type ClientCapabilityCallResult,
 type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import type { McpCallResult, McpToolDescriptor } from '@maka/core/mcp';

const CAPABILITY_VERSION = '0';

export function createMcpCapabilityProvider(
 manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
 const toolSnapshot = manager.toolSnapshot();
 const tools = [...toolSnapshot.tools].sort(
 (left, right) =>
 left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
 left.descriptor.name.localeCompare(right.descriptor.name),
 );
 const toolCount = tools.length;
 if (toolCount === 0) return undefined;
 if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
 throw new Error(
 `MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
 );
 }

 const projectedIdentities = new Set<string>();
 const projected: Array<{
 readonly source: McpBoundTool;
 readonly descriptor: ReturnType<typeof projectMcpTool>;
 }> = [];
 for (const source of tools) {
 const descriptor = projectMcpTool(
 source.descriptor,
 capabilityEntityId(source.descriptor.serverId),
 );
 const identity = `${descriptor.serverId}\0${descriptor.name}`;
 if (projectedIdentities.has(identity)) {
 throw new Error('MCP tools collide after Client Capability identity normalization');
 }
 projectedIdentities.add(identity);
 projected.push({ source, descriptor });
 }

 const bindings = new Map<string, McpToolBinding>();
 const offers: ClientCapabilityOffer[] = [];
 for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
 const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
 offers.push({
 offerId,
 version: CAPABILITY_VERSION,
 affinity: 'session',
 hostPathAccess: 'none',
 label:
 servers.size === 1
 ? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
 : `MCP tools (${servers.size} servers)`,
 description: 'Use tools provided by connected MCP servers.',
 tools: chunk.map(({ descriptor }) => descriptor),
 });
 for (const { source, descriptor } of chunk) {
 bindings.set(
 capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
 source.binding,
 );
 }
 }
 const canonical = decodeClientCapabilityReplaceInput({
 registrationId: '00000000-0000-4000-8000-000000000000',
 offers,
 });

 return {
 offers: () => canonical.offers,
 call: async (frame, options) => {
 const binding = bindings.get(
 capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
 );
 if (!binding) throw new Error('MCP capability is not part of the published snapshot');
 await options.accept();
 return projectMcpResult(
 await manager.callTool(binding, frame.arguments, { signal: options.signal }),
 );
 },
 };
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
 return {
 serverId: wireServerId,
 name: capabilityEntityId(tool.name),
 ...(tool.description ? { description: tool.description } : {}),
 inputSchema: structuredClone(tool.inputSchema),
 ...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
 };
}

function capabilityEntityId(value: string): string {
 if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
 const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
 const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
 return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
 return {
 content: result.content.map((block) => structuredClone(block)),
 ...(result.structuredContent === undefined
 ? {}
 : { structuredContent: structuredClone(result.structuredContent) }),
 };
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
 const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
 for (const { source } of tools)
 hash
 .update('\0')
 .update(source.descriptor.serverId)
 .update('\0')
 .update(source.descriptor.name);
 return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
 return `${offerId}\0${serverId}\0${toolName}`;
}

134 changes: 2 additions & 132 deletions
packages/cli/src/runtime-host-capability-provider-command.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ import { createHash } from 'node:crypto';
import { readFile } from 'node:fs/promises';
import { homedir } from 'node:os';
import { dirname, join, resolve } from 'node:path';
import type {
 McpBoundTool,
 McpCallResult,
 McpToolBinding,
 McpToolDescriptor,
} from '@maka/core/mcp';
import { createCredentialMcpOAuthStorage, McpClientManager } from '@maka/mcp';
import { createFileCredentialStore } from '@maka/storage/credential-store';
import { normalizeMcpConfig } from '@maka/storage/mcp-config-store';
Expand All@@ -36,20 +30,15 @@ import {
 remoteRuntimeHostUnavailableError,
 RuntimeHostPermanentReconnectError,
 startRuntimeHostCapabilityProviderService,
 type ClientCapabilityProvider,
 type RuntimeHostConnection,
} from '@maka/runtime-host/client';
import {
 CLIENT_CAPABILITY_MAX_TOOLS,
 CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
 decodeClientCapabilityReplaceInput,
 INTERACTIVE_RUNTIME_HOST_COMPOSITION_ID,
 RUNTIME_HOST_COMPATIBILITY_EPOCH,
 RUNTIME_HOST_PROTOCOL_VERSION,
 type ClientCapabilityCallResult,
 type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import { runRuntimeHostProcessLifecycle } from '@maka/runtime-host/server';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const DEFAULT_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';
const CAPABILITY_VERSION = '0';
Expand DownExpand Up@@ -199,126 +188,7 @@ async function connectRemoteCapabilityProvider(input: {
 throw new Error('Runtime Host is draining');
}

export function createMcpCapabilityProvider(
 manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
 const toolSnapshot = manager.toolSnapshot();
 const tools = [...toolSnapshot.tools].sort(
 (left, right) =>
 left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
 left.descriptor.name.localeCompare(right.descriptor.name),
 );
 const toolCount = tools.length;
 if (toolCount === 0) return undefined;
 if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
 throw new Error(
 `MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
 );
 }

 const projectedIdentities = new Set<string>();
 const projected: Array<{
 readonly source: McpBoundTool;
 readonly descriptor: ReturnType<typeof projectMcpTool>;
 }> = [];
 for (const source of tools) {
 const descriptor = projectMcpTool(
 source.descriptor,
 capabilityEntityId(source.descriptor.serverId),
 );
 const identity = `${descriptor.serverId}\0${descriptor.name}`;
 if (projectedIdentities.has(identity)) {
 throw new Error('MCP tools collide after Client Capability identity normalization');
 }
 projectedIdentities.add(identity);
 projected.push({ source, descriptor });
 }

 const bindings = new Map<string, McpToolBinding>();
 const offers: ClientCapabilityOffer[] = [];
 for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
 const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
 offers.push({
 offerId,
 version: CAPABILITY_VERSION,
 affinity: 'session',
 hostPathAccess: 'none',
 label:
 servers.size === 1
 ? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
 : `MCP tools (${servers.size} servers)`,
 description: 'Use tools provided by connected MCP servers.',
 tools: chunk.map(({ descriptor }) => descriptor),
 });
 for (const { source, descriptor } of chunk) {
 bindings.set(
 capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
 source.binding,
 );
 }
 }
 const canonical = decodeClientCapabilityReplaceInput({
 registrationId: '00000000-0000-4000-8000-000000000000',
 offers,
 });

 return {
 offers: () => canonical.offers,
 call: async (frame, options) => {
 const binding = bindings.get(
 capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
 );
 if (!binding) throw new Error('MCP capability is not part of the published snapshot');
 await options.accept();
 return projectMcpResult(
 await manager.callTool(binding, frame.arguments, { signal: options.signal }),
 );
 },
 };
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
 return {
 serverId: wireServerId,
 name: capabilityEntityId(tool.name),
 ...(tool.description ? { description: tool.description } : {}),
 inputSchema: structuredClone(tool.inputSchema),
 ...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
 };
}

function capabilityEntityId(value: string): string {
 if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
 const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
 const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
 return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
 return {
 content: result.content.map((block) => structuredClone(block)),
 ...(result.structuredContent === undefined
 ? {}
 : { structuredContent: structuredClone(result.structuredContent) }),
 };
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
 const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
 for (const { source } of tools)
 hash
 .update('\0')
 .update(source.descriptor.serverId)
 .update('\0')
 .update(source.descriptor.name);
 return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
 return `${offerId}\0${serverId}\0${toolName}`;
}
export { createMcpCapabilityProvider } from './mcp-capability-provider.js';

function reportRefreshFailure(error: unknown): void {
 const message = error instanceof Error ? error.message : String(error);
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli/src/tui-mcp-control.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import type {
 RuntimeHostConnectionAvailability,
 RuntimeHostReconnectingConnection,
} from '@maka/runtime-host/client';
import { createMcpCapabilityProvider } from './runtime-host-capability-provider-command.js';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const RUNTIME_HOST_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI by me2seeks · Pull Request #4007 · apache/maka · GitHub
Skip to content
fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI#4007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

likun666661
merged 3 commits into

from

Aug 28, 2026

+171

−133

 Merged


fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI
#4007
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
86e97b9

fix(cli): split MCP capability provider to avoid pulling runtime-host…


me2seeks Aug 27, 2026
1073fb0

style(cli): collapse mcp-capability-provider type import


me2seeks Aug 27, 2026
532dbc2

test(cli): guard TUI MCP import boundary


me2seeks Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 14 additions & 0 deletions
packages/cli/src/__tests__/runtime-host-capability-provider-command.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,25 @@
 */

import assert from 'node:assert/strict';
import { readFile } from 'node:fs/promises';
import { test } from 'node:test';
import type { McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import { createMcpCapabilityProvider as createPureMcpCapabilityProvider } from '../mcp-capability-provider.js';
import { createMcpCapabilityProvider } from '../runtime-host-capability-provider-command.js';

test('TUI MCP control keeps its capability provider on the pure import boundary', async () => {
 const [tuiSource, providerSource] = await Promise.all([
 readFile(new URL('../tui-mcp-control.js', import.meta.url), 'utf8'),
 readFile(new URL('../mcp-capability-provider.js', import.meta.url), 'utf8'),
 ]);

 assert.equal(createMcpCapabilityProvider, createPureMcpCapabilityProvider);
 assert.match(tuiSource, /from ['"]\.\/mcp-capability-provider\.js['"]/u);
 assert.doesNotMatch(tuiSource, /@maka\/runtime-host\/server/u);
 assert.doesNotMatch(providerSource, /@maka\/runtime-host\/server/u);
});

test('MCP capability publication freezes an accepted callable tool snapshot', async () => {
 let accepted = false;
 const binding = 'binding-1' as McpToolBinding;
Expand Down

154 changes: 154 additions & 0 deletions
packages/cli/src/mcp-capability-provider.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

import { createHash } from 'node:crypto';
import type { McpBoundTool, McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
 CLIENT_CAPABILITY_MAX_TOOLS,
 CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
 decodeClientCapabilityReplaceInput,
 type ClientCapabilityCallResult,
 type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import type { McpCallResult, McpToolDescriptor } from '@maka/core/mcp';

const CAPABILITY_VERSION = '0';

export function createMcpCapabilityProvider(
 manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
 const toolSnapshot = manager.toolSnapshot();
 const tools = [...toolSnapshot.tools].sort(
 (left, right) =>
 left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
 left.descriptor.name.localeCompare(right.descriptor.name),
 );
 const toolCount = tools.length;
 if (toolCount === 0) return undefined;
 if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
 throw new Error(
 `MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
 );
 }

 const projectedIdentities = new Set<string>();
 const projected: Array<{
 readonly source: McpBoundTool;
 readonly descriptor: ReturnType<typeof projectMcpTool>;
 }> = [];
 for (const source of tools) {
 const descriptor = projectMcpTool(
 source.descriptor,
 capabilityEntityId(source.descriptor.serverId),
 );
 const identity = `${descriptor.serverId}\0${descriptor.name}`;
 if (projectedIdentities.has(identity)) {
 throw new Error('MCP tools collide after Client Capability identity normalization');
 }
 projectedIdentities.add(identity);
 projected.push({ source, descriptor });
 }

 const bindings = new Map<string, McpToolBinding>();
 const offers: ClientCapabilityOffer[] = [];
 for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
 const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
 offers.push({
 offerId,
 version: CAPABILITY_VERSION,
 affinity: 'session',
 hostPathAccess: 'none',
 label:
 servers.size === 1
 ? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
 : `MCP tools (${servers.size} servers)`,
 description: 'Use tools provided by connected MCP servers.',
 tools: chunk.map(({ descriptor }) => descriptor),
 });
 for (const { source, descriptor } of chunk) {
 bindings.set(
 capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
 source.binding,
 );
 }
 }
 const canonical = decodeClientCapabilityReplaceInput({
 registrationId: '00000000-0000-4000-8000-000000000000',
 offers,
 });

 return {
 offers: () => canonical.offers,
 call: async (frame, options) => {
 const binding = bindings.get(
 capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
 );
 if (!binding) throw new Error('MCP capability is not part of the published snapshot');
 await options.accept();
 return projectMcpResult(
 await manager.callTool(binding, frame.arguments, { signal: options.signal }),
 );
 },
 };
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
 return {
 serverId: wireServerId,
 name: capabilityEntityId(tool.name),
 ...(tool.description ? { description: tool.description } : {}),
 inputSchema: structuredClone(tool.inputSchema),
 ...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
 };
}

function capabilityEntityId(value: string): string {
 if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
 const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
 const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
 return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
 return {
 content: result.content.map((block) => structuredClone(block)),
 ...(result.structuredContent === undefined
 ? {}
 : { structuredContent: structuredClone(result.structuredContent) }),
 };
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
 const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
 for (const { source } of tools)
 hash
 .update('\0')
 .update(source.descriptor.serverId)
 .update('\0')
 .update(source.descriptor.name);
 return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
 return `${offerId}\0${serverId}\0${toolName}`;
}

134 changes: 2 additions & 132 deletions
packages/cli/src/runtime-host-capability-provider-command.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ import { createHash } from 'node:crypto';
import { readFile } from 'node:fs/promises';
import { homedir } from 'node:os';
import { dirname, join, resolve } from 'node:path';
import type {
 McpBoundTool,
 McpCallResult,
 McpToolBinding,
 McpToolDescriptor,
} from '@maka/core/mcp';
import { createCredentialMcpOAuthStorage, McpClientManager } from '@maka/mcp';
import { createFileCredentialStore } from '@maka/storage/credential-store';
import { normalizeMcpConfig } from '@maka/storage/mcp-config-store';
Expand All@@ -36,20 +30,15 @@ import {
 remoteRuntimeHostUnavailableError,
 RuntimeHostPermanentReconnectError,
 startRuntimeHostCapabilityProviderService,
 type ClientCapabilityProvider,
 type RuntimeHostConnection,
} from '@maka/runtime-host/client';
import {
 CLIENT_CAPABILITY_MAX_TOOLS,
 CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
 decodeClientCapabilityReplaceInput,
 INTERACTIVE_RUNTIME_HOST_COMPOSITION_ID,
 RUNTIME_HOST_COMPATIBILITY_EPOCH,
 RUNTIME_HOST_PROTOCOL_VERSION,
 type ClientCapabilityCallResult,
 type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import { runRuntimeHostProcessLifecycle } from '@maka/runtime-host/server';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const DEFAULT_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';
const CAPABILITY_VERSION = '0';
Expand DownExpand Up@@ -199,126 +188,7 @@ async function connectRemoteCapabilityProvider(input: {
 throw new Error('Runtime Host is draining');
}

export function createMcpCapabilityProvider(
 manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
 const toolSnapshot = manager.toolSnapshot();
 const tools = [...toolSnapshot.tools].sort(
 (left, right) =>
 left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
 left.descriptor.name.localeCompare(right.descriptor.name),
 );
 const toolCount = tools.length;
 if (toolCount === 0) return undefined;
 if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
 throw new Error(
 `MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
 );
 }

 const projectedIdentities = new Set<string>();
 const projected: Array<{
 readonly source: McpBoundTool;
 readonly descriptor: ReturnType<typeof projectMcpTool>;
 }> = [];
 for (const source of tools) {
 const descriptor = projectMcpTool(
 source.descriptor,
 capabilityEntityId(source.descriptor.serverId),
 );
 const identity = `${descriptor.serverId}\0${descriptor.name}`;
 if (projectedIdentities.has(identity)) {
 throw new Error('MCP tools collide after Client Capability identity normalization');
 }
 projectedIdentities.add(identity);
 projected.push({ source, descriptor });
 }

 const bindings = new Map<string, McpToolBinding>();
 const offers: ClientCapabilityOffer[] = [];
 for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
 const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
 offers.push({
 offerId,
 version: CAPABILITY_VERSION,
 affinity: 'session',
 hostPathAccess: 'none',
 label:
 servers.size === 1
 ? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
 : `MCP tools (${servers.size} servers)`,
 description: 'Use tools provided by connected MCP servers.',
 tools: chunk.map(({ descriptor }) => descriptor),
 });
 for (const { source, descriptor } of chunk) {
 bindings.set(
 capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
 source.binding,
 );
 }
 }
 const canonical = decodeClientCapabilityReplaceInput({
 registrationId: '00000000-0000-4000-8000-000000000000',
 offers,
 });

 return {
 offers: () => canonical.offers,
 call: async (frame, options) => {
 const binding = bindings.get(
 capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
 );
 if (!binding) throw new Error('MCP capability is not part of the published snapshot');
 await options.accept();
 return projectMcpResult(
 await manager.callTool(binding, frame.arguments, { signal: options.signal }),
 );
 },
 };
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
 return {
 serverId: wireServerId,
 name: capabilityEntityId(tool.name),
 ...(tool.description ? { description: tool.description } : {}),
 inputSchema: structuredClone(tool.inputSchema),
 ...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
 };
}

function capabilityEntityId(value: string): string {
 if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
 const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
 const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
 return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
 return {
 content: result.content.map((block) => structuredClone(block)),
 ...(result.structuredContent === undefined
 ? {}
 : { structuredContent: structuredClone(result.structuredContent) }),
 };
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
 const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
 for (const { source } of tools)
 hash
 .update('\0')
 .update(source.descriptor.serverId)
 .update('\0')
 .update(source.descriptor.name);
 return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
 return `${offerId}\0${serverId}\0${toolName}`;
}
export { createMcpCapabilityProvider } from './mcp-capability-provider.js';

function reportRefreshFailure(error: unknown): void {
 const message = error instanceof Error ? error.message : String(error);
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli/src/tui-mcp-control.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import type {
 RuntimeHostConnectionAvailability,
 RuntimeHostReconnectingConnection,
} from '@maka/runtime-host/client';
import { createMcpCapabilityProvider } from './runtime-host-capability-provider-command.js';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const RUNTIME_HOST_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI by me2seeks · Pull Request #4007 · apache/maka · GitHub
Skip to content
fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI#4007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

likun666661
merged 3 commits into

from

Aug 28, 2026

+171

−133

 Merged


fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI
#4007
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
86e97b9

fix(cli): split MCP capability provider to avoid pulling runtime-host…


me2seeks Aug 27, 2026
1073fb0

style(cli): collapse mcp-capability-provider type import


me2seeks Aug 27, 2026
532dbc2

test(cli): guard TUI MCP import boundary


me2seeks Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 14 additions & 0 deletions
packages/cli/src/__tests__/runtime-host-capability-provider-command.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,25 @@
 */

import assert from 'node:assert/strict';
import { readFile } from 'node:fs/promises';
import { test } from 'node:test';
import type { McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import { createMcpCapabilityProvider as createPureMcpCapabilityProvider } from '../mcp-capability-provider.js';
import { createMcpCapabilityProvider } from '../runtime-host-capability-provider-command.js';

test('TUI MCP control keeps its capability provider on the pure import boundary', async () => {
 const [tuiSource, providerSource] = await Promise.all([
 readFile(new URL('../tui-mcp-control.js', import.meta.url), 'utf8'),
 readFile(new URL('../mcp-capability-provider.js', import.meta.url), 'utf8'),
 ]);

 assert.equal(createMcpCapabilityProvider, createPureMcpCapabilityProvider);
 assert.match(tuiSource, /from ['"]\.\/mcp-capability-provider\.js['"]/u);
 assert.doesNotMatch(tuiSource, /@maka\/runtime-host\/server/u);
 assert.doesNotMatch(providerSource, /@maka\/runtime-host\/server/u);
});

test('MCP capability publication freezes an accepted callable tool snapshot', async () => {
 let accepted = false;
 const binding = 'binding-1' as McpToolBinding;
Expand Down

154 changes: 154 additions & 0 deletions
packages/cli/src/mcp-capability-provider.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

import { createHash } from 'node:crypto';
import type { McpBoundTool, McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
 CLIENT_CAPABILITY_MAX_TOOLS,
 CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
 decodeClientCapabilityReplaceInput,
 type ClientCapabilityCallResult,
 type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import type { McpCallResult, McpToolDescriptor } from '@maka/core/mcp';

const CAPABILITY_VERSION = '0';

export function createMcpCapabilityProvider(
 manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
 const toolSnapshot = manager.toolSnapshot();
 const tools = [...toolSnapshot.tools].sort(
 (left, right) =>
 left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
 left.descriptor.name.localeCompare(right.descriptor.name),
 );
 const toolCount = tools.length;
 if (toolCount === 0) return undefined;
 if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
 throw new Error(
 `MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
 );
 }

 const projectedIdentities = new Set<string>();
 const projected: Array<{
 readonly source: McpBoundTool;
 readonly descriptor: ReturnType<typeof projectMcpTool>;
 }> = [];
 for (const source of tools) {
 const descriptor = projectMcpTool(
 source.descriptor,
 capabilityEntityId(source.descriptor.serverId),
 );
 const identity = `${descriptor.serverId}\0${descriptor.name}`;
 if (projectedIdentities.has(identity)) {
 throw new Error('MCP tools collide after Client Capability identity normalization');
 }
 projectedIdentities.add(identity);
 projected.push({ source, descriptor });
 }

 const bindings = new Map<string, McpToolBinding>();
 const offers: ClientCapabilityOffer[] = [];
 for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
 const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
 offers.push({
 offerId,
 version: CAPABILITY_VERSION,
 affinity: 'session',
 hostPathAccess: 'none',
 label:
 servers.size === 1
 ? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
 : `MCP tools (${servers.size} servers)`,
 description: 'Use tools provided by connected MCP servers.',
 tools: chunk.map(({ descriptor }) => descriptor),
 });
 for (const { source, descriptor } of chunk) {
 bindings.set(
 capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
 source.binding,
 );
 }
 }
 const canonical = decodeClientCapabilityReplaceInput({
 registrationId: '00000000-0000-4000-8000-000000000000',
 offers,
 });

 return {
 offers: () => canonical.offers,
 call: async (frame, options) => {
 const binding = bindings.get(
 capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
 );
 if (!binding) throw new Error('MCP capability is not part of the published snapshot');
 await options.accept();
 return projectMcpResult(
 await manager.callTool(binding, frame.arguments, { signal: options.signal }),
 );
 },
 };
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
 return {
 serverId: wireServerId,
 name: capabilityEntityId(tool.name),
 ...(tool.description ? { description: tool.description } : {}),
 inputSchema: structuredClone(tool.inputSchema),
 ...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
 };
}

function capabilityEntityId(value: string): string {
 if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
 const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
 const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
 return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
 return {
 content: result.content.map((block) => structuredClone(block)),
 ...(result.structuredContent === undefined
 ? {}
 : { structuredContent: structuredClone(result.structuredContent) }),
 };
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
 const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
 for (const { source } of tools)
 hash
 .update('\0')
 .update(source.descriptor.serverId)
 .update('\0')
 .update(source.descriptor.name);
 return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
 return `${offerId}\0${serverId}\0${toolName}`;
}

134 changes: 2 additions & 132 deletions
packages/cli/src/runtime-host-capability-provider-command.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ import { createHash } from 'node:crypto';
import { readFile } from 'node:fs/promises';
import { homedir } from 'node:os';
import { dirname, join, resolve } from 'node:path';
import type {
 McpBoundTool,
 McpCallResult,
 McpToolBinding,
 McpToolDescriptor,
} from '@maka/core/mcp';
import { createCredentialMcpOAuthStorage, McpClientManager } from '@maka/mcp';
import { createFileCredentialStore } from '@maka/storage/credential-store';
import { normalizeMcpConfig } from '@maka/storage/mcp-config-store';
Expand All@@ -36,20 +30,15 @@ import {
 remoteRuntimeHostUnavailableError,
 RuntimeHostPermanentReconnectError,
 startRuntimeHostCapabilityProviderService,
 type ClientCapabilityProvider,
 type RuntimeHostConnection,
} from '@maka/runtime-host/client';
import {
 CLIENT_CAPABILITY_MAX_TOOLS,
 CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
 decodeClientCapabilityReplaceInput,
 INTERACTIVE_RUNTIME_HOST_COMPOSITION_ID,
 RUNTIME_HOST_COMPATIBILITY_EPOCH,
 RUNTIME_HOST_PROTOCOL_VERSION,
 type ClientCapabilityCallResult,
 type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import { runRuntimeHostProcessLifecycle } from '@maka/runtime-host/server';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const DEFAULT_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';
const CAPABILITY_VERSION = '0';
Expand DownExpand Up@@ -199,126 +188,7 @@ async function connectRemoteCapabilityProvider(input: {
 throw new Error('Runtime Host is draining');
}

export function createMcpCapabilityProvider(
 manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
 const toolSnapshot = manager.toolSnapshot();
 const tools = [...toolSnapshot.tools].sort(
 (left, right) =>
 left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
 left.descriptor.name.localeCompare(right.descriptor.name),
 );
 const toolCount = tools.length;
 if (toolCount === 0) return undefined;
 if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
 throw new Error(
 `MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
 );
 }

 const projectedIdentities = new Set<string>();
 const projected: Array<{
 readonly source: McpBoundTool;
 readonly descriptor: ReturnType<typeof projectMcpTool>;
 }> = [];
 for (const source of tools) {
 const descriptor = projectMcpTool(
 source.descriptor,
 capabilityEntityId(source.descriptor.serverId),
 );
 const identity = `${descriptor.serverId}\0${descriptor.name}`;
 if (projectedIdentities.has(identity)) {
 throw new Error('MCP tools collide after Client Capability identity normalization');
 }
 projectedIdentities.add(identity);
 projected.push({ source, descriptor });
 }

 const bindings = new Map<string, McpToolBinding>();
 const offers: ClientCapabilityOffer[] = [];
 for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
 const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
 offers.push({
 offerId,
 version: CAPABILITY_VERSION,
 affinity: 'session',
 hostPathAccess: 'none',
 label:
 servers.size === 1
 ? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
 : `MCP tools (${servers.size} servers)`,
 description: 'Use tools provided by connected MCP servers.',
 tools: chunk.map(({ descriptor }) => descriptor),
 });
 for (const { source, descriptor } of chunk) {
 bindings.set(
 capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
 source.binding,
 );
 }
 }
 const canonical = decodeClientCapabilityReplaceInput({
 registrationId: '00000000-0000-4000-8000-000000000000',
 offers,
 });

 return {
 offers: () => canonical.offers,
 call: async (frame, options) => {
 const binding = bindings.get(
 capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
 );
 if (!binding) throw new Error('MCP capability is not part of the published snapshot');
 await options.accept();
 return projectMcpResult(
 await manager.callTool(binding, frame.arguments, { signal: options.signal }),
 );
 },
 };
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
 return {
 serverId: wireServerId,
 name: capabilityEntityId(tool.name),
 ...(tool.description ? { description: tool.description } : {}),
 inputSchema: structuredClone(tool.inputSchema),
 ...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
 };
}

function capabilityEntityId(value: string): string {
 if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
 const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
 const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
 return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
 return {
 content: result.content.map((block) => structuredClone(block)),
 ...(result.structuredContent === undefined
 ? {}
 : { structuredContent: structuredClone(result.structuredContent) }),
 };
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
 const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
 for (const { source } of tools)
 hash
 .update('\0')
 .update(source.descriptor.serverId)
 .update('\0')
 .update(source.descriptor.name);
 return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
 return `${offerId}\0${serverId}\0${toolName}`;
}
export { createMcpCapabilityProvider } from './mcp-capability-provider.js';

function reportRefreshFailure(error: unknown): void {
 const message = error instanceof Error ? error.message : String(error);
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli/src/tui-mcp-control.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import type {
 RuntimeHostConnectionAvailability,
 RuntimeHostReconnectingConnection,
} from '@maka/runtime-host/client';
import { createMcpCapabilityProvider } from './runtime-host-capability-provider-command.js';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const RUNTIME_HOST_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI by me2seeks · Pull Request #4007 · apache/maka · GitHub
Skip to content
fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI#4007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

likun666661
merged 3 commits into

from

Aug 28, 2026

+171

−133

 Merged


fix(cli): split MCP capability provider to avoid pulling runtime-host/server into TUI
#4007
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
86e97b9

fix(cli): split MCP capability provider to avoid pulling runtime-host…


me2seeks Aug 27, 2026
1073fb0

style(cli): collapse mcp-capability-provider type import


me2seeks Aug 27, 2026
532dbc2

test(cli): guard TUI MCP import boundary


me2seeks Aug 28, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


14 changes: 14 additions & 0 deletions
packages/cli/src/__tests__/runtime-host-capability-provider-command.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,11 +18,25 @@
 */

import assert from 'node:assert/strict';
import { readFile } from 'node:fs/promises';
import { test } from 'node:test';
import type { McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import { createMcpCapabilityProvider as createPureMcpCapabilityProvider } from '../mcp-capability-provider.js';
import { createMcpCapabilityProvider } from '../runtime-host-capability-provider-command.js';

test('TUI MCP control keeps its capability provider on the pure import boundary', async () => {
 const [tuiSource, providerSource] = await Promise.all([
 readFile(new URL('../tui-mcp-control.js', import.meta.url), 'utf8'),
 readFile(new URL('../mcp-capability-provider.js', import.meta.url), 'utf8'),
 ]);

 assert.equal(createMcpCapabilityProvider, createPureMcpCapabilityProvider);
 assert.match(tuiSource, /from ['"]\.\/mcp-capability-provider\.js['"]/u);
 assert.doesNotMatch(tuiSource, /@maka\/runtime-host\/server/u);
 assert.doesNotMatch(providerSource, /@maka\/runtime-host\/server/u);
});

test('MCP capability publication freezes an accepted callable tool snapshot', async () => {
 let accepted = false;
 const binding = 'binding-1' as McpToolBinding;
Expand Down

154 changes: 154 additions & 0 deletions
packages/cli/src/mcp-capability-provider.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements. See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership. The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License. You may obtain a copy of the License at
 *
 * http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing,
 * software distributed under the License is distributed on an
 * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 * KIND, either express or implied. See the License for the
 * specific language governing permissions and limitations
 * under the License.
 */

import { createHash } from 'node:crypto';
import type { McpBoundTool, McpToolBinding } from '@maka/core/mcp';
import type { McpClientManager } from '@maka/mcp';
import type { ClientCapabilityProvider } from '@maka/runtime-host/client';
import {
 CLIENT_CAPABILITY_MAX_TOOLS,
 CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
 decodeClientCapabilityReplaceInput,
 type ClientCapabilityCallResult,
 type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import type { McpCallResult, McpToolDescriptor } from '@maka/core/mcp';

const CAPABILITY_VERSION = '0';

export function createMcpCapabilityProvider(
 manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
 const toolSnapshot = manager.toolSnapshot();
 const tools = [...toolSnapshot.tools].sort(
 (left, right) =>
 left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
 left.descriptor.name.localeCompare(right.descriptor.name),
 );
 const toolCount = tools.length;
 if (toolCount === 0) return undefined;
 if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
 throw new Error(
 `MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
 );
 }

 const projectedIdentities = new Set<string>();
 const projected: Array<{
 readonly source: McpBoundTool;
 readonly descriptor: ReturnType<typeof projectMcpTool>;
 }> = [];
 for (const source of tools) {
 const descriptor = projectMcpTool(
 source.descriptor,
 capabilityEntityId(source.descriptor.serverId),
 );
 const identity = `${descriptor.serverId}\0${descriptor.name}`;
 if (projectedIdentities.has(identity)) {
 throw new Error('MCP tools collide after Client Capability identity normalization');
 }
 projectedIdentities.add(identity);
 projected.push({ source, descriptor });
 }

 const bindings = new Map<string, McpToolBinding>();
 const offers: ClientCapabilityOffer[] = [];
 for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
 const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
 offers.push({
 offerId,
 version: CAPABILITY_VERSION,
 affinity: 'session',
 hostPathAccess: 'none',
 label:
 servers.size === 1
 ? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
 : `MCP tools (${servers.size} servers)`,
 description: 'Use tools provided by connected MCP servers.',
 tools: chunk.map(({ descriptor }) => descriptor),
 });
 for (const { source, descriptor } of chunk) {
 bindings.set(
 capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
 source.binding,
 );
 }
 }
 const canonical = decodeClientCapabilityReplaceInput({
 registrationId: '00000000-0000-4000-8000-000000000000',
 offers,
 });

 return {
 offers: () => canonical.offers,
 call: async (frame, options) => {
 const binding = bindings.get(
 capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
 );
 if (!binding) throw new Error('MCP capability is not part of the published snapshot');
 await options.accept();
 return projectMcpResult(
 await manager.callTool(binding, frame.arguments, { signal: options.signal }),
 );
 },
 };
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
 return {
 serverId: wireServerId,
 name: capabilityEntityId(tool.name),
 ...(tool.description ? { description: tool.description } : {}),
 inputSchema: structuredClone(tool.inputSchema),
 ...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
 };
}

function capabilityEntityId(value: string): string {
 if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
 const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
 const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
 return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
 return {
 content: result.content.map((block) => structuredClone(block)),
 ...(result.structuredContent === undefined
 ? {}
 : { structuredContent: structuredClone(result.structuredContent) }),
 };
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
 const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
 for (const { source } of tools)
 hash
 .update('\0')
 .update(source.descriptor.serverId)
 .update('\0')
 .update(source.descriptor.name);
 return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
 return `${offerId}\0${serverId}\0${toolName}`;
}

134 changes: 2 additions & 132 deletions
packages/cli/src/runtime-host-capability-provider-command.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,12 +21,6 @@ import { createHash } from 'node:crypto';
import { readFile } from 'node:fs/promises';
import { homedir } from 'node:os';
import { dirname, join, resolve } from 'node:path';
import type {
 McpBoundTool,
 McpCallResult,
 McpToolBinding,
 McpToolDescriptor,
} from '@maka/core/mcp';
import { createCredentialMcpOAuthStorage, McpClientManager } from '@maka/mcp';
import { createFileCredentialStore } from '@maka/storage/credential-store';
import { normalizeMcpConfig } from '@maka/storage/mcp-config-store';
Expand All@@ -36,20 +30,15 @@ import {
 remoteRuntimeHostUnavailableError,
 RuntimeHostPermanentReconnectError,
 startRuntimeHostCapabilityProviderService,
 type ClientCapabilityProvider,
 type RuntimeHostConnection,
} from '@maka/runtime-host/client';
import {
 CLIENT_CAPABILITY_MAX_TOOLS,
 CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER,
 decodeClientCapabilityReplaceInput,
 INTERACTIVE_RUNTIME_HOST_COMPOSITION_ID,
 RUNTIME_HOST_COMPATIBILITY_EPOCH,
 RUNTIME_HOST_PROTOCOL_VERSION,
 type ClientCapabilityCallResult,
 type ClientCapabilityOffer,
} from '@maka/runtime-host/protocol';
import { runRuntimeHostProcessLifecycle } from '@maka/runtime-host/server';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const DEFAULT_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';
const CAPABILITY_VERSION = '0';
Expand DownExpand Up@@ -199,126 +188,7 @@ async function connectRemoteCapabilityProvider(input: {
 throw new Error('Runtime Host is draining');
}

export function createMcpCapabilityProvider(
 manager: Pick<McpClientManager, 'toolSnapshot' | 'callTool'>,
): ClientCapabilityProvider | undefined {
 const toolSnapshot = manager.toolSnapshot();
 const tools = [...toolSnapshot.tools].sort(
 (left, right) =>
 left.descriptor.serverId.localeCompare(right.descriptor.serverId) ||
 left.descriptor.name.localeCompare(right.descriptor.name),
 );
 const toolCount = tools.length;
 if (toolCount === 0) return undefined;
 if (toolCount > CLIENT_CAPABILITY_MAX_TOOLS) {
 throw new Error(
 `MCP capability provider exposes ${toolCount} tools; the limit is ${CLIENT_CAPABILITY_MAX_TOOLS}`,
 );
 }

 const projectedIdentities = new Set<string>();
 const projected: Array<{
 readonly source: McpBoundTool;
 readonly descriptor: ReturnType<typeof projectMcpTool>;
 }> = [];
 for (const source of tools) {
 const descriptor = projectMcpTool(
 source.descriptor,
 capabilityEntityId(source.descriptor.serverId),
 );
 const identity = `${descriptor.serverId}\0${descriptor.name}`;
 if (projectedIdentities.has(identity)) {
 throw new Error('MCP tools collide after Client Capability identity normalization');
 }
 projectedIdentities.add(identity);
 projected.push({ source, descriptor });
 }

 const bindings = new Map<string, McpToolBinding>();
 const offers: ClientCapabilityOffer[] = [];
 for (let offset = 0; offset < projected.length; offset += CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER) {
 const chunk = projected.slice(offset, offset + CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const offerId = mcpOfferId(chunk, offset / CLIENT_CAPABILITY_MAX_TOOLS_PER_OFFER);
 const servers = new Set(chunk.map(({ source }) => source.descriptor.serverId));
 offers.push({
 offerId,
 version: CAPABILITY_VERSION,
 affinity: 'session',
 hostPathAccess: 'none',
 label:
 servers.size === 1
 ? `MCP: ${chunk[0]?.source.descriptor.serverId ?? 'tools'}`.slice(0, 128)
 : `MCP tools (${servers.size} servers)`,
 description: 'Use tools provided by connected MCP servers.',
 tools: chunk.map(({ descriptor }) => descriptor),
 });
 for (const { source, descriptor } of chunk) {
 bindings.set(
 capabilityBindingKey(offerId, descriptor.serverId, descriptor.name),
 source.binding,
 );
 }
 }
 const canonical = decodeClientCapabilityReplaceInput({
 registrationId: '00000000-0000-4000-8000-000000000000',
 offers,
 });

 return {
 offers: () => canonical.offers,
 call: async (frame, options) => {
 const binding = bindings.get(
 capabilityBindingKey(frame.offerId, frame.serverId, frame.toolName),
 );
 if (!binding) throw new Error('MCP capability is not part of the published snapshot');
 await options.accept();
 return projectMcpResult(
 await manager.callTool(binding, frame.arguments, { signal: options.signal }),
 );
 },
 };
}

function projectMcpTool(tool: McpToolDescriptor, wireServerId: string) {
 return {
 serverId: wireServerId,
 name: capabilityEntityId(tool.name),
 ...(tool.description ? { description: tool.description } : {}),
 inputSchema: structuredClone(tool.inputSchema),
 ...(tool.annotations ? { annotations: { ...tool.annotations } } : {}),
 };
}

function capabilityEntityId(value: string): string {
 if (/^[A-Za-z0-9_-]{1,128}$/u.test(value)) return value;
 const label = value.replace(/[^A-Za-z0-9_-]+/gu, '_').slice(0, 103) || 'mcp';
 const digest = createHash('sha256').update(value).digest('hex').slice(0, 24);
 return `${label}_${digest}`;
}

function projectMcpResult(result: McpCallResult): ClientCapabilityCallResult {
 return {
 content: result.content.map((block) => structuredClone(block)),
 ...(result.structuredContent === undefined
 ? {}
 : { structuredContent: structuredClone(result.structuredContent) }),
 };
}

function mcpOfferId(tools: readonly { readonly source: McpBoundTool }[], chunk: number): string {
 const hash = createHash('sha256').update(`mcp-capability-offer-v0\0${chunk}`);
 for (const { source } of tools)
 hash
 .update('\0')
 .update(source.descriptor.serverId)
 .update('\0')
 .update(source.descriptor.name);
 return `mcp_${hash.digest('hex').slice(0, 24)}_${chunk}`;
}

function capabilityBindingKey(offerId: string, serverId: string, toolName: string): string {
 return `${offerId}\0${serverId}\0${toolName}`;
}
export { createMcpCapabilityProvider } from './mcp-capability-provider.js';

function reportRefreshFailure(error: unknown): void {
 const message = error instanceof Error ? error.message : String(error);
Expand Down

2 changes: 1 addition & 1 deletion
packages/cli/src/tui-mcp-control.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ import type {
 RuntimeHostConnectionAvailability,
 RuntimeHostReconnectingConnection,
} from '@maka/runtime-host/client';
import { createMcpCapabilityProvider } from './runtime-host-capability-provider-command.js';
import { createMcpCapabilityProvider } from './mcp-capability-provider.js';

const RUNTIME_HOST_CREDENTIAL_ENV = 'MAKA_RUNTIME_HOST_ACCESS_CREDENTIAL';

Expand Down