fix(engine): bound native history and preserve verified continuation context
This commit is contained in:
@@ -48,7 +48,7 @@ export function historyGroups(messages) {
|
||||
return groups;
|
||||
}
|
||||
|
||||
export function budgetFor(config, run, task) {
|
||||
export function budgetFor(config, run, task, transportReservationTokens = 0) {
|
||||
const outputReservation = config.maxOutputTokens;
|
||||
const safetyTokens = Math.max(512, Math.ceil(Math.min(config.contextLimit, 24000) * 0.1));
|
||||
const remaining = (maximum, usage) => maximum > 0 ? Math.max(0, maximum - accountedTokens(usage)) : null;
|
||||
@@ -57,8 +57,9 @@ export function budgetFor(config, run, task) {
|
||||
let limit = config.contextLimit, reason = 'context_limit';
|
||||
if (runRemainingTokens !== null && runRemainingTokens < limit) { limit = runRemainingTokens; reason = 'token_limit'; }
|
||||
if (taskRemainingTokens !== null && taskRemainingTokens < limit) { limit = taskRemainingTokens; reason = 'task_token_limit'; }
|
||||
const inputBudget = limit - outputReservation - safetyTokens;
|
||||
return { contextLimit: config.contextLimit, outputReservation, safetyTokens, inputBudget, targetInputTokens: Math.min(16000, inputBudget),
|
||||
if(!Number.isSafeInteger(transportReservationTokens)||transportReservationTokens<0)throw new Error('请求封装预留无效。');
|
||||
const inputBudget = limit - outputReservation - safetyTokens - transportReservationTokens;
|
||||
return { contextLimit: config.contextLimit, outputReservation, safetyTokens, ...(transportReservationTokens?{transportReservationTokens}:{}), inputBudget, targetInputTokens: Math.min(16000, inputBudget),
|
||||
runRemainingTokens, taskRemainingTokens, limitingReason: reason };
|
||||
}
|
||||
|
||||
@@ -157,10 +158,10 @@ export class RequestPlanner {
|
||||
return { artifact_id: artifact.id, sha256: artifact.sha256, group_sha256: group.sha256, bytes: Buffer.byteLength(text, 'utf8'), chunks: chunks.length };
|
||||
}
|
||||
|
||||
prepare(session, run, config, { system, tools, stepId, projectMemory = null, skillCatalog = null, mcpCatalog = null }) {
|
||||
prepare(session, run, config, { system, tools, stepId, projectMemory = null, skillCatalog = null, mcpCatalog = null, transportReservationTokens = 0 }) {
|
||||
const task = this.store.owned('task', run.taskId, session.id);
|
||||
this.store.owned('run', run.id, session.id);
|
||||
const groups = historyGroups(session.providerMessages), budget = budgetFor(config, run, task);
|
||||
const groups = historyGroups(session.providerMessages), budget = budgetFor(config, run, task, transportReservationTokens);
|
||||
const lastUser = groups.findLast(group => group.messages[0].role === 'user');
|
||||
const fixed = { role: 'system', content: system };
|
||||
const breakdown = metrics => {
|
||||
|
||||
Reference in New Issue
Block a user