repoburg 1.3.11 → 1.3.12

package/backend/packages/tokenpatch/index.spec.ts

@@ -1,5 +1,9 @@
 import { applySnippetPatch } from './index';
 import * as path from 'path';
+import {
+  SPECIAL_PATCH_BEGIN_FILE_MARKER,
+  SPECIAL_PATCH_END_FILE_MARKER,
+} from '../../src/llm-orchestration/parser/parsing.constants';
 
 const TS_WASM_PATH = path.join(
   __dirname,
@@ -99,7 +103,7 @@ export { calculate };
     expect(normalize(result)).toEqual(normalize(expectedResult));
   });
 
-  it('should replace a beginning of the file @begin-of-file', async () => {
+  it(`should replace a beginning of the file ${SPECIAL_PATCH_BEGIN_FILE_MARKER}`, async () => {
     const sourceCode = `
 import { ModuleA } from './moduleA';
 import { ModuleB } from './moduleB';
@@ -107,7 +111,7 @@ import { ModuleB } from './moduleB';
 console.log('starting up');
 `;
     const patchCode = `
-// @begin-of-file
+// ${SPECIAL_PATCH_BEGIN_FILE_MARKER}
 import groupBy from  'lodash'; 
 import { ModuleA } from './moduleA';
 `;
@@ -122,7 +126,7 @@ console.log('starting up');
     expect(normalize(result)).toEqual(normalize(expectedResult));
   });
 
-  it('should handle @begin-of-file marker with variations', async () => {
+  it(`should handle ${SPECIAL_PATCH_BEGIN_FILE_MARKER} marker with variations`, async () => {
     const sourceCode = `
 import { ModuleA } from './moduleA';
 import { ModuleB } from './moduleB';
@@ -130,7 +134,7 @@ import { ModuleB } from './moduleB';
 console.log('starting up');
 `;
     const patchCode = `
-//@begin-of-file extra text
+//${SPECIAL_PATCH_BEGIN_FILE_MARKER} extra text
 import groupBy from  'lodash'; 
 import { ModuleA } from './moduleA';
 `;
@@ -145,7 +149,7 @@ console.log('starting up');
     expect(normalize(result)).toEqual(normalize(expectedResult));
   });
 
-  it('should replace a end of the file @end-of-file', async () => {
+  it(`should replace a end of the file ${SPECIAL_PATCH_END_FILE_MARKER}`, async () => {
     const sourceCode = `
 import fs from 'fs';
 
@@ -158,7 +162,7 @@ export { calculate };
     const patchCode = `
 export { calculate };
 export { sum };
-// @end-of-file
+// ${SPECIAL_PATCH_END_FILE_MARKER}
 `;
     const expectedResult = `
 import fs from 'fs';
@@ -174,7 +178,7 @@ export { sum };
     expect(normalize(result)).toEqual(normalize(expectedResult));
   });
 
-  it('should handle @end-of-file marker with variations', async () => {
+  it(`should handle ${SPECIAL_PATCH_END_FILE_MARKER} marker with variations`, async () => {
     const sourceCode = `
 import fs from 'fs';
 
@@ -187,7 +191,7 @@ export { calculate };
     const patchCode = `
 export { calculate };
 export { sum };
-//@end-of-file some extra text
+//${SPECIAL_PATCH_END_FILE_MARKER} some extra text
 `;
     const expectedResult = `
 import fs from 'fs';
@@ -576,4 +580,4 @@ export function TransactionsPage() {
     );
     expect(normalize(result)).toEqual(normalize(expectedResult));
   });
-});
+});

package/backend/packages/tokenpatch/index.ts

@@ -5,6 +5,10 @@ import {
   handleEndOfFilePatch,
   handleStandardPatch,
 } from './patcher';
+import {
+  SPECIAL_PATCH_BEGIN_FILE_MARKER,
+  SPECIAL_PATCH_END_FILE_MARKER,
+} from '../../src/llm-orchestration/parser/parsing.constants';
 
 export async function applySnippetPatch(
   sourceCode: string,
@@ -27,8 +31,12 @@ export async function applySnippetPatch(
   };
   let processedPatchCode = patchCode;
 
-  const beginOfFileRegex = /\/\/\s*@begin-of-file.*/;
-  const endOfFileRegex = /\/\/\s*@end-of-file.*/;
+  const beginOfFileRegex = new RegExp(
+    `//\\s*${SPECIAL_PATCH_BEGIN_FILE_MARKER}.*`,
+  );
+  const endOfFileRegex = new RegExp(
+    `//\\s*${SPECIAL_PATCH_END_FILE_MARKER}.*`,
+  );
 
   const hasBeginOfFile = beginOfFileRegex.test(patchCode);
   const hasEndOfFile = endOfFileRegex.test(patchCode);

package/backend/packages/tokenpatch/patcher.ts

@@ -1,5 +1,9 @@
 import type { Token } from './types';
 import { findAllSequences, formatAnchor } from './tokens';
+import {
+  SPECIAL_PATCH_BEGIN_FILE_MARKER,
+  SPECIAL_PATCH_END_FILE_MARKER,
+} from '../../src/llm-orchestration/parser/parsing.constants';
 
 interface PatchResult {
   replaceStart: number;
@@ -60,7 +64,9 @@ export function handleBeginOfFilePatch(
   originalPatchTokens: Token[],
 ): PatchResult {
   if (originalPatchTokens.length === 0) {
-    throw new Error('Patch is empty after removing @begin-of-file marker.');
+    throw new Error(
+      `Patch is empty after removing ${SPECIAL_PATCH_BEGIN_FILE_MARKER} marker.`,
+    );
   }
 
   let patchAttempt = [...originalPatchTokens];
@@ -83,7 +89,7 @@ export function handleBeginOfFilePatch(
   }
 
   throw new Error(
-    `Failed to apply @begin-of-file patch. Could not find a unique anchor, even after trimming tokens. Last known error: ${lastError?.message}`,
+    `Failed to apply ${SPECIAL_PATCH_BEGIN_FILE_MARKER} patch. Could not find a unique anchor, even after trimming tokens. Last known error: ${lastError?.message}`,
   );
 }
 
@@ -134,7 +140,9 @@ export function handleEndOfFilePatch(
   sourceCode: string,
 ): PatchResult {
   if (originalPatchTokens.length === 0) {
-    throw new Error('Patch is empty after removing @end-of-file marker.');
+    throw new Error(
+      `Patch is empty after removing ${SPECIAL_PATCH_END_FILE_MARKER} marker.`,
+    );
   }
 
   let patchAttempt = [...originalPatchTokens];
@@ -158,7 +166,7 @@ export function handleEndOfFilePatch(
   }
 
   throw new Error(
-    `Failed to apply @end-of-file patch. Could not find a unique anchor, even after trimming tokens. Last known error: ${lastError?.message}`,
+    `Failed to apply ${SPECIAL_PATCH_END_FILE_MARKER} patch. Could not find a unique anchor, even after trimming tokens. Last known error: ${lastError?.message}`,
   );
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "repoburg",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "description": "A local AI-powered software developer assistant that runs on your own machine.",
   "author": "Celal Ertug",
   "license": "SEE LICENSE IN LICENSE",