feat: connect controlled engines to owned Tasks, approvals and budget ledger
This commit is contained in:
@@ -0,0 +1,113 @@
|
||||
import { engineError, engineCanonicalDigest as controlledDigest } from './engines.mjs';
|
||||
import { requestMetrics } from './model-request.mjs';
|
||||
|
||||
export const ENGINE_RUN_ACTIVE = new Set(['queued', 'starting', 'initializing', 'running', 'waiting_tool', 'closing', 'stopping']);
|
||||
export function selectedEngineInput(input) {
|
||||
if (!input || typeof input !== 'object' || Array.isArray(input)
|
||||
|| Object.keys(input).some(key => !['id', 'root', 'controlledSha256'].includes(key))
|
||||
|| input.id !== 'deepseek-harness' || typeof input.root !== 'string'
|
||||
|| !/^[a-f0-9]{64}$/.test(input.controlledSha256 ?? '')) throw engineError('请选择已经检测并封存身份的受控DeepSeek引擎。', 400);
|
||||
return structuredClone(input);
|
||||
}
|
||||
|
||||
export function engineRunInput(job) {
|
||||
return { schemaVersion: 1, id: job.id, sessionId: job.sessionId, projectId: job.projectId, taskId: job.taskId, runId: job.runId,
|
||||
workerId: job.workerId, collaborationId: job.collaborationId, installation: job.installation, sdkSessionId: job.sdkSessionId,
|
||||
directory: job.directory, model: job.model, budget: job.budget, tools: job.tools,
|
||||
sourceContextPlanId: job.sourceContextPlanId, sourceRequestSha256: job.sourceRequestSha256 };
|
||||
}
|
||||
export function engineRunReport(job) {
|
||||
return { schemaVersion: 1, owner: { sessionId: job.sessionId, projectId: job.projectId, taskId: job.taskId, runId: job.runId, jobId: job.id },
|
||||
inputSha256: job.inputSha256, installationSha256: job.installation.controlledSha256, sdkSessionId: job.sdkSessionId,
|
||||
outcome: job.originalOutcome, native: job.native, requests: job.requests, calls: job.calls };
|
||||
}
|
||||
export function publicEngineRun(job) {
|
||||
const { native, requests, calls, ...view } = job;
|
||||
return { ...view, nativeSummary: { status: native?.status ?? null, pid: native?.process?.pid ?? job.pid ?? null,
|
||||
rootExited: native?.cleanup?.rootExited ?? null, treeConfirmed: native?.cleanup?.treeConfirmed ?? null,
|
||||
receipt: native?.receipt ?? null, notifications: native?.notifications?.length ?? job.notificationCount ?? 0 },
|
||||
modelRequests: requests?.length ?? 0, toolRequests: calls?.length ?? 0 };
|
||||
}
|
||||
export function verifyEngineInput(store, session, job) {
|
||||
store.owned('engine_run', job.id, session.id);
|
||||
const input = store.owned('artifact', job.inputArtifactId, session.id);
|
||||
if (input.kind !== 'engine-run-input' || input.taskId !== job.taskId || input.runId !== job.runId || input.sha256 !== job.inputSha256
|
||||
|| store.artifactStore.read(input) !== JSON.stringify(engineRunInput(job))) throw engineError('受控引擎与原任务/范围/程序输入不一致。');
|
||||
return input;
|
||||
}
|
||||
export function originalEngineRun(store, session, job) {
|
||||
verifyEngineInput(store, session, job);
|
||||
const artifact = store.owned('artifact', job.reportArtifactId, session.id);
|
||||
if (artifact.kind !== 'engine-run-report' || artifact.taskId !== job.taskId || artifact.runId !== job.runId || artifact.sha256 !== job.reportSha256) {
|
||||
throw engineError('受控引擎原报告身份无效。');
|
||||
}
|
||||
const bytes = store.artifactStore.read(artifact);
|
||||
if (bytes !== JSON.stringify(engineRunReport(job))) throw engineError('受控引擎原报告与当前账本不一致。');
|
||||
return bytes;
|
||||
}
|
||||
export function verifyEngineModelInput(store, session, job, request) {
|
||||
const artifact = store.owned('artifact', request.inputArtifactId, session.id);
|
||||
if (artifact.kind !== 'engine-model-input' || artifact.taskId !== job.taskId || artifact.runId !== job.runId || artifact.sha256 !== request.inputSha256) throw engineError('原引擎模型输入工件归属无效。');
|
||||
const input = JSON.parse(store.artifactStore.read(artifact)), metrics = requestMetrics(input.body);
|
||||
for (const key of ['id', 'bridgeTraceId', 'sourceSha256', 'requestSha256', 'requestBytes', 'estimatedInputTokens', 'reservedPerAttempt', 'maxAttempts']) {
|
||||
if (input.plan[key] !== request[key]) throw engineError('原引擎模型请求或尝试预算与封存输入不一致。');
|
||||
}
|
||||
if (input.owner.sessionId !== job.sessionId || input.owner.taskId !== job.taskId || input.owner.runId !== job.runId || input.owner.projectId !== job.projectId
|
||||
|| controlledDigest(input.native) !== request.sourceSha256 || metrics.sha256 !== request.requestSha256 || metrics.bytes !== request.requestBytes
|
||||
|| !Number.isSafeInteger(request.maxAttempts) || request.maxAttempts < 1 || request.maxAttempts > 8
|
||||
|| request.reservedPerAttempt !== metrics.estimatedInputTokens + 128 + input.body.max_tokens) throw engineError('原引擎模型输入、归属或预算核对失败。');
|
||||
return input;
|
||||
}
|
||||
export function assertEngineWorkerResult(store, session, worker) {
|
||||
if (!worker.engine) return;
|
||||
const job = [...store.core.engine_run.values()].findLast(value => value.sessionId === session.id && value.runId === worker.currentRunId);
|
||||
if (!job || job.status !== 'completed' || job.requiresVerification || !job.verified
|
||||
|| job.installation.controlledSha256 !== worker.engine.controlledSha256) throw engineError('原引擎运行缺少完整协议、停止和账本依据。');
|
||||
originalEngineRun(store, session, job);
|
||||
if (job.calls.some(call => call.status !== 'returned' || !call.invocationId)
|
||||
|| job.requests.some(request => request.status !== 'completed')) throw engineError('引擎原调用或模型请求尚未完整核对。');
|
||||
for (const call of job.calls) {
|
||||
const tool = store.owned('tool', call.invocationId, session.id), result = store.savedToolResult(session.id, call.callId);
|
||||
if (tool.runId !== job.runId || tool.callId !== call.callId || tool.requiresVerification || controlledDigest(result) !== call.resultSha256) {
|
||||
throw engineError('引擎原工具结果与自有执行账本不一致。');
|
||||
}
|
||||
const artifact = store.owned('artifact', call.outputArtifactId, session.id);
|
||||
if (artifact.kind !== 'engine-tool-output' || artifact.taskId !== job.taskId || artifact.runId !== job.runId || artifact.sha256 !== call.outputSha256
|
||||
|| store.artifactStore.read(artifact) !== JSON.stringify(result)) throw engineError('反馈给原引擎的工具结果工件不一致。');
|
||||
}
|
||||
for (const request of job.requests) {
|
||||
verifyEngineModelInput(store, session, job, request);
|
||||
const artifact = store.owned('artifact', request.responseArtifactId, session.id);
|
||||
if (artifact.kind !== 'engine-model-output' || artifact.taskId !== job.taskId || artifact.runId !== job.runId || artifact.sha256 !== request.responseSha256
|
||||
|| !JSON.parse(store.artifactStore.read(artifact)).message || request.accountedAttempts !== request.actualAttemptsFinal) throw engineError('原引擎模型输出或尝试账本未完整核对。');
|
||||
}
|
||||
}
|
||||
|
||||
export function nativeMessagesToChat(input) {
|
||||
if (!input || !Array.isArray(input.messages)) throw engineError('原引擎模型输入没有消息数组。');
|
||||
const messages = input.messages.map(message => {
|
||||
if (!message || !['system', 'developer', 'user', 'assistant', 'tool'].includes(message.role) || !Array.isArray(message.content)) {
|
||||
throw engineError('原引擎消息不符合已验证的文本协议。');
|
||||
}
|
||||
const text = [], calls = [];
|
||||
for (const block of message.content) {
|
||||
if (block?.type === 'text' && typeof block.text === 'string') text.push(block.text);
|
||||
else if (block?.type === 'reasoning' && typeof block.text === 'string') {
|
||||
// Reasoning is not promoted into user-visible text or a tool request.
|
||||
} else if (block?.type === 'tool-call' && message.role === 'assistant' && typeof block.id === 'string'
|
||||
&& typeof block.name === 'string' && typeof block.arguments === 'string') {
|
||||
JSON.parse(block.arguments); calls.push({ id: block.id, type: 'function', function: { name: block.name, arguments: block.arguments } });
|
||||
} else throw engineError('当前受控桥只接入文本和完整工具调用,原内容类型尚未验证。');
|
||||
}
|
||||
if (message.role === 'tool') {
|
||||
if (typeof message.toolCallId !== 'string' || !message.toolCallId) throw engineError('原工具消息缺少toolCallId。');
|
||||
return { role: 'tool', tool_call_id: message.toolCallId, content: text.join('') };
|
||||
}
|
||||
return { role: message.role, content: text.join(''), ...(calls.length ? { tool_calls: calls } : {}) };
|
||||
});
|
||||
if (input.system !== null && input.system !== undefined) {
|
||||
if (typeof input.system !== 'string') throw engineError('原单次系统提示格式无效。');
|
||||
messages.unshift({ role: 'system', content: input.system });
|
||||
}
|
||||
return messages;
|
||||
}
|
||||
@@ -10,6 +10,9 @@ export const ENGINE_LIMITS = Object.freeze([
|
||||
]);
|
||||
export const engineError = (message, status = 409, code = 'ENGINE_CONTRACT') => Object.assign(new Error(message), { status, code });
|
||||
export const engineDigest = value => createHash('sha256').update(typeof value === 'string' ? value : JSON.stringify(value), 'utf8').digest('hex');
|
||||
const canonical = value => Array.isArray(value) ? value.map(canonical) : value && typeof value === 'object'
|
||||
? Object.fromEntries(Object.keys(value).sort().map(key => [key, canonical(value[key])])) : value;
|
||||
export const engineCanonicalDigest = value => engineDigest(canonical(value));
|
||||
|
||||
export function engineInput(job) {
|
||||
return { schemaVersion: 1, jobId: job.id, sessionId: job.sessionId, projectId: job.projectId,
|
||||
|
||||
@@ -2,7 +2,7 @@ import { randomUUID } from 'node:crypto';
|
||||
|
||||
export const EXECUTION_SCHEMA = 1;
|
||||
export const ACTIVE_STATES = new Set(['running', 'awaiting_approval', 'stopping']);
|
||||
export const CORE_KINDS = ['task', 'run', 'step', 'tool', 'artifact', 'check_plan', 'check_job', 'delivery_plan', 'delivery_job', 'change_set', 'context_plan', 'workspace', 'research_target', 'research_job', 'engine_job', 'browser_plan', 'browser_job', 'task_plan', 'task_proof', 'memory', 'task_checkpoint', 'mcp_job', 'collaboration', 'worker'];
|
||||
export const CORE_KINDS = ['task', 'run', 'step', 'tool', 'artifact', 'check_plan', 'check_job', 'delivery_plan', 'delivery_job', 'change_set', 'context_plan', 'workspace', 'research_target', 'research_job', 'engine_job', 'engine_run', 'browser_plan', 'browser_job', 'task_plan', 'task_proof', 'memory', 'task_checkpoint', 'mcp_job', 'collaboration', 'worker'];
|
||||
export const timestamp = () => new Date().toISOString();
|
||||
export const isId = value => typeof value === 'string' && /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i.test(value);
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { createHash } from 'node:crypto';
|
||||
import { isId, accountedTokens, emptyUsage } from './execution.mjs';
|
||||
import { selectedEngineInput } from './engine-execution.mjs';
|
||||
|
||||
export const WORKER_TOOLS = new Set(['inspect_session', 'inspect_project', 'index_project', 'query_code', 'read_artifact',
|
||||
'list_files', 'read_file', 'search_files', 'propose_file', 'propose_patch', 'prepare_change_set', 'plan_checks', 'run_checks']);
|
||||
@@ -29,8 +30,9 @@ const text = (value, maximum, label) => {
|
||||
};
|
||||
|
||||
export function collaborationInput(input, config) {
|
||||
if (!input || Array.isArray(input) || Object.keys(input).some(key => !['goal', 'budget', 'children'].includes(key))) throw workerConflict('协作只接受父目标、预算和两个子任务。');
|
||||
if (!Array.isArray(input.children) || input.children.length !== 2) throw workerConflict('本阶段需要两个受限子任务。');
|
||||
if (!input || Array.isArray(input) || Object.keys(input).some(key => !['goal', 'budget', 'children', 'engine'].includes(key))) throw workerConflict('协作只接受父目标、预算、子任务和已检测的引擎。');
|
||||
const engine = input.engine === undefined ? null : selectedEngineInput(input.engine);
|
||||
if (!Array.isArray(input.children) || input.children.length !== (engine ? 1 : 2)) throw workerConflict(engine ? '受控引擎计划需要一个所属子工程。' : '本阶段需要两个受限子任务。');
|
||||
const raw = input.budget ?? {};
|
||||
if (!raw || typeof raw !== 'object' || Array.isArray(raw) || Object.keys(raw).some(key => !['maxTokens', 'maxSteps', 'maxToolCalls', 'maxDurationMs'].includes(key))) throw workerConflict('协作预算字段无效。');
|
||||
const tokenMaximum = Math.min(config.maxTaskTokens ?? 1000000, config.maxRunTokens ?? 200000);
|
||||
@@ -47,12 +49,12 @@ export function collaborationInput(input, config) {
|
||||
if (new Set(paths.map(workerPathKey)).size !== paths.length) throw workerConflict('子任务范围不能重复。');
|
||||
const part = item.budget ?? {};
|
||||
if (!part || Array.isArray(part) || Object.keys(part).some(key => !['maxTokens', 'maxSteps', 'maxToolCalls'].includes(key))) throw workerConflict('子预算字段无效。');
|
||||
const allocate = key => index === 0 ? Math.floor(budget[key] / 2) : budget[key] - Math.floor(budget[key] / 2);
|
||||
const allocate = key => engine ? budget[key] : index === 0 ? Math.floor(budget[key] / 2) : budget[key] - Math.floor(budget[key] / 2);
|
||||
return { label: text(item.label, 64, '子任务名称'), goal: text(item.goal, 8000, '子目标'), paths,
|
||||
budget: Object.fromEntries(['maxTokens', 'maxSteps', 'maxToolCalls'].map(key => [key, bounded(part[key], allocate(key), key === 'maxTokens' ? 500 : 1, budget[key], key)])) };
|
||||
});
|
||||
for (const key of ['maxTokens', 'maxSteps', 'maxToolCalls']) if (children.reduce((sum, child) => sum + child.budget[key], 0) > budget[key]) throw workerConflict('子任务预算之和不能超过父预算:' + key);
|
||||
return { goal: text(input.goal, 20000, '父目标'), budget, children };
|
||||
return { goal: text(input.goal, 20000, '父目标'), budget, children, ...(engine ? { engine } : {}) };
|
||||
}
|
||||
|
||||
export function collaborationSeal(group) {
|
||||
@@ -64,7 +66,8 @@ export function workerSeal(worker) {
|
||||
parentSessionId: worker.parentSessionId, parentTaskId: worker.parentTaskId, parentRunId: worker.parentRunId,
|
||||
projectId: worker.projectId, sessionId: worker.sessionId, taskId: worker.taskId, workspaceId: worker.workspaceId,
|
||||
label: worker.label, goal: worker.goal, paths: worker.paths, budget: worker.budget, model: worker.model, baseCommit: worker.baseCommit,
|
||||
baselineArtifactId: worker.baselineArtifactId, baselineSha256: worker.baselineSha256, baselineRunId: worker.baselineRunId };
|
||||
baselineArtifactId: worker.baselineArtifactId, baselineSha256: worker.baselineSha256, baselineRunId: worker.baselineRunId,
|
||||
...(worker.engine ? { engine: worker.engine } : {}) };
|
||||
}
|
||||
export function workerForProject(store, projectId) {
|
||||
return [...(store.core.worker?.values() ?? [])].find(value => value.projectId === projectId) ?? null;
|
||||
@@ -79,7 +82,8 @@ export function workerForSession(store, session) {
|
||||
|| definition.taskId !== worker.taskId || definition.projectId !== worker.projectId || definition.sessionId !== worker.sessionId
|
||||
|| definition.workspaceId !== worker.workspaceId || JSON.stringify(definition.paths) !== JSON.stringify(worker.paths)
|
||||
|| JSON.stringify(definition.budget) !== JSON.stringify(worker.budget) || definition.goal !== worker.goal
|
||||
|| JSON.stringify(group.model) !== JSON.stringify(worker.model)) throw workerConflict('子任务与父任务的封存分工不一致。');
|
||||
|| JSON.stringify(group.model) !== JSON.stringify(worker.model)
|
||||
|| JSON.stringify(definition.engine) !== JSON.stringify(worker.engine)) throw workerConflict('子任务与父任务的封存分工不一致。');
|
||||
const task = store.core.task.get(worker.taskId);
|
||||
if (!task || task.goal !== worker.goal || task.workerId !== worker.id || task.budget.maxTokens !== worker.budget.maxTokens) throw workerConflict('子任务目标、身份或累计预算已变化。');
|
||||
const original = store.owned('artifact', worker.contractArtifactId, session.id);
|
||||
|
||||
Reference in New Issue
Block a user