Skip to content

Commit 0cdb466

Browse files
committed
Merge branch 'quant' into main: resolve conflicts in code-index constants and Qdrant client
2 parents e1f4583 + 1ac1d72 commit 0cdb466

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "roo-code",
33
"packageManager": "[email protected]",
44
"engines": {
5-
"node": "20.19.2"
5+
"node": "22.17.0"
66
},
77
"scripts": {
88
"preinstall": "node scripts/bootstrap.mjs",

src/services/code-index/constants/index.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ import { CODEBASE_INDEX_DEFAULTS } from "@roo-code/types"
44
export const MAX_BLOCK_CHARS = 1000
55
export const MIN_BLOCK_CHARS = 50
66
export const MIN_CHUNK_REMAINDER_CHARS = 200 // Minimum characters for the *next* chunk after a split
7+
<<<<<<< HEAD
78
export const MAX_CHARS_TOLERANCE_FACTOR = 1.08 // 15% tolerance for max chars
9+
=======
10+
export const MAX_CHARS_TOLERANCE_FACTOR = 1.08 // 8% 15 tolerance for max chars
11+
>>>>>>> quant
812
/**Search */
913
export const DEFAULT_SEARCH_MIN_SCORE = CODEBASE_INDEX_DEFAULTS.DEFAULT_SEARCH_MIN_SCORE
1014
export const DEFAULT_MAX_SEARCH_RESULTS = CODEBASE_INDEX_DEFAULTS.DEFAULT_SEARCH_RESULTS
@@ -16,8 +20,13 @@ export const MAX_FILE_SIZE_BYTES = 1 * 1024 * 1024 // 1MB
1620
/**Directory Scanner */
1721
export const MAX_LIST_FILES_LIMIT_CODE_INDEX = 10_000
1822
export const BATCH_SEGMENT_THRESHOLD = 8 // 60 Number of code segments to batch for embeddings/upserts
23+
<<<<<<< HEAD
1924
export const MAX_BATCH_RETRIES = 3
2025
export const INITIAL_RETRY_DELAY_MS = 500
26+
=======
27+
export const MAX_BATCH_RETRIES = 5
28+
export const INITIAL_RETRY_DELAY_MS = 600
29+
>>>>>>> quant
2130
export const PARSING_CONCURRENCY = 10
2231
export const MAX_PENDING_BATCHES = 20 // Maximum number of batches to accumulate before waiting
2332

0 commit comments

Comments
 (0)