mirror of
https://github.com/wu736139669/hapi.git
synced 2026-11-17 03:20:40 +00:00
feat(cli): add skill_lookup MCP for non-native agents (#1035)
* test: reproduce issue #752 * fix: expose skill lookup MCP tool (closes #752) * test: cover ACP skill lookup instructions * fix: inject ACP skill lookup instruction * test: narrow skill lookup auto-approval * fix: restrict skill lookup auto-approval * test: cover exact skill lookup tool names
This commit is contained in:
@@ -0,0 +1,72 @@
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import type { ApiSessionClient } from '@/api/apiSession'
|
||||
|
||||
const harness = vi.hoisted(() => ({
|
||||
startOptions: null as unknown,
|
||||
cliArgs: [] as string[]
|
||||
}))
|
||||
|
||||
vi.mock('@/claude/utils/startHappyServer', () => ({
|
||||
startHappyServer: vi.fn(async (_client: unknown, options: { skillLookup?: unknown }) => {
|
||||
harness.startOptions = options
|
||||
return {
|
||||
url: 'http://127.0.0.1:43006/',
|
||||
toolNames: options.skillLookup
|
||||
? ['change_title', 'display_image', 'skill_lookup']
|
||||
: ['change_title', 'display_image'],
|
||||
stop: vi.fn()
|
||||
}
|
||||
})
|
||||
}))
|
||||
|
||||
vi.mock('@/utils/spawnHappyCLI', () => ({
|
||||
getHappyCliCommand: vi.fn((args: string[]) => {
|
||||
harness.cliArgs = args
|
||||
return { command: 'hapi', args }
|
||||
})
|
||||
}))
|
||||
|
||||
import { buildHapiMcpBridge } from './buildHapiMcpBridge'
|
||||
|
||||
describe('buildHapiMcpBridge skill lookup config', () => {
|
||||
const client = {} as ApiSessionClient
|
||||
|
||||
beforeEach(() => {
|
||||
harness.startOptions = null
|
||||
harness.cliArgs = []
|
||||
})
|
||||
|
||||
it('forwards the enabled HTTP tool through STDIO and auto-approves it', async () => {
|
||||
const skillLookup = {
|
||||
workingDirectory: '/repo',
|
||||
flavor: 'opencode'
|
||||
}
|
||||
|
||||
const bridge = await buildHapiMcpBridge(client, { skillLookup })
|
||||
|
||||
expect(harness.startOptions).toEqual({
|
||||
emitTitleSummary: undefined,
|
||||
skillLookup
|
||||
})
|
||||
expect(harness.cliArgs).toEqual([
|
||||
'mcp',
|
||||
'--url',
|
||||
'http://127.0.0.1:43006/',
|
||||
'--tools',
|
||||
'change_title,display_image,skill_lookup'
|
||||
])
|
||||
expect(bridge.mcpServers.hapi.tools).toEqual({
|
||||
change_title: { approval_mode: 'approve' },
|
||||
skill_lookup: { approval_mode: 'approve' }
|
||||
})
|
||||
})
|
||||
|
||||
it('does not expose skill_lookup for native-skill bridge callers', async () => {
|
||||
const bridge = await buildHapiMcpBridge(client)
|
||||
|
||||
expect(harness.cliArgs.at(-1)).toBe('change_title,display_image')
|
||||
expect(bridge.mcpServers.hapi.tools).toEqual({
|
||||
change_title: { approval_mode: 'approve' }
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -44,6 +44,10 @@ export interface HapiMcpBridge {
|
||||
|
||||
export interface HapiMcpBridgeOptions {
|
||||
emitTitleSummary?: boolean;
|
||||
skillLookup?: {
|
||||
workingDirectory: string;
|
||||
flavor: string;
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -58,9 +62,26 @@ export async function buildHapiMcpBridge(
|
||||
options: HapiMcpBridgeOptions = {}
|
||||
): Promise<HapiMcpBridge> {
|
||||
const happyServer = await startHappyServer(client, {
|
||||
emitTitleSummary: options.emitTitleSummary
|
||||
emitTitleSummary: options.emitTitleSummary,
|
||||
skillLookup: options.skillLookup
|
||||
});
|
||||
const bridgeCommand = getHappyCliCommand(['mcp', '--url', happyServer.url]);
|
||||
const bridgeCommand = getHappyCliCommand([
|
||||
'mcp',
|
||||
'--url',
|
||||
happyServer.url,
|
||||
'--tools',
|
||||
happyServer.toolNames.join(',')
|
||||
]);
|
||||
const tools: Record<string, McpServerToolConfig> = {
|
||||
change_title: {
|
||||
approval_mode: 'approve'
|
||||
}
|
||||
};
|
||||
if (options.skillLookup) {
|
||||
tools.skill_lookup = {
|
||||
approval_mode: 'approve'
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
server: {
|
||||
@@ -71,11 +92,7 @@ export async function buildHapiMcpBridge(
|
||||
hapi: {
|
||||
command: bridgeCommand.command,
|
||||
args: bridgeCommand.args,
|
||||
tools: {
|
||||
change_title: {
|
||||
approval_mode: 'approve'
|
||||
}
|
||||
}
|
||||
tools
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user