fix: preserve task intent across diagnostics and review continuation

This commit is contained in:
Agent Workbench Dev
2026-11-01 13:03:20 +08:00
parent 16f89838dd
commit 0736eca4cd
11 changed files with 213 additions and 17 deletions
+5 -1
View File
@@ -1,4 +1,5 @@
import { randomUUID } from 'node:crypto';
import { taskContract } from './task-control.mjs';
export const EXECUTION_SCHEMA = 1;
export const ACTIVE_STATES = new Set(['running', 'awaiting_approval', 'stopping']);
@@ -49,13 +50,16 @@ export const accountedTokens = usage => (usage?.totalTokens ?? 0) + (usage?.esti
export function createTask(session, goal, config, previousTaskId = null) {
const at = timestamp();
return {
const task = {
schemaVersion: EXECUTION_SCHEMA, id: randomUUID(), sessionId: session.id, projectId: session.projectId,
goal: String(goal), instructions: [], constraints: [], acceptance: [], status: 'idle',
previousTaskId, createdAt: at, updatedAt: at, activeRunId: null,
usage: emptyUsage(), budget: { maxTokens: executionBudget(config).maxTaskTokens },
verification: { status: 'not_configured', checkJobId: null }, origin: 'workbench',
};
task.contract = taskContract(task);
if (task.contract.checks === 'skip') task.constraints.push('用户明确要求无需测试;不得自动扩大为工程测试任务。');
return task;
}
export function createRun(session, task, config, resumeOf = null) {
+58
View File
@@ -0,0 +1,58 @@
// Task intent is retained independently of short follow-ups and system actions.
export const isContinuation = content => /^(?:请)?(?:继续(?:完成|执行|开发|原任务|这个任务)?|接着(?:完成|执行)?|continue(?:\s+(?:the\s+)?(?:task|work))?)[。.!!\s]*$/i.test(String(content).trim());
export function isDiagnosticQuestion(content) {
const text = String(content).trim();
if (/(?:请|帮我|继续|需要|先).{0,12}(?:修复|修改|实现|开发|执行|重跑)|\b(?:fix|implement|change|rerun)\b/i.test(text)) return false;
return /(?:怎么回事|什么原因|为什么.{0,30}(?:报错|失败|错误)|(?:前面|刚才|这个).{0,15}(?:错误|报错|失败).{0,15}(?:解释|原因|情况))|\b(?:what (?:went wrong|happened)|why did .{0,40}fail)\b/i.test(text);
}
export function taskContract(task, lookup = () => null) {
if (task.contract?.schemaVersion === 1) return task.contract;
let original = task;
const seen = new Set();
while (isContinuation(original.goal) && original.previousTaskId && !seen.has(original.id)) {
seen.add(original.id);
const previous = lookup(original.previousTaskId);
if (!previous || previous.sessionId !== task.sessionId || previous.projectId !== task.projectId) break;
original = previous;
}
const goal = original.contract?.goal ?? original.goal;
const skip = /无需(?:任何)?测试|不(?:需要|用|要)(?:进行|做|运行)?测试|\b(?:no tests?(?: needed|required)?|without (?:running )?tests?)\b/i.test(goal);
const required = !skip && /(?:运行|执行|通过|修复|补充|添加).{0,12}(?:测试|工程检查)|\b(?:run|pass|fix|add)\b.{0,24}\b(?:tests?|checks?)\b/i.test(goal);
return { schemaVersion: 1, goal, checks: skip ? 'skip' : required ? 'required' : 'unspecified',
...(original.id !== task.id ? { inheritedFromTaskId: original.id } : {}) };
}
export function updateTaskContract(task, instruction) {
const current = taskContract(task);
// Only an explicit new user instruction changes the check policy.
if (/无需(?:任何)?测试|不(?:需要|用|要)(?:进行|做|运行)?测试|\b(?:no tests?|without (?:running )?tests?)\b/i.test(instruction)) current.checks = 'skip';
else if (/(?:运行|执行|通过|修复|补充|添加).{0,12}(?:测试|工程检查)|\b(?:run|pass|fix|add)\b.{0,24}\b(?:tests?|checks?)\b/i.test(instruction)) current.checks = 'required';
task.contract = current;
task.constraints = (task.constraints ?? []).filter(value => value !== '用户明确要求无需测试;不得自动扩大为工程测试任务。');
if (current.checks === 'skip') task.constraints.push('用户明确要求无需测试;不得自动扩大为工程测试任务。');
}
export const DIAGNOSTIC_TOOLS = new Set(['inspect_session', 'inspect_project', 'list_files', 'read_file', 'search_files', 'read_artifact', 'inspect_task_plan', 'read_browser_result', 'read_registered_skill']);
export const AUTOMATIC_CHECK_TOOLS = new Set(['plan_checks', 'run_checks', 'plan_browser', 'run_browser']);
export function taskToolAllowed(task, run, tool, args = {}) {
if (run.purpose === 'diagnostic') return DIAGNOSTIC_TOOLS.has(tool);
if (taskContract(task).checks !== 'skip') return true;
if (AUTOMATIC_CHECK_TOOLS.has(tool)) return false;
return tool !== 'run_command' || !/(?:\b(?:test|pytest|vitest|jest|mocha|playwright)\b|--test\b)/i.test(args.command ?? '');
}
export function settleAppliedTask(store, session) {
const task = store.core.task.get(session.taskId);
if (!task || session.changes.some(change => ['pending', 'conflict'].includes(change.status))) return;
const applied = session.changes.filter(change => change.status === 'applied' && (!change.taskId || change.taskId === task.id));
if (!applied.length) return;
const contract = taskContract(task, id => store.core.task.get(id));
task.delivery = { status: 'files_applied', paths: applied.map(change => change.path), at: new Date().toISOString(),
checks: contract.checks === 'skip' ? 'not_requested' : task.verification?.status ?? 'not_configured' };
session.status = contract.checks === 'required' || task.currentTaskPlanId || ['failed', 'stale', 'unknown', 'unverified'].includes(task.verification?.status) && contract.checks !== 'skip'
? 'paused' : 'completed';
if (contract.checks === 'skip') store.message(session, 'system', '文件已审查并应用:' + task.delivery.paths.join('、') + '。按照原要求未运行测试,可在文件列表打开结果。');
}