Turbo edits v2 (#1653)
Fixes #1222 #1646 TODOs - [x] description? - [x] collect errors across all files for turbo edits - [x] be forgiving around whitespaces - [x] write e2e tests - [x] do more manual testing across different models <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Adds Turbo Edits v2 search-replace flow with settings/UI selector, parser/renderer, dry-run validation + fallback, proposal integration, and comprehensive tests; updates licensing. > > - **Engine/Processing**: > - Add `dyad-search-replace` end-to-end: parsing (`getDyadSearchReplaceTags`), markdown rendering (`DyadSearchReplace`), and application (`applySearchReplace`) with dry-run validation and fallback to `dyad-write`. > - Inject Turbo Edits v2 system prompt; toggle via `isTurboEditsV2Enabled`; disable classic lazy edits when v2 is on. > - Include search-replace edits in proposals and full-response processing. > - **Settings/UI**: > - Introduce `proLazyEditsMode` (`off`|`v1`|`v2`) and helper selectors; update `ProModeSelector` with Turbo Edits and Smart Context selectors (`data-testid`s). > - **LLM/token flow**: > - Construct system prompt conditionally; update token counting and chat stream to validate and repair search-replace responses. > - **Tests**: > - Add unit tests for search-replace processor; e2e tests for Turbo Edits v2 and options; fixtures and snapshots. > - **Licensing/Docs**: > - Add `src/pro/LICENSE` (FSL 1.1 ALv2 future), update root `LICENSE` and README license section. > - **Tooling**: > - Update `.prettierignore`; enhance test helpers (selectors, path normalization, snapshot filtering). > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 7aefa02bfae2fe22a25c7d87f3c4c326f820f1e6. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
This commit is contained in:
@@ -137,3 +137,48 @@ export function getDyadCommandTags(fullResponse: string): string[] {
|
||||
|
||||
return commands;
|
||||
}
|
||||
|
||||
export function getDyadSearchReplaceTags(fullResponse: string): {
|
||||
path: string;
|
||||
content: string;
|
||||
description?: string;
|
||||
}[] {
|
||||
const dyadSearchReplaceRegex =
|
||||
/<dyad-search-replace([^>]*)>([\s\S]*?)<\/dyad-search-replace>/gi;
|
||||
const pathRegex = /path="([^"]+)"/;
|
||||
const descriptionRegex = /description="([^"]+)"/;
|
||||
|
||||
let match;
|
||||
const tags: { path: string; content: string; description?: string }[] = [];
|
||||
|
||||
while ((match = dyadSearchReplaceRegex.exec(fullResponse)) !== null) {
|
||||
const attributesString = match[1] || "";
|
||||
let content = match[2].trim();
|
||||
|
||||
const pathMatch = pathRegex.exec(attributesString);
|
||||
const descriptionMatch = descriptionRegex.exec(attributesString);
|
||||
|
||||
if (pathMatch && pathMatch[1]) {
|
||||
const path = pathMatch[1];
|
||||
const description = descriptionMatch?.[1];
|
||||
|
||||
// Handle markdown code fences if present
|
||||
const contentLines = content.split("\n");
|
||||
if (contentLines[0]?.startsWith("```")) {
|
||||
contentLines.shift();
|
||||
}
|
||||
if (contentLines[contentLines.length - 1]?.startsWith("```")) {
|
||||
contentLines.pop();
|
||||
}
|
||||
content = contentLines.join("\n");
|
||||
|
||||
tags.push({ path: normalizePath(path), content, description });
|
||||
} else {
|
||||
logger.warn(
|
||||
"Found <dyad-search-replace> tag without a valid 'path' attribute:",
|
||||
match[0],
|
||||
);
|
||||
}
|
||||
}
|
||||
return tags;
|
||||
}
|
||||
|
||||
@@ -89,7 +89,8 @@ export async function getModelClient(
|
||||
enableLazyEdits:
|
||||
settings.selectedChatMode === "ask"
|
||||
? false
|
||||
: settings.enableProLazyEditsMode,
|
||||
: settings.enableProLazyEditsMode &&
|
||||
settings.proLazyEditsMode !== "v2",
|
||||
enableSmartFilesContext,
|
||||
// Keep in sync with getCurrentValue in ProModeSelector.tsx
|
||||
smartContextMode: settings.proSmartContextOption ?? "balanced",
|
||||
|
||||
Reference in New Issue
Block a user