mirror of
https://github.com/RooVetGit/Roo-Code.git
synced 2026-08-28 05:27:24 +00:00
fix: resolve conflicts and address review comments regarding FileEntry.limit and truncatedByLimit
This commit is contained in:
parent
06e5cff342
commit
e184ca6216
3 changed files with 6 additions and 2 deletions
|
|
@ -27,6 +27,8 @@ export interface FileEntry {
|
|||
path: string
|
||||
/** 1-indexed line number to start reading from (default: 1) */
|
||||
offset?: number
|
||||
/** Maximum lines to return (default: value of maxReadFileLine setting) */
|
||||
limit?: number
|
||||
/** Reading mode: "slice" for simple reading, "indentation" for smart block extraction */
|
||||
mode?: ReadMode
|
||||
/** Configuration for indentation mode */
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ interface FileResult {
|
|||
notice?: string
|
||||
// Slice/indentation mode parameters
|
||||
offset?: number
|
||||
limit?: number
|
||||
mode?: ReadMode
|
||||
indentation?: IndentationConfig
|
||||
xmlContent?: string
|
||||
|
|
@ -106,6 +107,7 @@ export class ReadFileTool extends BaseTool<"read_file"> {
|
|||
status: "pending",
|
||||
// Map slice/indentation mode parameters
|
||||
offset: entry.offset,
|
||||
limit: entry.limit,
|
||||
mode: entry.mode,
|
||||
indentation: entry.indentation,
|
||||
}))
|
||||
|
|
@ -395,7 +397,7 @@ export class ReadFileTool extends BaseTool<"read_file"> {
|
|||
const result = await readFileContent({
|
||||
filePath: fullPath,
|
||||
offset: fileResult.offset,
|
||||
// limit is controlled by maxReadFileLine setting, not model input
|
||||
limit: fileResult.limit,
|
||||
mode: fileResult.mode,
|
||||
indentation: fileResult.indentation,
|
||||
defaultLimit: maxReadFileLine > 0 ? maxReadFileLine : undefined,
|
||||
|
|
|
|||
|
|
@ -452,7 +452,7 @@ export async function readIndentationBlock(
|
|||
hasMoreAfter: r.number < records.length,
|
||||
linesBeforeStart: r.number - 1,
|
||||
linesAfterEnd: records.length - r.number,
|
||||
truncatedByLimit: true,
|
||||
truncatedByLimit: records.length > finalLimit,
|
||||
lineLengthTruncations,
|
||||
},
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue