fix(reading): preserve mixed-turn progress without disabling no-op guards
This commit is contained in:
@@ -41,3 +41,9 @@ W六请求71044 tokens、0提案0交付是事实;末轮新增468字符、还
|
||||
### 明确禁止检查的识别
|
||||
|
||||
新HTTP读取用例首轮已发出第3请求,但终态因verification_incomplete暂停,暴露taskContract把“不运行工程检查”匹配为正向要求。原reading.tap的32/33和reading-mixed-debug.tap保留;不是混合读取修复失败,也不能通过改终态断言掩盖。已补“不运行/不执行工程检查”、带“任何”的测试禁止及对应英文的明确否定识别;正向运行检查仍required。task-control 10项包含于联合43/43通过。
|
||||
|
||||
### 混合读取进展
|
||||
|
||||
每个真实工具轮开始/结算记录新返回字符及重复读取数,按当前Run区间并集计算;同轮确有新字符时,不因尾部三次重复而整轮暂停,并在边界清掉重复streak。空页/仅改变历史索引不算新源码依据;全重复仍暂停,未变检查/相同无效提案/连续相同状态的独立保护仍权威。shadow模块与其判断不参与停止决策。
|
||||
|
||||
联合43/43通过后补强独立相同状态保护,针对性2/2通过。HTTP夹具忠实复现945→1413新增468及三小模块重复,下一真实本机请求收到完整新页且工具配对成立;全重复和独立保护仍暂停。测试保持16K/2048与原权限门,不证明真实模型一定交付。原证据在reading-contract.tap、reading-mixed-final.tap。
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
- 安装关联首轮13项11通过2失败,确认升级兼容列表漏1.25.1;补历史版本并动态包含当前APP_VERSION,守卫及独立真实宿主升级3/3通过,首失败保留,先单独提交该修复。没有正式操作。
|
||||
- 安装文件变化复核12/12通过;10971文件只读ABBA全校验8.15–8.45s→9.96–11.08s、四次身份exact,记录新增检查的真实成本。已补阶段回顾并独立本地提交。
|
||||
- 新读取HTTP用例首33项32通过1失败;有第3请求但被误设required的检查阻断。debug证实verification_incomplete;补明确“不运行工程检查”等否定及正向对照后,读取/无进展/shadow/task-control联合43/43通过。原首失败保留,task-control先独立提交。
|
||||
- 混合读取按每工具轮真实新增区间结算;新468字符+3模块重复可进入下一请求,纯重复/相同检查/相同提案/相同状态保护保持。43/43后独立保护补强2/2通过,回顾后本地提交。源码定位曾误用task-contract文件名,改真实task-control;Windows rg文件通配失败改-g过滤。验证依赖中两套现有Python缺pytest,已定位Python310/312供后续核对;浏览器下载进行中。
|
||||
|
||||
## 1.25接续
|
||||
|
||||
|
||||
@@ -87,6 +87,27 @@ export function filePage(file, args, { maximumMessageBytes = 16000, callId = '',
|
||||
return make(end);
|
||||
}
|
||||
|
||||
export function beginReadTurn(task, runId, stepId) {
|
||||
const progress = task.readProgress ??= { schemaVersion: 1, reads: [], repeated: 0, changingIndexes: [], warning: null, pause: false };
|
||||
progress.readTurn = { runId, stepId, newCharacters: 0, repeatedReads: 0, settled: false };
|
||||
}
|
||||
|
||||
export function finishReadTurn(task, runId, stepId) {
|
||||
const progress = task.readProgress, turn = progress?.readTurn;
|
||||
if (!turn || turn.runId !== runId || turn.stepId !== stepId || turn.settled) return;
|
||||
turn.settled = true;
|
||||
const independentPause = progress.checkPause === true || progress.noopPause === true
|
||||
|| (progress.sessionInspection?.consecutive ?? 0) >= 3 || progress.changingIndexes.length >= 6;
|
||||
progress.pause ||= independentPause;
|
||||
// A trailing sequence of repeated tools is not a wholly repeated turn when
|
||||
// this same response returned new source/evidence bytes. Keep independent
|
||||
// unchanged-check/action/state and changing-index guards authoritative.
|
||||
if (turn.newCharacters > 0 && !independentPause) {
|
||||
progress.pause = false;
|
||||
progress.repeated = 0;
|
||||
}
|
||||
}
|
||||
|
||||
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 };
|
||||
const identity = artifact.id + ':' + (artifact.section ? artifact.section + ':' : '') + artifact.sha256, start = result.offset, end = result.next_offset;
|
||||
@@ -99,6 +120,12 @@ export function recordArtifactRead(task, artifact, result, invocationId, runId =
|
||||
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]);
|
||||
const turn = progress.readTurn;
|
||||
if (turn?.runId === runId && !turn.settled) {
|
||||
if (covered) turn.repeatedReads++;
|
||||
else if (artifact.kind !== 'context-history-index') turn.newCharacters += Math.max(0, end - start
|
||||
- window.ranges.reduce((sum, [left, right]) => sum + Math.max(0, Math.min(end, right) - Math.max(start, left)), 0));
|
||||
}
|
||||
progress.repeated = covered ? progress.repeated + 1 : 0;
|
||||
const merge = ranges => {
|
||||
ranges.sort((a, b) => a[0] - b[0]); const merged = [];
|
||||
|
||||
@@ -28,7 +28,7 @@ import { RequestPlanner, verifyPlanEvidence } from '../core/context/request-plan
|
||||
import { ENGINE_SEED_RESERVATION } from '../shared/contracts/engine-context.mjs';
|
||||
import { InputAttachments } from '../core/context/input-attachments.mjs';
|
||||
import { BudgetResume } from '../core/context/budget-resume.mjs';
|
||||
import { artifactPage, filePage, readMessageBudget, readBatchBudget, spendReadBudget, recordArtifactRead, recordBrowserRead, recordFileRead, recordUnchangedCheck, clearReadStreak, recordSessionInspection, recordUnchangedAction, readCoverageContext, readMetadataReserve, BROWSER_READ_HINT } from '../core/context/read-budget.mjs';
|
||||
import { artifactPage, filePage, readMessageBudget, readBatchBudget, spendReadBudget, recordArtifactRead, recordBrowserRead, recordFileRead, recordUnchangedCheck, clearReadStreak, recordSessionInspection, recordUnchangedAction, readCoverageContext, readMetadataReserve, BROWSER_READ_HINT, beginReadTurn, finishReadTurn } from '../core/context/read-budget.mjs';
|
||||
import { taskDeliveryProgress } from '../core/context/delivery-progress.mjs';
|
||||
import { ChangeSetManager } from '../core/workspaces/change-sets.mjs';
|
||||
import { assertChangeSetsResolved } from '../shared/contracts/change-sets.mjs';
|
||||
@@ -481,6 +481,7 @@ export class Runtime {
|
||||
if (run.worker && (calls.length > 16 || workerUsage(this.store, run.worker).toolCalls + calls.length > run.worker.budget.maxToolCalls)) throw new BudgetExceeded('worker_tool_limit', '子任务工具次数超出固定累计预算或单次16项上限;这批工具未执行,原响应和用量已保存。');
|
||||
run.readMessageBytes = readMessageBudget(planned.record, message);
|
||||
run.readBatchBudget = readBatchBudget(planned.record, message);
|
||||
beginReadTurn(task, run.id, stepRecord.id);
|
||||
run.readPageCharacters = planned.record.budget.inputBudget - planned.record.nextReadFixedInputTokens
|
||||
- (planned.record.workingRetentionTokens ?? 0) < 4096 ? 2000 : Infinity;
|
||||
const previousIds = new Set(session.providerMessages.flatMap(item => (item.tool_calls ?? []).map(call => call.id)));
|
||||
@@ -566,6 +567,7 @@ export class Runtime {
|
||||
await yieldExecution(undefined, { signal });
|
||||
signal.throwIfAborted();
|
||||
}
|
||||
finishReadTurn(task, run.id, stepRecord.id);
|
||||
this.store.finishStep(session, stepRecord);
|
||||
if (mcpReview) {
|
||||
session.status = 'paused'; run.stopReason = 'mcp_review';
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { randomUUID, createHash } from 'node:crypto';
|
||||
import { artifactPage, recordArtifactRead, clearReadStreak, readMessageBudget } from '../src/core/context/read-budget.mjs';
|
||||
import { artifactPage, recordArtifactRead, clearReadStreak, readMessageBudget, recordFileRead, beginReadTurn, finishReadTurn } from '../src/core/context/read-budget.mjs';
|
||||
import { Runtime } from '../src/server/runtime.mjs';
|
||||
import { Provider } from '../src/server/provider.mjs';
|
||||
import { Store } from '../src/server/store.mjs';
|
||||
@@ -10,6 +10,57 @@ import { fixture, compatibleFixture, call, completion, until, assertToolPairs }
|
||||
const sha = text => createHash('sha256').update(text, 'utf8').digest('hex');
|
||||
const bytes = (page, id) => Buffer.byteLength(JSON.stringify({ role: 'tool', tool_call_id: id, content: JSON.stringify(page) }), 'utf8');
|
||||
|
||||
test('a mixed turn with new bytes and three repeated modules advances, while repeat-only and independent no-op guards still pause', () => {
|
||||
const task = { activeRunId: 'owned-run' };
|
||||
const read = (file, start, end, total = 2584) => recordFileRead(task, {path:file,range_start_line:1,range_end_line:38,
|
||||
sha256:'a'.repeat(64),offset:start,next_offset:end,total_characters:total,content:'x'.repeat(end-start)}, file + start, task.activeRunId);
|
||||
read('test/expense.test.mjs', 0, 945);
|
||||
for (const file of ['amount', 'summary', 'report']) read(file, 0, 51, 51);
|
||||
beginReadTurn(task, 'owned-run', 'mixed'); read('test/expense.test.mjs', 945, 1413);
|
||||
for (const file of ['amount', 'summary', 'report']) read(file, 0, 51, 51);
|
||||
assert.equal(task.readProgress.pause, true);
|
||||
finishReadTurn(task, 'owned-run', 'mixed'); assert.equal(task.readProgress.pause, false);
|
||||
assert.equal(task.readProgress.readTurn.newCharacters, 468); assert.equal(task.readProgress.readTurn.repeatedReads, 3);
|
||||
beginReadTurn(task, 'owned-run', 'repeat');
|
||||
for (const file of ['amount', 'summary', 'report']) read(file, 0, 51, 51);
|
||||
finishReadTurn(task, 'owned-run', 'repeat'); assert.equal(task.readProgress.pause, true);
|
||||
for (const guard of ['checkPause', 'noopPause']) {
|
||||
clearReadStreak(task); beginReadTurn(task, 'owned-run', guard);
|
||||
read(guard + '.mjs', 0, 10); task.readProgress[guard] = true; task.readProgress.pause = true;
|
||||
finishReadTurn(task, 'owned-run', guard); assert.equal(task.readProgress.pause, true);
|
||||
}
|
||||
clearReadStreak(task); beginReadTurn(task, 'owned-run', 'same-state');
|
||||
task.readProgress.sessionInspection = {consecutive:3}; read('same-state.mjs', 0, 10);
|
||||
finishReadTurn(task, 'owned-run', 'same-state'); assert.equal(task.readProgress.pause, true);
|
||||
clearReadStreak(task); beginReadTurn(task, 'owned-run', 'empty'); read('empty.mjs', 0, 0, 0);
|
||||
task.readProgress.pause = true; finishReadTurn(task, 'owned-run', 'empty'); assert.equal(task.readProgress.pause, true);
|
||||
});
|
||||
|
||||
test('runtime sends the next real HTTP request after a W-shaped mixed-progress turn instead of stopping on its trailing repeats', async t => {
|
||||
const f = fixture(t); const fs = await import('node:fs'), path = await import('node:path');
|
||||
fs.writeFileSync(path.join(f.projectRoot, 'evidence.txt'), 'x'.repeat(2584));
|
||||
for (const name of ['amount', 'summary', 'report']) fs.writeFileSync(path.join(f.projectRoot, name + '.mjs'), 'export const value = 0;\n');
|
||||
let requests = 0;
|
||||
const modules = index => ['amount', 'summary', 'report'].map(name => call(name + index, 'read_file', {path:name + '.mjs'}));
|
||||
const model = await compatibleFixture(t, (route, body) => {
|
||||
requests++;
|
||||
if (requests === 1) return {body:completion([call('first', 'read_file', {path:'evidence.txt',limit:945}), ...modules(1)])};
|
||||
if (requests === 2) return {body:completion([call('next', 'read_file', {path:'evidence.txt',offset:945,limit:468}), ...modules(2)])};
|
||||
const state = f.store.core.task.get(f.session.taskId).readProgress;
|
||||
assert.equal(state.readTurn.newCharacters, 468); assert.equal(state.readTurn.repeatedReads, 3); assert.equal(state.pause, false);
|
||||
const next = body.messages.filter(message => message.role === 'tool').map(message => JSON.parse(message.content)).find(result => result.path === 'evidence.txt' && result.offset === 945);
|
||||
assert.ok(next); assert.equal(next.content, 'x'.repeat(468)); assertToolPairs(body.messages);
|
||||
return {body:completion([], '已核对指定的新范围与原模块,结束只读核对。')};
|
||||
});
|
||||
f.store.saveConfig({mode:'compatible',model:'mixed-progress-fixture',baseUrl:model.baseUrl,maxSteps:8,contextLimit:16000,maxOutputTokens:2048});
|
||||
const runtime = new Runtime(f.store, new Provider()); f.onCleanup(() => runtime.stopAll());
|
||||
runtime.start(f.session.id, '只读核对指定文件范围,不修改文件,不运行工程检查。');
|
||||
await runtime.active.get(f.session.id).promise;
|
||||
assert.equal(requests, 3, JSON.stringify(f.session.failure)); assert.equal(f.session.status, 'completed',
|
||||
JSON.stringify({failure:f.session.failure,stopReason:f.store.core.run.get(f.session.runId).stopReason,messages:f.session.messages.slice(-2)}));
|
||||
assertToolPairs(f.session.providerMessages);
|
||||
});
|
||||
|
||||
test('continuation reads advance through historical pages without a false pause while repeated current-Run pages still pause', () => {
|
||||
const task = { activeRunId: randomUUID() }, text = 'Persisted failure log\n'.repeat(300),
|
||||
artifact = { id: randomUUID(), kind: 'check-log', sha256: sha(text) };
|
||||
|
||||
Reference in New Issue
Block a user