refactor: replace type casts with proper type guards, and add nextTurn config to tools #107
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
mattapperson
changed the title
mattapperson
force-pushed
the
matt/fully-typed
branch
from
91046c3 to
81fa1dd
Compare
- Add createTool, createGeneratorTool, createManualTool factory functions - Add type inference helpers: InferToolInput, InferToolOutput, InferToolEvent - Add TypedToolCall and TypedToolCallUnion for typed tool call results - Add InferToolEventsUnion for typed generator event streams - Make ResponseWrapper generic with TTools parameter - Make callModel generic to preserve tool types through call chain - Make event types generic (ToolStreamEvent, ChatStreamEvent, etc.) - Export all new types from index.ts - Add example demonstrating typed tool calling When using 'as const' with tools array, all type information flows through: - toolCall.arguments is typed based on inputSchema - event.result in streams is typed based on eventSchema 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Improve isClaudeStyleMessages() heuristic to check ALL messages for Claude-specific features (tool_result, image with source, tool_use) - Properly convert tool_use blocks to ResponsesOutputItemFunctionCall - Convert image blocks in user messages to OpenResponsesInputMessageItem - Handle assistant images via synthetic function call outputs - Add TODO comment for cache_read_input_tokens mapping - Add console.warn for JSON parsing failures in tool arguments - Add E2E tests for getClaudeMessage() output format 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Create claude-constants.ts with constants for Claude block types - Create claude-type-guards.ts with isClaudeStyleMessages type guard - Replace `as Record<string, unknown>` casts with proper type narrowing - Remove `as unknown as TTools` double assertion in callModel.ts - Consolidate duplicate normalizeInputToArray functions - Consolidate createTurnContext and createTurnContextWithMutations methods - Add isGeneratorConfig type guard in create-tool.ts - Fix non-null assertion in tool-orchestrator.ts with resultHasError guard - Extend normalizeInputToArray to handle undefined input - Add comprehensive tests for new type guards 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
mattapperson
force-pushed
the
matt/param-altering-tools
branch
from
0a3d75d to
f2c3d0d
Compare
Resolved conflicts by preferring main's changes: - examples/callModel-typed-tool-calling.example.ts - src/index.ts - src/lib/stream-transformers.ts - src/lib/tool-types.ts - src/sdk/sdk.ts - tests/unit/create-tool.test.ts Will fix any type errors and adapt to new patterns from main.
- Removed create-tool.ts (replaced by tool.ts in main) - Restored tool-orchestrator.ts from main - Restored model-result.ts from main (uses ModelResult class name) Build now passes with no type errors.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
as Record<string, unknown>casts with proper type guards and narrowingas unknown as TToolsdouble assertion patternChanges
New Files
src/lib/claude-constants.ts- Constants for Claude content block typessrc/lib/claude-type-guards.ts- Type guards for Claude message detectiontests/unit/claude-type-guards.test.ts- 14 tests for type guardstests/unit/tool-types.test.ts- 5 tests for normalizeInputToArrayRefactored
isGeneratorConfigtype guardresultHasErrorguardnormalizeInputToArrayto handle undefinedTest plan
as unknown as Tdouble assertions remain🤖 Generated with Claude Code