refactor: simplify the tool types #323
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Convert ToolEntry to discriminated union with explicit type variants - HelperToolEntry: type: 'internal' - ActorToolEntry: type: 'actor' - ActorMcpToolEntry: type: 'actor-mcp' - Remove actorFullName from all internal tools (11 tools across 9 files) - Remove unused ToolType export - Improves type safety and enables automatic type narrowing in TypeScript
- Remove wrapper object pattern (HelperToolEntry, ActorToolEntry, ActorMcpToolEntry) - Implement flat discriminated union: ToolEntry = HelperTool | ActorTool | ActorMcpTool - Add direct 'type' discriminator to tool interfaces (no nested .tool property) - Introduce McpInputSchema type for strict MCP SDK schema alignment - Replace all 'as any' type casts with proper McpInputSchema assertions - Update 16 tool files to use flat structure pattern - Update server.ts and proxy.ts to remove .tool property access - Fix tools-loader.ts and tools.ts utility functions - Update test files to reference flat structure (.name instead of .tool.name) - Fix runtime error: serverUrl access in actor MCP tool handling This refactoring improves: - Type safety: Flat union eliminates property access ambiguity - Code clarity: Direct tool properties instead of nested .tool wrapper - MCP alignment: Proper inputSchema type matching MCP SDK requirements - No 'any' types: Complete type safety throughout codebase
github-actions
bot
added
t-ai
jirispilka
approved these changes
Nov 6, 2025
Collaborator
jirispilka
left a comment
jirispilka
left a comment
There was a problem hiding this comment.
Really nice! Thanks!
I only check couple of tools as the rest of the changes were quite similar (for other tools)
Consider renaming McpInputSchema. This is not descriptive IMO
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #115
This bothered me for a long time and decided to give it a go today. I believe these code changes make the codebase more maintainable and simple. This was partially vibe coded.
Changes: