repoburg 1.3.79 → 1.3.81
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/backend/dist/src/llm-orchestration/action-handlers/run-command.handler.d.ts +1 -0
- package/backend/dist/src/llm-orchestration/action-handlers/run-command.handler.js +11 -1
- package/backend/dist/src/llm-orchestration/action-handlers/run-command.handler.js.map +1 -1
- package/backend/dist/src/llm-orchestration/history-compression.service.d.ts +7 -0
- package/backend/dist/src/llm-orchestration/history-compression.service.js +157 -9
- package/backend/dist/src/llm-orchestration/history-compression.service.js.map +1 -1
- package/backend/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -11,6 +11,7 @@ export declare class RunCommandHandler implements ActionHandler {
|
|
|
11
11
|
getMetadata(): ToolMetadata;
|
|
12
12
|
private generateExample;
|
|
13
13
|
getDefinition(useJsonFormat?: boolean): string;
|
|
14
|
+
private normalizeArgs;
|
|
14
15
|
execute(args: {
|
|
15
16
|
[key: string]: any;
|
|
16
17
|
}, _context: PlanExecutionContext): Promise<ActionExecutionResult>;
|
|
@@ -106,8 +106,18 @@ let RunCommandHandler = RunCommandHandler_1 = class RunCommandHandler {
|
|
|
106
106
|
`;
|
|
107
107
|
return `\n${definition.trim()}\n`;
|
|
108
108
|
}
|
|
109
|
+
normalizeArgs(args) {
|
|
110
|
+
const normalized = { ...args };
|
|
111
|
+
if ('command' in normalized && !('command_string' in normalized)) {
|
|
112
|
+
normalized.command_string = normalized.command;
|
|
113
|
+
delete normalized.command;
|
|
114
|
+
this.logger.debug('Auto-corrected parameter name: "command" → "command_string"');
|
|
115
|
+
}
|
|
116
|
+
return normalized;
|
|
117
|
+
}
|
|
109
118
|
async execute(args, _context) {
|
|
110
|
-
const
|
|
119
|
+
const normalizedArgs = this.normalizeArgs(args);
|
|
120
|
+
const validatedArgs = (0, class_transformer_1.plainToClass)(run_command_args_dto_1.RunCommandArgsDto, normalizedArgs);
|
|
111
121
|
const errors = await (0, class_validator_1.validate)(validatedArgs);
|
|
112
122
|
if (errors.length > 0) {
|
|
113
123
|
const errorMessages = errors
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.handler.js","sourceRoot":"","sources":["../../../../src/llm-orchestration/action-handlers/run-command.handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AAOpD,iDAAqC;AACrC,+BAAiC;AACjC,qEAA+D;AAC/D,yDAAiD;AACjD,qDAA2C;AAE3C,uCAAqE;AACrE,kCAAkC;AAClC,6BAA6B;AAC7B,iGAA4F;AAC5F,iDAA4C;AAE5C,MAAM,SAAS,GAAG,IAAA,gBAAS,EAAC,oBAAI,CAAC,CAAC;AAG3B,IAAM,iBAAiB,yBAAvB,MAAM,iBAAiB;IAW5B,YACmB,uBAAgD;QAAhD,4BAAuB,GAAvB,uBAAuB,CAAyB;QAX1D,aAAQ,GAAG,aAAa,CAAC;QACjB,WAAM,GAAG,IAAI,eAAM,CAAC,mBAAiB,CAAC,IAAI,CAAC,CAAC;QAC5C,gBAAW,GAC1B,OAAO,CAAC,GAAG,CAAC,qBAAqB,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QACpC,YAAO,GAAW,IAAI,CAAC,IAAI,CAC1C,IAAI,CAAC,WAAW,EAChB,WAAW,EACX,MAAM,CACP,CAAC;IAIC,CAAC;IAEJ,WAAW;QACT,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,QAAQ;YACnB,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACrC,SAAS,EAAE;gBACT;oBACE,IAAI,EAAE,gBAAgB;oBACtB,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,+BAA+B;oBAC5C,QAAQ,EAAE,IAAI;iBACf;gBACD;oBACE,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE,QAAQ;oBACd,WAAW,EACT,mEAAmE;oBACrE,QAAQ,EAAE,KAAK;iBAChB;aACF;SACF,CAAC;IACJ,CAAC;IAQO,eAAe,CACrB,QAA6B,EAC7B,UAAmB,KAAK;QAExB,OAAO,OAAO;YACZ,CAAC,CAAC,IAAA,4BAAoB,EAAC,QAAQ,CAAC;YAChC,CAAC,CAAC,IAAA,wBAAgB,EAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IAED,aAAa,CAAC,gBAAyB,KAAK;QAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,CACtC;YACE,SAAS,EAAE,IAAI,CAAC,QAAQ;YACxB,cAAc,EAAE,eAAe;SAChC,EACD,aAAa,CACd,CAAC;QAEF,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CACpC;YACE,SAAS,EAAE,IAAI,CAAC,QAAQ;YACxB,cAAc,EAAE,mBAAmB;SACpC,EACD,aAAa,CACd,CAAC;QAEF,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CACrC;YACE,SAAS,EAAE,IAAI,CAAC,QAAQ;YACxB,cAAc,EAAE,YAAY;SAC7B,EACD,aAAa,CACd,CAAC;QAEF,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CACzC;YACE,SAAS,EAAE,IAAI,CAAC,QAAQ;YACxB,cAAc,EAAE,oBAAoB;SACrC,EACD,aAAa,CACd,CAAC;QAEF,MAAM,cAAc,GAAG,IAAI,CAAC,eAAe,CACzC;YACE,SAAS,EAAE,IAAI,CAAC,QAAQ;YACxB,cAAc,EAAE,eAAe;YAC/B,OAAO,EAAE,MAAM;SAChB,EACD,aAAa,CACd,CAAC;QAEF,MAAM,UAAU,GAAG;;MAEjB,IAAI,CAAC,QAAQ;;;;;;;;;GAShB,WAAW;;;GAGX,SAAS;;;GAGT,UAAU;;;GAGV,cAAc;;;GAGd,cAAc;;CAEhB,CAAC;QACE,OAAO,KAAK,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,OAAO,CACX,IAA4B,EAC5B,QAA8B;
|
|
1
|
+
{"version":3,"file":"run-command.handler.js","sourceRoot":"","sources":["../../../../src/llm-orchestration/action-handlers/run-command.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,16 @@ export declare class HistoryCompressionService {
|
|
|
4
4
|
private readonly applicationStateService;
|
|
5
5
|
private readonly logger;
|
|
6
6
|
private readonly FILE_MARKER_REGEX;
|
|
7
|
+
private readonly FILE_WRITE_TOOLS;
|
|
7
8
|
constructor(applicationStateService: ApplicationStateService);
|
|
8
9
|
compress(history: LlmContent[]): Promise<LlmContent[]>;
|
|
10
|
+
private compressRequestContextResults;
|
|
11
|
+
private compressFileWriteToolCalls;
|
|
12
|
+
private isFileWriteTool;
|
|
13
|
+
private extractFilePathFromToolCall;
|
|
14
|
+
private redactToolCallContent;
|
|
9
15
|
private extractFilePaths;
|
|
10
16
|
private normalizePath;
|
|
17
|
+
private parseFileBlocks;
|
|
11
18
|
private redactToolResult;
|
|
12
19
|
}
|
|
@@ -18,6 +18,7 @@ let HistoryCompressionService = HistoryCompressionService_1 = class HistoryCompr
|
|
|
18
18
|
this.applicationStateService = applicationStateService;
|
|
19
19
|
this.logger = new common_1.Logger(HistoryCompressionService_1.name);
|
|
20
20
|
this.FILE_MARKER_REGEX = /\/\/ File: (\.?[^\n]+)/g;
|
|
21
|
+
this.FILE_WRITE_TOOLS = ['create_file', 'overwrite_file'];
|
|
21
22
|
}
|
|
22
23
|
async compress(history) {
|
|
23
24
|
const enabled = await this.applicationStateService.getHistoryCompressionEnabled();
|
|
@@ -28,8 +29,12 @@ let HistoryCompressionService = HistoryCompressionService_1 = class HistoryCompr
|
|
|
28
29
|
if (history.length === 0) {
|
|
29
30
|
return history;
|
|
30
31
|
}
|
|
32
|
+
let result = this.compressRequestContextResults(history);
|
|
33
|
+
result = this.compressFileWriteToolCalls(result);
|
|
34
|
+
return result;
|
|
35
|
+
}
|
|
36
|
+
compressRequestContextResults(history) {
|
|
31
37
|
const toolCallToIndex = new Map();
|
|
32
|
-
const toolResultIndices = [];
|
|
33
38
|
for (let i = 0; i < history.length; i++) {
|
|
34
39
|
const turn = history[i];
|
|
35
40
|
if (turn.role === 'model' && turn.tool_calls) {
|
|
@@ -39,9 +44,6 @@ let HistoryCompressionService = HistoryCompressionService_1 = class HistoryCompr
|
|
|
39
44
|
}
|
|
40
45
|
}
|
|
41
46
|
}
|
|
42
|
-
if (turn.role === 'tool' && turn.tool_call_id) {
|
|
43
|
-
toolResultIndices.push(i);
|
|
44
|
-
}
|
|
45
47
|
}
|
|
46
48
|
const fileToLatestIndex = new Map();
|
|
47
49
|
for (let i = history.length - 1; i >= 0; i--) {
|
|
@@ -95,6 +97,105 @@ let HistoryCompressionService = HistoryCompressionService_1 = class HistoryCompr
|
|
|
95
97
|
}
|
|
96
98
|
return result;
|
|
97
99
|
}
|
|
100
|
+
compressFileWriteToolCalls(history) {
|
|
101
|
+
const fileToLatestIndex = new Map();
|
|
102
|
+
for (let i = history.length - 1; i >= 0; i--) {
|
|
103
|
+
const turn = history[i];
|
|
104
|
+
if (turn.role !== 'model' || !turn.tool_calls)
|
|
105
|
+
continue;
|
|
106
|
+
for (const tc of turn.tool_calls) {
|
|
107
|
+
if (this.isFileWriteTool(tc.function?.name)) {
|
|
108
|
+
const filePath = this.extractFilePathFromToolCall(tc);
|
|
109
|
+
if (filePath) {
|
|
110
|
+
const normalized = this.normalizePath(filePath);
|
|
111
|
+
if (!fileToLatestIndex.has(normalized)) {
|
|
112
|
+
fileToLatestIndex.set(normalized, i);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
if (fileToLatestIndex.size === 0) {
|
|
119
|
+
return history;
|
|
120
|
+
}
|
|
121
|
+
const result = history.map((turn, index) => {
|
|
122
|
+
if (turn.role !== 'model' || !turn.tool_calls) {
|
|
123
|
+
return turn;
|
|
124
|
+
}
|
|
125
|
+
let hasRedaction = false;
|
|
126
|
+
const newToolCalls = turn.tool_calls.map((tc) => {
|
|
127
|
+
if (!this.isFileWriteTool(tc.function?.name)) {
|
|
128
|
+
return tc;
|
|
129
|
+
}
|
|
130
|
+
const filePath = this.extractFilePathFromToolCall(tc);
|
|
131
|
+
if (!filePath) {
|
|
132
|
+
return tc;
|
|
133
|
+
}
|
|
134
|
+
const normalized = this.normalizePath(filePath);
|
|
135
|
+
const latestIndex = fileToLatestIndex.get(normalized);
|
|
136
|
+
if (latestIndex !== undefined && latestIndex > index) {
|
|
137
|
+
hasRedaction = true;
|
|
138
|
+
return this.redactToolCallContent(tc, filePath);
|
|
139
|
+
}
|
|
140
|
+
return tc;
|
|
141
|
+
});
|
|
142
|
+
if (!hasRedaction) {
|
|
143
|
+
return turn;
|
|
144
|
+
}
|
|
145
|
+
return {
|
|
146
|
+
...turn,
|
|
147
|
+
tool_calls: newToolCalls,
|
|
148
|
+
};
|
|
149
|
+
});
|
|
150
|
+
const redactedCount = result.filter((t, i) => t !== history[i] && t.role === 'model').length;
|
|
151
|
+
if (redactedCount > 0) {
|
|
152
|
+
this.logger.log(`Compressed history: redacted ${redactedCount} older file write tool call(s)`);
|
|
153
|
+
}
|
|
154
|
+
return result;
|
|
155
|
+
}
|
|
156
|
+
isFileWriteTool(toolName) {
|
|
157
|
+
return !!toolName && this.FILE_WRITE_TOOLS.includes(toolName);
|
|
158
|
+
}
|
|
159
|
+
extractFilePathFromToolCall(toolCall) {
|
|
160
|
+
const args = toolCall.function?.arguments;
|
|
161
|
+
if (!args)
|
|
162
|
+
return null;
|
|
163
|
+
let parsedArgs = args;
|
|
164
|
+
if (typeof args === 'string') {
|
|
165
|
+
try {
|
|
166
|
+
parsedArgs = JSON.parse(args);
|
|
167
|
+
}
|
|
168
|
+
catch {
|
|
169
|
+
return null;
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
return parsedArgs.file_path || null;
|
|
173
|
+
}
|
|
174
|
+
redactToolCallContent(toolCall, filePath) {
|
|
175
|
+
const args = toolCall.function?.arguments;
|
|
176
|
+
let parsedArgs = args;
|
|
177
|
+
if (typeof args === 'string') {
|
|
178
|
+
try {
|
|
179
|
+
parsedArgs = JSON.parse(args);
|
|
180
|
+
}
|
|
181
|
+
catch {
|
|
182
|
+
return toolCall;
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
const redactedArgs = {
|
|
186
|
+
...parsedArgs,
|
|
187
|
+
content: `[Content for ${filePath} redacted - see newer ${toolCall.function.name} for this file]`,
|
|
188
|
+
};
|
|
189
|
+
return {
|
|
190
|
+
...toolCall,
|
|
191
|
+
function: {
|
|
192
|
+
...toolCall.function,
|
|
193
|
+
arguments: typeof args === 'string'
|
|
194
|
+
? JSON.stringify(redactedArgs)
|
|
195
|
+
: redactedArgs,
|
|
196
|
+
},
|
|
197
|
+
};
|
|
198
|
+
}
|
|
98
199
|
extractFilePaths(text) {
|
|
99
200
|
const paths = [];
|
|
100
201
|
let match;
|
|
@@ -109,14 +210,61 @@ let HistoryCompressionService = HistoryCompressionService_1 = class HistoryCompr
|
|
|
109
210
|
normalized = normalized.replace(/\/+$/, '');
|
|
110
211
|
return normalized;
|
|
111
212
|
}
|
|
213
|
+
parseFileBlocks(text) {
|
|
214
|
+
const blocks = [];
|
|
215
|
+
const parts = text.split(/(?=\/\/ File: )/g);
|
|
216
|
+
for (const part of parts) {
|
|
217
|
+
if (!part.trim())
|
|
218
|
+
continue;
|
|
219
|
+
const firstLineEnd = part.indexOf('\n');
|
|
220
|
+
if (firstLineEnd === -1) {
|
|
221
|
+
const match = part.match(/\/\/ File: (.+)/);
|
|
222
|
+
if (match) {
|
|
223
|
+
blocks.push({ filePath: match[1].trim(), content: part });
|
|
224
|
+
}
|
|
225
|
+
continue;
|
|
226
|
+
}
|
|
227
|
+
const firstLine = part.substring(0, firstLineEnd);
|
|
228
|
+
const match = firstLine.match(/\/\/ File: (.+)/);
|
|
229
|
+
if (match) {
|
|
230
|
+
blocks.push({
|
|
231
|
+
filePath: match[1].trim(),
|
|
232
|
+
content: part,
|
|
233
|
+
});
|
|
234
|
+
}
|
|
235
|
+
}
|
|
236
|
+
return blocks;
|
|
237
|
+
}
|
|
112
238
|
redactToolResult(turn, filesToRedact) {
|
|
113
|
-
const
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
const
|
|
239
|
+
const text = turn.parts.map((p) => p.text).join('');
|
|
240
|
+
const blocks = this.parseFileBlocks(text);
|
|
241
|
+
const normalizedFilesToRedact = new Set(filesToRedact.map((f) => this.normalizePath(f)));
|
|
242
|
+
const resultParts = [];
|
|
243
|
+
for (const block of blocks) {
|
|
244
|
+
const normalizedBlockPath = this.normalizePath(block.filePath);
|
|
245
|
+
if (normalizedFilesToRedact.has(normalizedBlockPath)) {
|
|
246
|
+
resultParts.push(`[Content for ${block.filePath} redacted - see newer request_context]`);
|
|
247
|
+
}
|
|
248
|
+
else {
|
|
249
|
+
resultParts.push(block.content);
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
if (resultParts.length === 0) {
|
|
253
|
+
const fileList = filesToRedact.length === 1
|
|
254
|
+
? filesToRedact[0]
|
|
255
|
+
: `${filesToRedact.length} files`;
|
|
256
|
+
return {
|
|
257
|
+
...turn,
|
|
258
|
+
parts: [
|
|
259
|
+
{
|
|
260
|
+
text: `[Content for ${fileList} redacted - see newer request_context]`,
|
|
261
|
+
},
|
|
262
|
+
],
|
|
263
|
+
};
|
|
264
|
+
}
|
|
117
265
|
return {
|
|
118
266
|
...turn,
|
|
119
|
-
parts: [{ text:
|
|
267
|
+
parts: [{ text: resultParts.join('\n\n') }],
|
|
120
268
|
};
|
|
121
269
|
}
|
|
122
270
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history-compression.service.js","sourceRoot":"","sources":["../../../src/llm-orchestration/history-compression.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAoD;AAEpD,8FAAyF;
|
|
1
|
+
{"version":3,"file":"history-compression.service.js","sourceRoot":"","sources":["../../../src/llm-orchestration/history-compression.service.ts"],"names":[],"mappings":"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"}
|