fix: preserve advancing pages across resumed task runs
This commit is contained in:
@@ -30,7 +30,7 @@ export function readMessageBudget(plan, message) {
|
||||
const calls = message.tool_calls?.length ?? 1;
|
||||
const assistantTokens = Math.ceil(Buffer.byteLength(JSON.stringify(message), 'utf8') / 3) + 8;
|
||||
// Reserve space for the current call's framing and the next state/notice.
|
||||
const tokens = plan.budget.inputBudget - plan.mandatoryInputTokens - (plan.workingRetentionTokens ?? 0) - assistantTokens - calls * 8 - 512;
|
||||
const tokens = plan.budget.inputBudget - (plan.nextReadFixedInputTokens ?? plan.mandatoryInputTokens) - (plan.workingRetentionTokens ?? 0) - assistantTokens - calls * 8 - 512;
|
||||
return Math.max(1024, Math.floor(tokens * 3 / calls));
|
||||
}
|
||||
|
||||
@@ -60,24 +60,32 @@ export function filePage(file, args, { maximumMessageBytes = 16000, callId = ''
|
||||
return make(end);
|
||||
}
|
||||
|
||||
export function recordArtifactRead(task, artifact, result, invocationId) {
|
||||
export function recordArtifactRead(task, artifact, result, invocationId, runId = task.activeRunId ?? null) {
|
||||
const progress = task.readProgress ??= { schemaVersion: 1, reads: [], repeated: 0, changingIndexes: [], warning: null, pause: false };
|
||||
progress.sessionInspection = null;
|
||||
const identity = artifact.id + ':' + artifact.sha256, start = result.offset, end = result.next_offset;
|
||||
let read = progress.reads.find(value => value.identity === identity);
|
||||
if (!read) { read = { identity, ranges: [] }; progress.reads.push(read); if (progress.reads.length > 128) progress.reads.shift(); }
|
||||
const covered = read.ranges.some(range => start >= range[0] && end <= range[1]);
|
||||
// Historical coverage is an audit of returned pages, not proof that a new
|
||||
// Run received them in its bounded request. Re-reading different old pages
|
||||
// in a continuation must not accumulate as three semantic repeats.
|
||||
if (!progress.readWindow || progress.readWindow.runId !== runId) progress.readWindow = { runId, reads: [] };
|
||||
let window = progress.readWindow.reads.find(value => value.identity === identity);
|
||||
if (!window) { window = { identity, ranges: [] }; progress.readWindow.reads.push(window); if (progress.readWindow.reads.length > 128) progress.readWindow.reads.shift(); }
|
||||
const covered = window.ranges.some(range => start >= range[0] && end <= range[1]);
|
||||
progress.repeated = covered ? progress.repeated + 1 : 0;
|
||||
if (!covered) {
|
||||
const ranges = [...read.ranges, [start, end]].sort((a, b) => a[0] - b[0]), merged = [];
|
||||
const merge = ranges => {
|
||||
ranges.sort((a, b) => a[0] - b[0]); const merged = [];
|
||||
for (const range of ranges) { const previous = merged.at(-1); if (previous && range[0] <= previous[1]) previous[1] = Math.max(previous[1], range[1]); else merged.push(range); }
|
||||
read.ranges = merged.slice(-64);
|
||||
}
|
||||
return merged.slice(-64);
|
||||
};
|
||||
if (!covered) window.ranges = merge([...window.ranges, [start, end]]);
|
||||
if (!read.ranges.some(range => start >= range[0] && end <= range[1])) read.ranges = merge([...read.ranges, [start, end]]);
|
||||
if (artifact.kind === 'context-history-index') {
|
||||
if (!progress.changingIndexes.includes(identity)) progress.changingIndexes.push(identity);
|
||||
progress.changingIndexes = progress.changingIndexes.slice(-8);
|
||||
} else progress.changingIndexes = [];
|
||||
progress.warning = progress.repeated >= 1 ? '刚才读取的工件区间已完整读取,请使用已返回内容,或按next_offset读取新的区间。'
|
||||
progress.warning = progress.repeated >= 1 ? '本次运行已经返回该工件区间,请使用已返回内容,或按next_offset读取新的区间。'
|
||||
: progress.changingIndexes.length >= 3 ? '连续读取更新的历史索引没有推进工程;请直接读取实际结果或项目文件,依据已有信息继续任务。' : null;
|
||||
progress.pause = progress.repeated >= 3 || progress.changingIndexes.length >= 6;
|
||||
progress.last = { artifactId: artifact.id, sha256: artifact.sha256, offset: start, nextOffset: end, invocationId,
|
||||
|
||||
@@ -167,10 +167,10 @@ export class RequestPlanner {
|
||||
let omitted = [], reference = null, workingReference = null, latestReference = null;
|
||||
const latestDocument = latestToolDocument(this.store, session, run, groups);
|
||||
const entries = [];
|
||||
const metricsFor = (indices, includeNotice = true, currentEntries = entries) => {
|
||||
const metricsFor = (indices, includeNotice = true, currentEntries = entries, includeLatest = true) => {
|
||||
const missing = groups.filter(group => !indices.has(group.index));
|
||||
const messages = [fixed, ...(missing.length && includeNotice ? [notice({ id: PLACEHOLDER_ID, sha256: PLACEHOLDER_SHA }, missing, descriptions, evidence)] : []),
|
||||
...(latestDocument && !indices.has(latestDocument.group_index) ? [latestToolMessage({ id: PLACEHOLDER_ID, sha256: PLACEHOLDER_SHA }, latestDocument)] : []),
|
||||
...(includeLatest && latestDocument && !indices.has(latestDocument.group_index) ? [latestToolMessage({ id: PLACEHOLDER_ID, sha256: PLACEHOLDER_SHA }, latestDocument)] : []),
|
||||
...(currentEntries.length ? [workingMessage({ id: PLACEHOLDER_ID, sha256: PLACEHOLDER_SHA }, workingDocument(session, run, currentEntries))] : []),
|
||||
...groups.filter(group => indices.has(group.index)).flatMap(group => group.messages)];
|
||||
return requestMetrics(completionBody(config, messages, tools));
|
||||
@@ -256,6 +256,9 @@ export class RequestPlanner {
|
||||
requestArtifactId: requestArtifact.id,
|
||||
estimateMethod: metrics.estimateMethod, beforeInputTokens: before.estimatedInputTokens, beforeBytes: before.bytes, budget,
|
||||
mandatoryInputTokens: metricsFor(new Set(lastUser ? [lastUser.index] : []), true, []).estimatedInputTokens,
|
||||
// The next result replaces the current latest-result feedback. Do not
|
||||
// reserve both views when sizing that result's actual protocol page.
|
||||
nextReadFixedInputTokens: metricsFor(new Set(lastUser ? [lastUser.index] : []), true, [], false).estimatedInputTokens,
|
||||
workingRetentionTokens: Math.min(2048, Math.max(0, metricsFor(new Set(lastUser ? [lastUser.index] : []), true,
|
||||
entries.filter(entry => entry.observation.kind === 'file' && !entry.truncated && entry.total_content_characters <= 2000)).estimatedInputTokens
|
||||
- metricsFor(new Set(lastUser ? [lastUser.index] : []), true, []).estimatedInputTokens)),
|
||||
@@ -302,6 +305,7 @@ export function verifyPlanEvidence(store, session, plan, cache = new Map()) {
|
||||
|| (frozen.workingSetEntries ?? 0) !== (plan.workingSetEntries ?? 0)) throw new Error('工作依据与发送前的封存记录不匹配。');
|
||||
if ((frozen.workingSetViewVersion ?? 1) !== (plan.workingSetViewVersion ?? 1)
|
||||
|| (frozen.workingRetentionTokens ?? 0) !== (plan.workingRetentionTokens ?? 0)) throw new Error('工作依据视图或保留预算与封存记录不匹配。');
|
||||
if ((frozen.nextReadFixedInputTokens ?? null) !== (plan.nextReadFixedInputTokens ?? null)) throw new Error('下一工具页的固定预算与封存记录不匹配。');
|
||||
if ((frozen.latestToolsArtifactId ?? null) !== (plan.latestToolsArtifactId ?? null)
|
||||
|| (frozen.latestToolsSha256 ?? null) !== (plan.latestToolsSha256 ?? null)
|
||||
|| (frozen.latestToolsEntries ?? 0) !== (plan.latestToolsEntries ?? 0)) throw new Error('最新工具反馈与发送前的封存记录不匹配。');
|
||||
|
||||
@@ -291,7 +291,7 @@ export class Runtime {
|
||||
else if (tool === 'read_artifact') {
|
||||
const artifact = this.store.owned('artifact', args.artifact_id, session.id), text = this.store.artifactStore.read(artifact);
|
||||
result = artifactPage(artifact, text, args, { callId: call.id, maximumMessageBytes: run.readMessageBytes ?? 16000 });
|
||||
recordArtifactRead(this.store.core.task.get(run.taskId), artifact, result, event.invocationId);
|
||||
recordArtifactRead(this.store.core.task.get(run.taskId), artifact, result, event.invocationId, run.id);
|
||||
}
|
||||
else if (tool === 'prepare_change_set') {
|
||||
const set = await this.changeSetManager().prepare(session, args.change_ids, { source: 'agent' });
|
||||
|
||||
Reference in New Issue
Block a user