Skip to content

fix(core): preserve escape sequences in string literals for modern models #28299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavidAPierce merged 2 commits into from
Jul 6, 2026
Merged

fix(core): preserve escape sequences in string literals for modern models #28299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8e7a13
fix(core): preserve escape sequences in string literals for modern mo…
luisfelipe-alt Jul 6, 2026
74d41c1
Merge branch 'main' into bugfix/WT-engineer_496211054
DavidAPierce Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/core/src/tools/write-file.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ const mockConfigInternal = {
getIdeMode: vi.fn(() => false),
getWorkspaceContext: () => new WorkspaceContext(rootDir, [plansDir]),
getApiKey: () => 'test-key',
getModel: () => 'test-model',
getModel: () => 'gemini-1.5-flash',
getSandbox: () => false,
getDebugMode: () => false,
getQuestion: () => undefined,
Expand All @@ -107,7 +107,7 @@ const mockConfigInternal = {
isInteractive: () => false,
getDisableLLMCorrection: vi.fn(() => true),
isPlanMode: vi.fn(() => false),
getActiveModel: () => 'test-model',
getActiveModel: () => 'gemini-1.5-flash',
storage: {
getProjectTempDir: vi.fn().mockReturnValue('/tmp/project'),
},
Expand Down
15 changes: 13 additions & 2 deletions packages/core/src/tools/write-file.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,12 @@ import { WRITE_FILE_DEFINITION } from './definitions/coreTools.js';
import { resolveToolDeclaration } from './definitions/resolver.js';
import { detectOmissionPlaceholders } from './omissionPlaceholderDetector.js';
import { resolveAndValidatePlanPath } from '../utils/planUtils.js';
import { isGemini3Model } from '../config/models.js';
import {
isGemini3Model,
isGemini2Model,
isCustomModel,
resolveModel,
} from '../config/models.js';
import { discoverJitContext, appendJitContext } from './jit-context.js';

/**
Expand Down Expand Up @@ -193,7 +198,13 @@ export async function getCorrectedFileContent(
}
}

const aggressiveUnescape = !isGemini3Model(config.getActiveModel());
const activeModel = config.getActiveModel();
const resolvedModel = resolveModel(activeModel, false, false, true, config);

const aggressiveUnescape =
!isGemini3Model(resolvedModel, config) &&
!isGemini2Model(resolvedModel) &&
!isCustomModel(resolvedModel, config);

correctedContent = await ensureCorrectFileContent(
proposedContent,
Expand Down
15 changes: 15 additions & 0 deletions packages/core/src/utils/editCorrector.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,5 +245,20 @@ describe('editCorrector', () => {
expect(result).toBe(content);
expect(mockGenerateJson).not.toHaveBeenCalled();
});

it('should preserve \\n inside string literals even when aggressiveUnescape is false (b-496211054)', async () => {
const content =
'fmt.Printf("OpenFile with FailIfExists failed: %v\\n", err)';

const result = await ensureCorrectFileContent(
content,
mockBaseLlmClientInstance,
abortSignal,
true, // disableLLMCorrection
false, // aggressiveUnescape (now false for Gemini 2.5/3.x/Custom)
);

expect(result).toBe(content);
});
});
});
Loading