This commit is contained in:
Glen Maddern 2025-06-10 18:41:54 +10:00
commit 0cc21d519b

View file

@ -58,7 +58,7 @@ export function McpServers({
clearStorage: () => {}, clearStorage: () => {},
}) })
const [toolForms, setToolForms] = useState<Record<string, Record<string, any>>>({}) const [toolForms, setToolForms] = useState<Record<string, Record<string, any>>>({})
const [executionLog, setExecutionLog] = useState<string>('') const [toolExecutionLogs, setToolExecutionLogs] = useState<Record<string, string>>({})
const logRef = useRef<HTMLDivElement>(null) const logRef = useRef<HTMLDivElement>(null)
const executionLogRef = useRef<HTMLTextAreaElement>(null) const executionLogRef = useRef<HTMLTextAreaElement>(null)
@ -218,27 +218,32 @@ export function McpServers({
// Add execution start message // Add execution start message
const startMessage = `Calling ${tool.name}(${argsStr})\n` const startMessage = `Calling ${tool.name}(${argsStr})\n`
setExecutionLog(prev => prev + startMessage) setToolExecutionLogs(prev => ({
...prev,
[tool.name]: (prev[tool.name] || '') + startMessage
}))
try { try {
const result = await connectionData.callTool(tool.name, args) const result = await connectionData.callTool(tool.name, args)
const resultStr = typeof result === 'string' ? result : JSON.stringify(result, null, 2) const resultStr = typeof result === 'string' ? result : JSON.stringify(result, null, 2)
setExecutionLog(prev => prev + `${resultStr}\n\n`) setToolExecutionLogs(prev => ({
...prev,
[tool.name]: (prev[tool.name] || '') + `${resultStr}\n\n`
}))
} catch (error) { } catch (error) {
setExecutionLog(prev => prev + `Error: ${error}\n\n`) setToolExecutionLogs(prev => ({
...prev,
[tool.name]: (prev[tool.name] || '') + `Error: ${error}\n\n`
}))
}
} }
// Auto-scroll to bottom // Clear execution log for specific tool
setTimeout(() => { const clearExecutionLog = (toolName: string) => {
if (executionLogRef.current) { setToolExecutionLogs(prev => ({
executionLogRef.current.scrollTop = executionLogRef.current.scrollHeight ...prev,
} [toolName]: ''
}, 0) }))
}
// Clear execution log
const clearExecutionLog = () => {
setExecutionLog('')
} }
// Render form field based on schema // Render form field based on schema
@ -249,13 +254,15 @@ export function McpServers({
return ( return (
<input <input
type="number" type="number"
className="w-1/4 p-2 border border-gray-200 rounded text-sm focus:outline-none focus:ring-1 focus:ring-blue-300" className="w-1/4 p-2 pr-6 mr-3 border border-gray-200 rounded text-sm focus:outline-none focus:ring-1 focus:ring-blue-300 placeholder-gray-300"
value={value} value={value}
step={schema.type === 'integer' ? 1 : 'any'} step={schema.type === 'integer' ? 1 : 'any'}
required={isRequired} required={isRequired}
onChange={(e) => handleFormChange(toolName, fieldName, onChange={(e) => {
schema.type === 'integer' ? parseInt(e.target.value) || 0 : parseFloat(e.target.value) || 0 const newValue = e.target.value === '' ? '' :
)} (schema.type === 'integer' ? parseInt(e.target.value) || 0 : parseFloat(e.target.value) || 0)
handleFormChange(toolName, fieldName, newValue)
}}
/> />
) )
} else if (schema.type === 'boolean') { } else if (schema.type === 'boolean') {
@ -272,7 +279,7 @@ export function McpServers({
return ( return (
<input <input
type="text" type="text"
className="w-full p-2 border border-gray-200 rounded text-sm focus:outline-none focus:ring-1 focus:ring-blue-300" className="w-full p-2 border border-gray-200 rounded text-sm focus:outline-none focus:ring-1 focus:ring-blue-300 placeholder-gray-300"
value={value} value={value}
required={isRequired} required={isRequired}
placeholder={schema.description || ''} placeholder={schema.description || ''}
@ -357,15 +364,15 @@ export function McpServers({
No tools available. Connect to an MCP server to see available tools. No tools available. Connect to an MCP server to see available tools.
</div> </div>
) : ( ) : (
<div className="border border-gray-200 rounded p-4 bg-gray-50 space-y-6"> <div className="space-y-6">
{tools.map((tool: Tool, index: number) => ( {tools.map((tool: Tool, index: number) => (
<div <div key={index}>
key={index} {/* Tool title outside the card */}
className="bg-white p-4 rounded border border-gray-100 shadow-sm" <h4 className="font-bold text-base text-black mb-2">
>
<div className="font-mono font-medium text-sm text-blue-700 mb-2">
{tool.name} {tool.name}
</div> </h4>
<div className="bg-white p-4 rounded border border-gray-100 shadow-sm">
{tool.description && ( {tool.description && (
<p className="text-gray-600 mb-4 text-sm leading-relaxed"> <p className="text-gray-600 mb-4 text-sm leading-relaxed">
{tool.description} {tool.description}
@ -382,7 +389,6 @@ export function McpServers({
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<label className="text-xs font-medium text-gray-700"> <label className="text-xs font-medium text-gray-700">
{fieldName} {fieldName}
{isRequired && <span className="text-red-500">*</span>}
</label> </label>
{schema.description && ( {schema.description && (
<div className="relative group"> <div className="relative group">
@ -393,7 +399,7 @@ export function McpServers({
</div> </div>
)} )}
</div> </div>
<div className={schema.type === 'number' || schema.type === 'integer' ? 'inline-block' : ''}> <div className={schema.type === 'number' || schema.type === 'integer' ? 'flex flex-wrap items-center' : ''}>
{renderFormField(tool.name, fieldName, schema, isRequired)} {renderFormField(tool.name, fieldName, schema, isRequired)}
</div> </div>
</div> </div>
@ -406,20 +412,17 @@ export function McpServers({
<button <button
onClick={() => handleRunTool(tool)} onClick={() => handleRunTool(tool)}
disabled={state !== 'ready'} disabled={state !== 'ready'}
className="bg-green-600 hover:bg-green-700 disabled:bg-gray-400 text-white rounded py-2 px-4 text-sm font-medium" className="bg-green-600 hover:bg-green-700 disabled:bg-gray-400 text-white rounded py-2 px-4 text-sm font-medium mb-4"
> >
Run Run
</button> </button>
</div>
))}
{/* Execution log */} {/* Per-tool execution log */}
{tools.length > 0 && ( <div className="border-t border-gray-100 pt-4">
<div className="bg-white p-4 rounded border border-gray-100 shadow-sm">
<div className="flex items-center justify-between mb-2"> <div className="flex items-center justify-between mb-2">
<h4 className="font-medium text-sm text-gray-700">Execution Log</h4> <h5 className="font-medium text-sm text-gray-700">Execution Log</h5>
<button <button
onClick={clearExecutionLog} onClick={() => clearExecutionLog(tool.name)}
className="flex items-center gap-1 text-xs text-gray-500 hover:text-gray-700" className="flex items-center gap-1 text-xs text-gray-500 hover:text-gray-700"
> >
<X size={12} /> <X size={12} />
@ -427,14 +430,15 @@ export function McpServers({
</button> </button>
</div> </div>
<textarea <textarea
ref={executionLogRef} value={toolExecutionLogs[tool.name] || ''}
value={executionLog}
readOnly readOnly
className="w-full h-32 p-2 border border-gray-200 rounded text-xs font-mono bg-gray-50 resize-none" className="w-full h-32 p-2 border border-gray-200 rounded text-xs font-mono bg-gray-50 resize-none placeholder-gray-300"
placeholder="Tool execution results will appear here..." placeholder="Tool execution results will appear here..."
/> />
</div> </div>
)} </div>
</div>
))}
</div> </div>
)} )}
</div> </div>