feat: add optional Morph Fast Apply tool for improved diff accuracy #7208
Conversation
- Add morph_fast_apply tool that uses Morph API for 98% diff accuracy - Tool is conditionally available when morphApiKey is configured - Add morphApiKey to provider settings for API authentication - Integrate tool into presentAssistantMessage and system prompt - Tool provides fallback to standard apply_diff when API key not set Fixes #7206
dosubot
bot
added
size:L
![roomote[bot]](https://avatars.githubusercontent.com/in/1546624?s=60&v=4){kind=small}
| const provider = cline.providerRef.deref() | ||
| const state = await provider?.getState() | ||
| // Check if Morph API key is configured (we'll add this to provider settings later) | ||
| const morphApiKey = (state as any)?.morphApiKey |
There was a problem hiding this comment.
Security concern: Is this the right way to access the morphApiKey? Using (state as any)?.morphApiKey feels risky. Should we be accessing it through provider settings instead to ensure proper encapsulation and avoid potential API key exposure?
| async function callMorphApi(apiKey: string, originalContent: string, diffContent: string): Promise<MorphApiResponse> { | ||
| try { | ||
| // Using native fetch API (available in Node.js 18+) | ||
| const response = await fetch("https://api.morph.so/v1/fast-apply", { |
There was a problem hiding this comment.
The API endpoint is hardcoded here. Should we make this configurable for different environments (dev/staging/prod) or add a fallback URL in case the primary endpoint is down?
| } | ||
| } | ||
|
|
||
| const data = (await response.json()) as any |
There was a problem hiding this comment.
Using as any here removes type safety. Could we define a proper interface for the Morph API response to maintain type safety throughout the codebase?
| const data = (await response.json()) as any | |
| interface MorphApiResponseData { | |
| result?: string; | |
| content?: string; | |
| } | |
| const data = (await response.json()) as MorphApiResponseData |
|
|
||
| if (!morphApiKey) { | ||
| // Morph API key not configured, fall back to regular apply_diff | ||
| await cline.say("text", "Morph API key not configured. Falling back to standard diff application.") |
There was a problem hiding this comment.
When the API key isn't configured, we show one message to the user but return a different message in the result. Should these be consistent for better UX?
| <<<<<<< SEARCH | ||
| function calculateTotal(items) { | ||
| total = 0 | ||
| for item in items: |
There was a problem hiding this comment.
The example mixes Python-like syntax (for item in items:) with JavaScript. Is this intentional, or should we use consistent JavaScript syntax?
| for item in items: | |
| function calculateTotal(items) { | |
| let total = 0 | |
| for (const item of items) { | |
| total += item | |
| } | |
| return total |
| * @param diffContent The diff content to apply | ||
| * @returns The result from the Morph API | ||
| */ | ||
| async function callMorphApi(apiKey: string, originalContent: string, diffContent: string): Promise<MorphApiResponse> { |
There was a problem hiding this comment.
Missing rate limiting and retry logic for API calls. If the tool is used frequently, could we hit rate limits? Should we add exponential backoff or at least basic retry logic for transient failures?
hannesrudolph
added
the
Issue/PR - Triage
|
@roomote-agent It would be a good idea if you fix the types in your code. Here's the log: Run pnpm check-types
• Packages in scope: @roo-code/build, @roo-code/config-eslint, @roo-code/config-typescript, @roo-code/evals, @roo-code/ipc, @roo-code/telemetry, @roo-code/types, @roo-code/vscode-e2e, @roo-code/vscode-nightly, @roo-code/vscode-webview, @roo-code/web-evals, @roo-code/web-roo-code, roo-cline Tasks: 8 successful, 10 total ERROR run failed: command exited (2) |
|
Hi @Githubguy132010! I see the type errors in the CI logs. I'll investigate and fix these TypeScript issues right away. The problem appears to be related to conflicting TaskProviderEvents type definitions between the local packages and node_modules. Let me check out the branch and resolve this. |
…space version The type errors were caused by @roo-code/cloud package importing an external version of @roo-code/types (^1.52.0) which conflicted with the local workspace version. Added a pnpm override to force all packages to use the workspace version of @roo-code/types, resolving the type incompatibility issues in ClineProvider.ts and extension.ts.
|
Hi @Githubguy132010! ✅ I've successfully fixed the TypeScript type errors you reported. Summary of the fix:The issue was caused by a version conflict between two instances of
Solution implemented:Added a pnpm override in the root "pnpm": {
"overrides": {
"@roo-code/types": "workspace:*"
}
}This ensures type consistency across the entire codebase and resolves the incompatibility issues in:
Verification:✅ The type errors in Note: There's still an unrelated type error in The CI checks should now pass for the type checking related to the original issue. Let me know if you need any clarification or if there are any other issues! |
|
@roomote-agent Please solve the merge conflicts (if you can) |
|
Hi @Githubguy132010! I see your request to resolve the merge conflicts in this PR. I'll work on resolving them now. The PR is currently showing conflicts with the main branch. Let me check out the branch and identify the specific conflicts to resolve them. |
|
This implementation is not valid |
|
Hi @Githubguy132010! I attempted to resolve the merge conflicts in this PR. I successfully:
However, I notice that the PR is now showing as CLOSED. It appears the PR was closed while I was working on resolving the conflicts. The merge conflict resolution has been completed and pushed to the branch Let me know if you need any further assistance! |
Summary
This PR implements integration with Morph's Fast Apply API to provide a high-accuracy (98%) diff application tool as an optional alternative to the standard apply_diff tool.
Changes
Implementation Details
The Morph Fast Apply tool:
Testing
Configuration
To enable the Morph Fast Apply tool:
Related Issue
Fixes #7206
Acceptance Criteria Met
Important
Introduces
morph_fast_applytool for high-accuracy diff application using Morph's API, configurable via API key.morph_fast_applytool inmorphFastApplyTool.tsfor applying diffs with 98% accuracy using Morph's API.provider-settings.ts.apply_diffif API key is not configured.morphApiKeytobaseProviderSettingsSchemainprovider-settings.ts.tool.tsto includemorph_fast_applyintoolNames.morph_fast_applyinpresentAssistantMessage.tsfor task execution.getMorphFastApplyDescriptioninmorph-fast-apply.ts.index.tsto includemorph_fast_applyin tool descriptions.package.jsonto include@roo-code/typesdependency.This description was created by
for b811800. You can customize this summary. It will automatically update as commits are pushed.