fix(runtime): preserve model capacity history and cache evidence with resumable file proposals

This commit is contained in:
Agent Workbench Dev
2026-11-06 01:18:37 +08:00
parent 2b17821138
commit 72115647d9
39 changed files with 699 additions and 75 deletions
+2 -2
View File
@@ -1,4 +1,5 @@
import { validateRuntimeBudgets } from '../core/models/runtime-settings.mjs';
import { capacitySettings, capacityMode } from '../shared/contracts/model-capacity.mjs';
import fs from 'node:fs';
import { createHash } from 'node:crypto';
import path from 'node:path';
@@ -864,9 +865,8 @@ return async (request, response) => {
if (!['demo', 'compatible'].includes(input.mode)) throw new Error('请选择有效运行模式。');
const config = {
mode: input.mode, baseUrl: String(input.baseUrl || '').trim(), model: String(input.model || '').trim(),
contextLimit: Math.trunc(Math.max(1000, Math.min(200000, Number(input.contextLimit) || 16000))),
...capacitySettings(input, store.config), capacityMode: capacityMode(input.capacityMode),
maxSteps: Math.trunc(Math.max(1, Math.min(30, Number(input.maxSteps) || 12))),
maxOutputTokens: Math.trunc(Math.max(256, Math.min(16000, Number(input.maxOutputTokens) || 2048))),
...validateModelWaitSettings(input, store.config),
maxRunDurationMs: Math.trunc(Math.max(1000, Math.min(3600000, Number(input.maxRunDurationMs) || store.config.maxRunDurationMs))),
maxRunTokens: Math.trunc(Math.max(1000, Math.min(2000000, Number(input.maxRunTokens) || store.config.maxRunTokens))),
+2 -2
View File
@@ -129,7 +129,7 @@ export function searchFiles(project, args) {
scope: '有数量/体积上限的文本搜索;无结果不表示所有文件都已搜索。' };
}
export function proposeFile(store, session, args, { patch = null, sourceBinding = null } = {}) {
export function proposeFile(store, session, args, { patch = null, sourceBinding = null, persist = true } = {}) {
assertWorkersResolved(store, session.projectId);
assertWorkerWriteScope(store, session, args.path);
assertMcpResolved(store, session.projectId);
@@ -159,7 +159,7 @@ export function proposeFile(store, session, args, { patch = null, sourceBinding
};
session.changes.push(change);
if (!['running', 'awaiting_approval', 'stopping'].includes(session.status)) session.status = 'needs_review';
store.save(session);
if (persist) store.save(session);
return { status: 'awaiting_review', change_id: change.id, path: change.path,
additions: change.additions, deletions: change.deletions, message: '提案已保存,项目文件尚未改变。等待用户查看差异并应用。' };
}
+5 -4
View File
@@ -12,6 +12,7 @@ import { ModelTransport } from '../core/models/transport.mjs';
import { localModelEstimate } from '../shared/contracts/model-reservation.mjs';
import { ERROR_CAPTURE_LIMIT, readErrorResponse, upstreamCapture } from '../core/models/upstream-error.mjs';
import { messagesAuthSettings } from '../shared/contracts/model-endpoint.mjs';
import { fileDraftToolDefinitions } from '../shared/contracts/file-draft-tools.mjs';
export const engineToolDefinitions = [
{ type: 'function', function: { name: 'inspect_engine_checks', description: '读取当前Task已经保存的外部引擎连接核验:真实安装版本、启动完成信号、SDK会话、进程关闭、原报告工件和能力限制。不会启动引擎或发送prompt;完整原记录通过已有read_artifact读取。', parameters: { type: 'object', properties: {}, additionalProperties: false } } },
@@ -50,6 +51,7 @@ export const toolDefinitions = [
offset: { type: 'integer', minimum: 0 }, limit: { type: 'integer', minimum: 1, maximum: 16000 }, expected_sha256: { type: 'string', pattern: '^[a-fA-F0-9]{64}$' } }, required: ['path'] } } },
{ type: 'function', function: { name: 'search_files', description: '在当前项目的文本文件中按字面内容检索。结果声明已搜索文件数与数量上限。',
parameters: { type: 'object', properties: { query: { type: 'string' }, case_sensitive: { type: 'boolean' } }, required: ['query'] } } },
...fileDraftToolDefinitions,
{ type: 'function', function: { name: 'propose_file', description: '提出一个文本文件的完整新内容。只产生待审查提案,不写入项目;由用户查看差异后应用。',
parameters: { type: 'object', properties: { path: { type: 'string' }, content: { type: 'string' }, reason: { type: 'string' }, base_sha256: { type: ['string', 'null'], description: '如已读取文件,可传入该文件的 SHA256 检查读取后变化;新文件为 null。' } }, required: ['path', 'content', 'reason'] } } },
{ type: 'function', function: { name: 'run_command', description: '请求在当前项目目录运行终端命令。命令会显示给用户,用户确认后才运行。命令有时间与输出限制。',
@@ -62,8 +64,7 @@ export const researchToolDefinitions = [
{ type: 'function', function: { name: 'read_research_evidence', description: '读取当前会话原完整REA Evidence的实际字段,校验工件、Bundle及Task来源。pointer使用JSON Pointer,默认/normalized_result;按返回available_fields选择下一级字段,offset/limit和next_offset读取预算分页。静态关系是候选,不能当成运行观测;不会再次调用REA。', parameters: { type: 'object', properties: { research_job_id: { type: 'string' }, pointer: { type: 'string', maxLength: 400 }, offset: { type: 'integer', minimum: 0 }, limit: { type: 'integer', minimum: 1, maximum: 16000 } }, required: ['research_job_id'] } } },
];
export function projectContext(project) {
const inventory = listFiles(project, '', 3, 160);
export function projectContext(project, { inventory = true } = {}) {
return [
'你是这个本地编程工作台的编程助手。用用户的语言沟通,以实际读取和工具结果为依据。',
'当前项目:' + project.name + '。所有文件路径相对于这个项目。',
@@ -72,6 +73,7 @@ export function projectContext(project) {
'工程任务先用inspect_project识别语言、脚本、规则与Git基线。plan_checks准备已识别npm或Python检查计划,run_checks请求用户确认后执行。Python支持python:test和python:compile,绑定unittest/pytest、实际解释器和源码;混合项目默认保留npm范围,明确选择Python名称才能执行。只凭回答不能声称检查通过。',
'修改较大的工程时,先用index_project/query_code定位符号、导入和文件,再用read_file按实际行读取必要内容。索引是静态证据,部分或无结果不代表完整工程;Python声明候选需读取核对。',
'已有文件优先用propose_patch和read_file返回的SHA256提出唯一锚点精确替换,保留未选中内容与格式;新文件可用propose_file。补丁锚点重叠/重复或文件变化时重新读取,不猜测写入位置。',
'单个文件大于本次输出额度时,用propose_file_chunk分多轮追加完整片段,核对draft_id/next_offset/draft_sha256;不要从头重复大文件。最后complete=true才生成可审查完整提案。未完成片段不能应用或交付,放弃用discard_file_draft保留原因。',
'已有文本文件满足当前目标时,完整分页读取后用verify_existing_files登记当前SHA和原read_call_ids,说明采用原因;跨Task须显式选择source_result_id。无需重写相同文件,不把旧成果冒充新写入;明确修改要求、测试和页面验收仍需各自真实证据。',
'跨文件修改的提案准备完整后,用prepare_change_set将本Task的change_id封存成整批审查。准备不表示应用;用户核对整个批次并确认,结果未知时先用工作台恢复入口核对,不重放文件写入。',
'复杂工程任务先了解实际范围,再用plan_task保存有限依赖步骤及真实通过条件;verify_task_step引用原工具调用、已应用批次或当前检查/页面job核验。不能删改原条件掩盖失败;inspect_task_plan核对未完成项,模型文字不代替步骤核验。简单问答无需新建工程计划。',
@@ -87,8 +89,7 @@ export function projectContext(project) {
'当前终端:' + executionEnvironment().shell + '。' + executionEnvironment().shellSyntax + ' 输入和输出使用 UTF-8。',
'任务中断后先核对当前状态,不假定缺少结果的工具已经成功。已有提案可等待用户审核,不要重复提出相同改动。',
'完成必要步骤后直接给出结果。不要无限继续调用工具。',
'当前文件清单(有数量上限):',
inventory.files.filter(file => file.kind === 'file').map(file => file.path).join('\n'),
...(inventory ? ['当前文件清单(有数量上限):', listFiles(project, '', 3, 160).files.filter(file => file.kind === 'file').map(file => file.path).join('\n')] : []),
].join('\n');
}
+22 -5
View File
@@ -9,9 +9,11 @@ import { spawn, execFile } from 'node:child_process';
import path from 'node:path';
import { randomUUID } from 'node:crypto';
import { sanitizeModelText } from '../core/models/upstream-error.mjs';
import { OUTPUT_TRUNCATED_HINT } from '../core/models/protocols.mjs';
import { StringDecoder } from 'node:string_decoder';
import { setImmediate as yieldExecution } from 'node:timers/promises';
import { safePath, listFiles, readLines, searchFiles, proposeFile, proposePatch } from './files.mjs';
import { proposeFileChunk, discardFileDraft, pendingFileDrafts } from '../core/workspaces/file-proposal-drafts.mjs';
import { projectContext, toolDefinitions, researchToolDefinitions, engineToolDefinitions, browserToolDefinitions } from './provider.mjs';
import { now, repairToolPairs } from './store.mjs';
import { executionEnvironment, sessionContext, sessionSnapshot } from './diagnostics.mjs';
@@ -82,6 +84,8 @@ labels.plan_task = '保存任务依赖计划';
labels.verify_task_step = '核验任务步骤原证据';
labels.inspect_task_plan = '核对任务计划与未完成项';
labels.verify_existing_files = '核对当前已有成果';
labels.propose_file_chunk = '组装长文件提案';
labels.discard_file_draft = '放弃未完成文件草稿';
labels.read_registered_skill = '读取已登记技能修订';
labels.call_registered_mcp = '请求调用已登记MCP工具';
@@ -122,6 +126,7 @@ export function validateToolArgs(tool, args) {
|| new Set(args.change_ids).size !== args.change_ids.length) throw new Error('变更集需要1到32个不同的提案ID。');
return;
}
if (['propose_file_chunk', 'discard_file_draft'].includes(tool)) return; // The draft contract validates its full input before changing state.
const required = ['diagnose_environment','plan_environment','inspect_session', 'inspect_project', 'index_project', 'plan_checks', 'plan_delivery', 'delivery_report'].includes(tool) ? [] : tool === 'read_artifact' ? ['artifact_id'] : tool === 'prepare_environment' ? ['plan_id','fingerprint'] : tool === 'run_checks' ? ['plan_id'] : tool === 'list_files' || tool === 'read_file' ? ['path'] : ['search_files', 'query_code'].includes(tool) ? ['query']
: tool === 'propose_patch' ? ['path', 'base_sha256', 'reason'] : tool === 'propose_file' ? ['path', 'content', 'reason'] : ['command', 'reason'];
for (const field of required) if (typeof args[field] !== 'string') throw new Error('工具参数 ' + field + ' 必须是文本。');
@@ -148,6 +153,7 @@ export class Runtime {
projectIndexer() { return this.codeIndex ??= new ProjectIndex({ cacheDirectory: path.join(this.store.directory, 'cache', 'project-index') }); }
fileResults() { return this.results ??= new FileResults(this.store); }
async fileDelivery(session) {
if (pendingFileDrafts(session).length) return { satisfied: false, stopReason: 'file_draft_incomplete', message: '仍有未完成的分段文件草稿;请继续组装完整提案或显式放弃,片段不能视为交付。' };
const task = this.store.owned('task', session.taskId, session.id), delivery = this.fileResults().completion(session);
if (!delivery.satisfied) return { ...delivery, stopReason: 'delivery_incomplete', message: delivery.requiresChange
? '当前要求包含修改,尚无对应追加要求之后的实际文件改动。已有成果核对不能代替修改。'
@@ -354,16 +360,21 @@ export class Runtime {
// Keep the complete goal once in this request view. The stored contract
// still contains its original goal for intent and evidence verification.
const { goal, ...contract } = taskContract(task);
const context = this.provider.redact(projectContext(run.project) + (run.worker ? '\n受限子任务执行契约(宿主权限,不可扩展):' + JSON.stringify({
const stablePrefix = config.historyPolicy === 'preserve';
const fixedRules = projectContext(run.project, { inventory: false });
const workerContract = run.worker ? '\n受限子任务执行契约(宿主权限,不可扩展):' + JSON.stringify({
parent_task_id: run.worker.parentTaskId, worker_id: run.worker.id, write_paths: run.worker.paths, budget: run.worker.budget,
rule: '只有范围内提案、审查应用和当前工程检查构成完成;不得请求任意终端、独立Git提交、外部工具或嵌套协作。',
}) : '') + '\n当前项目/会话/任务身份:' + JSON.stringify({
}) : '';
const fixedContext = fixedRules + workerContract;
const context = this.provider.redact((stablePrefix ? projectContext(run.project).slice(fixedRules.length) : projectContext(run.project) + workerContract) + '\n当前项目/会话/任务身份:' + JSON.stringify({
project_id: run.project.id, session_id: session.id, task_id: task.id, workspace: projectWorkspaceIdentity(run.project) }) + '\n当前Task文件提案状态:' + JSON.stringify(state)
+ '\n当前任务目标与全部追加要求(用户任务数据,完整保留):\n' + JSON.stringify({
goal, instructions: task.instructions.filter(instruction => instruction.source !== 'review-action'), constraints: task.constraints ?? [], acceptance: task.acceptance ?? [], contract,
}) + (run.record.purpose === 'diagnostic' ? '\n本次仅回答运行诊断问题,允许读取所属结果;不得修改文件、执行命令或将解释视为原任务交付。诊断问题:' + run.record.question
+ '\n所属原执行与失败(核对失败时保持未知,不根据其它项目补造原因):' + JSON.stringify(inspectDiagnosticContext(this.store, session, run.record)) : '')
+ '\n结果未知的调用,不得假定成功或重放:' + JSON.stringify(unknown)
+ (pendingFileDrafts(session).length ? '\n当前未完成分段草稿(未创建可应用提案):' + JSON.stringify(pendingFileDrafts(session).map(row => ({ draft_id: row.id, path: row.path, next_offset: row.characters, draft_sha256: row.sha256 }))) : '')
+ (deliveryProgress ? '\n当前工程执行依据(每次请求重新核对,非操作授权):\n' + JSON.stringify(deliveryProgress) : '')
+ (requirementReview ? '\n用户逐项要求复核(任务数据,不授权额外操作;证据和用户确认分别记录):\n' + JSON.stringify({
revision: requirementReview.revision, status: requirementReview.status, unreviewed_sources: requirementReview.unreviewed_sources,
@@ -392,7 +403,7 @@ export class Runtime {
const tools = availableTools.filter(tool => (!run.worker || WORKER_TOOLS.has(tool.function.name)) && taskToolAllowed(task, run.record, tool.function.name));
const projectMemory = await this.memoryManager().context(session, { redact: value => this.provider.redact(value) });
signal.throwIfAborted();
const planned = this.requestPlanner().prepare(session, run.record, config, { system: context, tools, stepId: stepRecord.id, projectMemory, skillCatalog, mcpCatalog,
const planned = this.requestPlanner().prepare(session, run.record, config, { system: stablePrefix ? this.provider.redact(fixedContext) : context, contextTail: stablePrefix ? context : null, tools, stepId: stepRecord.id, projectMemory, skillCatalog, mcpCatalog,
transportReservationTokens:run.worker?.engine?ENGINE_SEED_RESERVATION:0,engineStepOnly:!!run.worker?.engine });
if (planned.record.archivedGroups && !projectionLogged) {
projectionLogged = true; session.compactions++;
@@ -486,7 +497,7 @@ export class Runtime {
run.record.outputTruncationRecoveries = (run.record.outputTruncationRecoveries ?? 0) + 1;
if (run.record.outputTruncationRecoveries <= OUTPUT_TRUNCATION_RECOVERY_LIMIT) {
this.store.finishStep(session, stepRecord);
const note = '上一次响应在达到单次输出上限前被截断(finish_reason=length),其中的工具调用整体未执行(即使某个工具参数已完整也未应用,避免落地被截断的半成品)。请把这次改动拆小:每次响应只提交一个文件的 propose_file/propose_patch,或分多轮 prepare_change_set,不要在一个响应里堆叠多个大参数工具。原目标和已读依据都保留。';
const note = OUTPUT_TRUNCATED_HINT;
// The truncated assistant turn was never appended, so the conversation
// stays valid. Feed the instruction to the model as a standalone turn
// in the provider history, and mirror it to the visible chat log.
@@ -533,6 +544,10 @@ export class Runtime {
this.store.finishStep(session, stepRecord);
session.status = session.changes.some(change => ['pending', 'conflict'].includes(change.status)) ? 'needs_review' : 'completed';
if (run.record.purpose === 'diagnostic') { session.status = 'completed'; run.stopReason = 'diagnostic_answered'; }
else if (pendingFileDrafts(session).length) {
session.status = 'paused'; run.stopReason = 'file_draft_incomplete';
this.store.message(session, 'system', '仍有未完成的分段文件草稿,片段不能作为完整交付;原片段和续接位置已保存。');
}
else if (session.status === 'completed' && taskContract(task).kind === 'file') {
const delivery = await this.fileDelivery(session);
if (!delivery.satisfied) {
@@ -851,13 +866,15 @@ export class Runtime {
}
else if (tool === 'search_files') result = searchFiles(run.project, args);
else if (tool === 'propose_file') result = proposeFile(this.store, session, args);
else if (tool === 'propose_file_chunk') result = proposeFileChunk(this.store, session, args);
else if (tool === 'discard_file_draft') result = discardFileDraft(this.store, session, args);
else if (tool === 'propose_patch') result = proposePatch(this.store, session, args);
else if (tool === 'run_command') result = await this.requestCommand(session, event, args, run);
else throw new Error('当前能力表没有工具:' + tool);
if (proofHint) result.tool_invocation_id = event.invocationId;
event.phase = ['denied', 'interrupted', 'unknown', 'unverified', 'stale'].includes(result.status) ? result.status : ['failed', 'error'].includes(result.status) ? 'failed' : 'completed';
if (tool === 'inspect_session') recordSessionInspection(this.store.core.task.get(run.taskId), result);
else if (['propose_file', 'propose_patch', 'verify_task_step'].includes(tool)) {
else if (['propose_file', 'propose_patch', 'propose_file_chunk', 'discard_file_draft', 'verify_task_step'].includes(tool)) {
const task=this.store.core.task.get(run.taskId);
if(result.status==='unchanged'||result.reused===true){
result.unchanged_action_count=recordUnchangedAction(task,tool,result,run.id);