agents-relay 2.0.208 → 2.0.210
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapters.js +2 -1
- package/dist/agent-shortcut.js +113 -41
- package/dist/browser-worker-runtime.js +7 -2
- package/dist/chatgpt-platform-fallback.js +30 -0
- package/dist/cli-help.js +10 -4
- package/dist/cli-prompt.js +2 -1
- package/dist/cli-revision.js +49 -0
- package/dist/cli-shortcut-local.js +49 -0
- package/dist/cli-shortcut.js +81 -19
- package/dist/cli-worker-task.js +15 -0
- package/dist/cli.js +19 -5
- package/dist/dashboard-html.js +2 -2
- package/dist/dependency-revision-execution.js +152 -0
- package/dist/dependency-validity.js +17 -0
- package/dist/final-review-role.js +17 -0
- package/dist/force-restate-validation.js +6 -3
- package/dist/job-execution-slot.js +4 -1
- package/dist/job-pr-number-migration.js +2 -1
- package/dist/managed-worker-input.js +2 -1
- package/dist/model-routing.js +8 -0
- package/dist/planner-agent-roles.js +18 -0
- package/dist/planner-runtime.js +7 -1
- package/dist/planner-task-ids.js +1 -0
- package/dist/planner.js +11 -6
- package/dist/reconciler-review.js +110 -109
- package/dist/reconciler-runtime.js +56 -58
- package/dist/reconciler.js +33 -13
- package/dist/relay-job-snapshot-reads.js +5 -2
- package/dist/relay-store.js +2 -0
- package/dist/relay-workflow-operations.js +1 -1
- package/dist/relayd-control.js +31 -0
- package/dist/review-evidence.js +44 -0
- package/dist/review-generation-fence.js +2 -1
- package/dist/review-revision-execution.js +86 -0
- package/dist/review-revision-merge.js +15 -0
- package/dist/review-revision-model.js +191 -0
- package/dist/review-revision-policy.js +49 -0
- package/dist/review-revision-settlement.js +54 -0
- package/dist/review-revision-stale.js +57 -0
- package/dist/reviewer-thread.js +41 -1
- package/dist/runtime-status.js +24 -8
- package/dist/shortcut-node-worker.js +128 -0
- package/dist/shortcut-stage-contract.js +50 -0
- package/dist/shortcut-worker-runner.js +73 -0
- package/dist/single-job-task-control.js +1 -1
- package/dist/task-actions.js +4 -13
- package/dist/task-context.js +3 -2
- package/dist/task-inactivity-watchdog.js +7 -0
- package/dist/terminal-event-recovery.js +13 -0
- package/dist/worker-failure-recovery.js +90 -0
- package/dist/workflow/contracts.js +4 -0
- package/dist/workflow/definitions-v2.js +2 -0
- package/dist/workflow/dependency-revision-v2.js +16 -0
- package/dist/workflow/entity-creation.js +2 -0
- package/dist/workflow/review-v2.js +6 -2
- package/dist/workflow/revision-v2.js +32 -0
- package/dist/workflow/runtime.js +30 -0
- package/dist/workflow/task-reconcile.js +3 -0
- package/dist/workflow/task-resolution.js +1 -4
- package/package.json +4 -3
- package/skills/agents-relay/agents/job-acceptance-reviewer.agent.md +41 -0
- package/skills/agents-relay/agents/planner.agent.md +18 -5
- package/skills/agents-relay/agents/reviewer.agent.md +2 -0
- package/skills/agents-relay/contracts/event-contract.md +7 -0
- package/skills/agents-relay/contracts/orchestrator-workflows.md +6 -0
- package/skills/agents-relay/contracts/task-job-contract.md +10 -0
- package/workflow/dependency-revision.mmd +30 -0
- package/workflow/force-restate-validation.mmd +1 -1
- package/workflow/review-lifecycle.mmd +41 -10
- package/workflow/revision-lifecycle.mmd +68 -0
- package/workflow/task-lifecycle.mmd +13 -12
- package/workflow/task-resolution.mmd +1 -6
package/dist/cli-shortcut.js
CHANGED
|
@@ -1,16 +1,37 @@
|
|
|
1
1
|
import { join } from 'node:path';
|
|
2
2
|
import { readFile } from 'node:fs/promises';
|
|
3
|
-
import { recordShortcutReceipt, runAgentShortcut, shortcutResumeEvent } from './agent-shortcut.js';
|
|
3
|
+
import { missingShortcutNodes, recordShortcutReceipt, runAgentShortcut, shortcutResumeEvent } from './agent-shortcut.js';
|
|
4
4
|
import { parseAgentGraph } from './agent-graph.js';
|
|
5
|
+
import { tryTransitionTaskEvent } from './task-transitions.js';
|
|
6
|
+
import { dispatchJobLifecycleSync } from './workflow/lifecycle.js';
|
|
7
|
+
import { runShortcutModelNode } from './shortcut-node-worker.js';
|
|
5
8
|
import { noGitHubMode } from './no-github.js';
|
|
6
|
-
import { dispatchTaskAction } from './task-actions.js';
|
|
7
9
|
import { resolveManagedProjectPath, resolveRepositoryProjectPath, resolveWorkspaceRoot } from './workspace.js';
|
|
8
10
|
import { arg, hasArg, integerArg, publishWake, saveLocal, storeFor, textOption, withEventBus } from './cli-support.js';
|
|
9
11
|
function assertSqliteShortcutArgs(args) {
|
|
10
12
|
if (args.some(value => value === '--file' || value.startsWith('--file=')))
|
|
11
13
|
throw new Error('Shortcut commands require the authoritative SQLite Relay store; --file is unsupported');
|
|
12
14
|
}
|
|
13
|
-
|
|
15
|
+
/** Apply the canonical Job Graph activate edge before the first direct run.
|
|
16
|
+
* The Job is created DRAFT so creation alone cannot launch any work. */
|
|
17
|
+
export async function activateShortcutJobForDirectRun(store, jobId) {
|
|
18
|
+
if (!store.mutateJob)
|
|
19
|
+
throw new Error('Shortcut activation requires atomic SQLite Job mutation');
|
|
20
|
+
await store.mutateJob(jobId, current => {
|
|
21
|
+
if (current.executionMode !== 'shortcut' || current.contentOnly !== true)
|
|
22
|
+
throw new Error('Only a content-only Shortcut Job may be activated by direct run');
|
|
23
|
+
if (current.state === 'DRAFT') {
|
|
24
|
+
const decision = dispatchJobLifecycleSync(current, 'activate');
|
|
25
|
+
if (!decision.accepted || decision.target !== 'ACTIVE')
|
|
26
|
+
throw new Error('Job Lifecycle graph rejected shortcut activation');
|
|
27
|
+
}
|
|
28
|
+
else if (current.state !== 'ACTIVE') {
|
|
29
|
+
throw new Error(`Shortcut Job ${jobId} is not runnable (${current.state})`);
|
|
30
|
+
}
|
|
31
|
+
return current;
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
export async function runShortcutJobCommand(args, id, repo, makeRunner) {
|
|
14
35
|
assertSqliteShortcutArgs(args);
|
|
15
36
|
if (arg(args, '--mode') !== 'shortcut')
|
|
16
37
|
throw new Error('job run requires --mode shortcut');
|
|
@@ -26,11 +47,20 @@ export async function runShortcutJobCommand(args, id, repo) {
|
|
|
26
47
|
let task = job.tasks.find(item => item.id === taskId);
|
|
27
48
|
if (!task)
|
|
28
49
|
throw new Error(`Task ${taskId} not found`);
|
|
29
|
-
if (
|
|
30
|
-
|
|
31
|
-
throw new Error('Task is durably routed to the original Worker; let the Reconciler dispatch it instead of running shortcut mode');
|
|
50
|
+
if (hasArg(args, '--event-json'))
|
|
51
|
+
shortcutResumeEvent(arg(args, '--event-json'));
|
|
32
52
|
if (!task.agentGraph && !hasArg(args, '--agent-graph-file'))
|
|
33
53
|
throw new Error(`Task ${taskId} has no Agent Graph; set it on the Task or pass --agent-graph-file`);
|
|
54
|
+
let resumeReceiptSelected = false;
|
|
55
|
+
if (task.state === 'RUNNING' && task.leaseOwner === null && task.executionId !== null) {
|
|
56
|
+
const checkpoint = task.result?.data?.shortcut;
|
|
57
|
+
if (Object.keys(checkpoint?.receipts ?? {}).length > 0) {
|
|
58
|
+
const decision = tryTransitionTaskEvent(task, 'shortcut.result', { shortcutResultCorrelated: true });
|
|
59
|
+
if (!decision.accepted || !decision.actions.includes('effect.resumeShortcut'))
|
|
60
|
+
throw new Error('Task Lifecycle graph did not select direct receipt resumption');
|
|
61
|
+
resumeReceiptSelected = true;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
34
64
|
const graphOverride = hasArg(args, '--agent-graph-file') ? await textOption(args, '--agent-graph', '--agent-graph-file') : undefined;
|
|
35
65
|
if (graphOverride) {
|
|
36
66
|
parseAgentGraph(graphOverride);
|
|
@@ -52,24 +82,56 @@ export async function runShortcutJobCommand(args, id, repo) {
|
|
|
52
82
|
if (!task)
|
|
53
83
|
throw new Error(`Task ${taskId} disappeared`);
|
|
54
84
|
}
|
|
85
|
+
await activateShortcutJobForDirectRun(loaded.store, id);
|
|
86
|
+
loaded.job = await loaded.store.load(id);
|
|
55
87
|
const workspaceRoot = await resolveWorkspaceRoot(arg(args, '--workspace-root') || undefined);
|
|
56
88
|
const projectRoot = await resolveManagedProjectPath(noGitHubMode(args) ? undefined : repo, arg(args, '--project-path') || loaded.job.projectPath || '', workspaceRoot);
|
|
57
89
|
const projectPath = resolveRepositoryProjectPath(projectRoot, loaded.job.projectPath);
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
90
|
+
const missing = await missingShortcutNodes(task.agentGraph, projectPath, arg(args, '--neo-root') || join(workspaceRoot, 'neo'));
|
|
91
|
+
const previous = task.result?.data?.shortcut;
|
|
92
|
+
if (previous?.workerFallback === true)
|
|
93
|
+
throw new Error('Legacy whole-Graph Worker fallback is not compatible with per-node Shortcut execution; retain its original recovery ownership');
|
|
94
|
+
const controller = new AbortController();
|
|
95
|
+
const onInterrupt = () => controller.abort(new Error('Interrupted by operator'));
|
|
96
|
+
process.once('SIGINT', onInterrupt);
|
|
97
|
+
process.once('SIGTERM', onInterrupt);
|
|
98
|
+
const execute = async (bus) => {
|
|
99
|
+
const workerReconciler = missing.length && bus && makeRunner ? makeRunner(loaded.store, bus) : undefined;
|
|
100
|
+
const unwatch = workerReconciler ? await workerReconciler.watch(id) : undefined;
|
|
101
|
+
try {
|
|
102
|
+
const result = await runAgentShortcut({ store: loaded.store, job: loaded.job, task, projectPath,
|
|
103
|
+
neoRoot: arg(args, '--neo-root') || join(workspaceRoot, 'neo'),
|
|
104
|
+
concurrency: integerArg(args, '--concurrency', 4), signal: controller.signal,
|
|
105
|
+
...(resumeReceiptSelected ? { resumeReceiptSelected: true } : {}),
|
|
106
|
+
...(missing.length ? { runModelNode: node => {
|
|
107
|
+
if (!workerReconciler)
|
|
108
|
+
throw new Error('Model-backed node requires a reachable EventBus and existing Relay Worker Adapter');
|
|
109
|
+
return runShortcutModelNode({ store: loaded.store, reconciler: workerReconciler, jobId: id, parentTaskId: task.id, node });
|
|
110
|
+
} } : {}),
|
|
111
|
+
onNodeEvent: event => process.stderr.write(`shortcut.node ${JSON.stringify(event)}\n`) });
|
|
112
|
+
console.log(JSON.stringify({ outcome: result.outcome, fallbackQueued: false, task: result.task }, null, 2));
|
|
113
|
+
if (result.outcome.status === 'FAILED') {
|
|
114
|
+
const checkpoint = result.task.result?.data?.shortcut;
|
|
115
|
+
process.exitCode = checkpoint?.terminal?.status === 'TIMED_OUT' ? 4 : checkpoint?.terminal?.status === 'INTERRUPTED' ? 5 : 1;
|
|
116
|
+
}
|
|
117
|
+
else if (result.outcome.status === 'WAITING_EVENT')
|
|
118
|
+
process.exitCode = 3;
|
|
119
|
+
}
|
|
120
|
+
finally {
|
|
121
|
+
await unwatch?.();
|
|
122
|
+
await workerReconciler?.close();
|
|
123
|
+
}
|
|
124
|
+
};
|
|
125
|
+
try {
|
|
126
|
+
if (missing.length)
|
|
127
|
+
await withEventBus(args, execute);
|
|
128
|
+
else
|
|
129
|
+
await execute(undefined);
|
|
68
130
|
}
|
|
69
|
-
|
|
70
|
-
|
|
131
|
+
finally {
|
|
132
|
+
process.removeListener('SIGINT', onInterrupt);
|
|
133
|
+
process.removeListener('SIGTERM', onInterrupt);
|
|
71
134
|
}
|
|
72
|
-
console.log(JSON.stringify({ outcome: result.outcome, fallbackQueued: result.fallback, task: outputTask }, null, 2));
|
|
73
135
|
}
|
|
74
136
|
export async function recordShortcutReceiptCommand(args, id) {
|
|
75
137
|
assertSqliteShortcutArgs(args);
|
package/dist/cli-worker-task.js
CHANGED
|
@@ -2,6 +2,7 @@ import { taskOverallTimeoutMs } from './types.js';
|
|
|
2
2
|
import { arg, hasArg, textOption, integerArg, chatGptTabClosePolicy, storySize, priority, continuation } from './cli-support.js';
|
|
3
3
|
import { parseAgentGraph } from './agent-graph.js';
|
|
4
4
|
import { createTaskEntity } from './workflow/entity-creation.js';
|
|
5
|
+
import { validateDependencyValidity } from './dependency-validity.js';
|
|
5
6
|
export function recoveryDiagnosisFromArgs(args) {
|
|
6
7
|
const failureKind = arg(args, '--failure-kind');
|
|
7
8
|
if (!failureKind)
|
|
@@ -13,6 +14,18 @@ export function recoveryDiagnosisFromArgs(args) {
|
|
|
13
14
|
throw new Error('Invalid --failure-kind');
|
|
14
15
|
return { failureKind, reason, evidence: arg(args, '--evidence') || undefined, reroute: hasArg(args, '--reroute'), excludeCurrentRoute: hasArg(args, '--exclude-current-route') };
|
|
15
16
|
}
|
|
17
|
+
export function dependencyValidityFromArgs(args, dependencies) {
|
|
18
|
+
if (!hasArg(args, '--dependency-validity'))
|
|
19
|
+
return undefined;
|
|
20
|
+
let parsed;
|
|
21
|
+
try {
|
|
22
|
+
parsed = JSON.parse(arg(args, '--dependency-validity'));
|
|
23
|
+
}
|
|
24
|
+
catch {
|
|
25
|
+
throw new Error('--dependency-validity must be valid JSON');
|
|
26
|
+
}
|
|
27
|
+
return validateDependencyValidity(dependencies, parsed, '--dependency-validity');
|
|
28
|
+
}
|
|
16
29
|
export async function workerTaskFromArgs(job, args, now) {
|
|
17
30
|
const model = arg(args, '--model');
|
|
18
31
|
const adapterValue = arg(args, '--adapter');
|
|
@@ -38,6 +51,7 @@ export async function workerTaskFromArgs(job, args, now) {
|
|
|
38
51
|
const closePolicy = hasArg(args, '--chatgpt-tab-close-policy') ? chatGptTabClosePolicy(args) : undefined;
|
|
39
52
|
const size = storySize(args);
|
|
40
53
|
const dependencies = arg(args, '--deps').split(',').filter(Boolean);
|
|
54
|
+
const dependencyValidity = dependencyValidityFromArgs(args, dependencies);
|
|
41
55
|
const timeoutMs = hasArg(args, '--timeout') ? integerArg(args, '--timeout', taskOverallTimeoutMs(size, routing?.reasoning)) : routing ? taskOverallTimeoutMs(size, routing.reasoning) : 0;
|
|
42
56
|
return createTaskEntity(job, {
|
|
43
57
|
jobId: job.id,
|
|
@@ -50,6 +64,7 @@ export async function workerTaskFromArgs(job, args, now) {
|
|
|
50
64
|
agentGraph,
|
|
51
65
|
parentTaskId: arg(args, '--parent') || null,
|
|
52
66
|
dependencies,
|
|
67
|
+
dependencyValidity,
|
|
53
68
|
capabilities: arg(args, '--capabilities').split(',').filter(Boolean),
|
|
54
69
|
workerRequirements,
|
|
55
70
|
adapter,
|
package/dist/cli.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
+
import { runTaskReviseCommand } from './cli-revision.js';
|
|
2
3
|
import { runArtifactCommand } from './cli-artifact.js';
|
|
3
4
|
import { runWorkflowAction } from './cli-workflow-action.js';
|
|
4
5
|
import { workflowCliResult } from './cli-workflow.js';
|
|
@@ -45,11 +46,12 @@ import { normalizeThreadId, runtimeReviewer } from './reviewer-thread.js';
|
|
|
45
46
|
export { runtimeReviewer } from './reviewer-thread.js';
|
|
46
47
|
import { SERVICE_DEFAULTS, ServiceEventBus, arg, hasArg, textOption, integerArg, repository, storeFor, saveLocal, eventBus, publishWake, priority, storySize, chatGptTabClosePolicy, continuation, rejectRemovedJobOptions, jobTagFromArgs, requestManagedReconciliation, relayControlJob, relayControlCommand, relayJobList, relayJobStateCommand, relayTaskCommand, withEventBus } from './cli-support.js';
|
|
47
48
|
export { SERVICE_DEFAULTS, eventBus, chatGptTabClosePolicy } from './cli-support.js';
|
|
48
|
-
import { recoveryDiagnosisFromArgs, workerTaskFromArgs } from './cli-worker-task.js';
|
|
49
|
+
import { dependencyValidityFromArgs, recoveryDiagnosisFromArgs, workerTaskFromArgs } from './cli-worker-task.js';
|
|
49
50
|
import { requestTroubleshooterEscalation, resumeTroubleshooter } from './task-recovery.js';
|
|
50
51
|
import { pauseJob, resumeJob } from './job-pause.js';
|
|
51
52
|
export { ensureManagedGitHubJob } from './cli-job-create.js';
|
|
52
53
|
import { recordShortcutReceiptCommand, runShortcutJobCommand } from './cli-shortcut.js';
|
|
54
|
+
import { runLocalShortcutBinding } from './cli-shortcut-local.js';
|
|
53
55
|
import { runContextCommand } from './cli-context.js';
|
|
54
56
|
async function runManagedTaskCommand(action, args) {
|
|
55
57
|
const jobId = arg(args, '--id');
|
|
@@ -79,8 +81,14 @@ async function runManagedTaskCommand(action, args) {
|
|
|
79
81
|
console.log(JSON.stringify(task, null, 2));
|
|
80
82
|
}
|
|
81
83
|
async function runTaskCommand(action, args) {
|
|
82
|
-
if (
|
|
84
|
+
if (hasArg(args, '--shortcut-local'))
|
|
85
|
+
return runLocalShortcutBinding('task', action, args);
|
|
86
|
+
if (!['create', 'update', 'show', 'context', 'events', 'comment', 'comments', 'list', 'retry', 'recover', 'unblock', 'escalate', 'resume-troubleshooter', 'cancel', 'supersede', 'classify', 'revise'].includes(action))
|
|
83
87
|
throw new Error(usage);
|
|
88
|
+
if (action === 'revise') {
|
|
89
|
+
await runTaskReviseCommand(args);
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
84
92
|
if (action === 'context' || action === 'events') {
|
|
85
93
|
await (action === 'context' ? runTaskContextCommand(args) : runTaskEventsCommand(args));
|
|
86
94
|
return;
|
|
@@ -197,6 +205,10 @@ async function runTaskCommand(action, args) {
|
|
|
197
205
|
task.parentTaskId = arg(args, '--parent') || null;
|
|
198
206
|
if (hasArg(args, '--deps'))
|
|
199
207
|
task.dependencies = arg(args, '--deps').split(',').filter(Boolean);
|
|
208
|
+
if (hasArg(args, '--dependency-validity'))
|
|
209
|
+
task.dependencyValidity = dependencyValidityFromArgs(args, task.dependencies);
|
|
210
|
+
else if (task.dependencyValidity)
|
|
211
|
+
task.dependencyValidity = dependencyValidityFromArgs(['--dependency-validity', JSON.stringify(task.dependencyValidity)], task.dependencies);
|
|
200
212
|
if (hasArg(args, '--capabilities'))
|
|
201
213
|
task.capabilities = arg(args, '--capabilities').split(',').filter(Boolean);
|
|
202
214
|
task.timeoutMs = integerArg(args, '--timeout', task.timeoutMs);
|
|
@@ -381,6 +393,8 @@ async function runTaskCommand(action, args) {
|
|
|
381
393
|
console.log(JSON.stringify(task, null, 2));
|
|
382
394
|
}
|
|
383
395
|
async function runJobCommand(action, args) {
|
|
396
|
+
if (hasArg(args, '--shortcut-local'))
|
|
397
|
+
return runLocalShortcutBinding('job', action, args);
|
|
384
398
|
if (!['create', 'adopt', 'update', 'show', 'list', 'merge', 'unblock', 'cancel', 'pause', 'resume', 'run', 'shortcut-receipt'].includes(action))
|
|
385
399
|
throw new Error(usage);
|
|
386
400
|
const repo = repository(args);
|
|
@@ -452,7 +466,7 @@ async function runJobCommand(action, args) {
|
|
|
452
466
|
return;
|
|
453
467
|
}
|
|
454
468
|
if (action === 'run') {
|
|
455
|
-
await runShortcutJobCommand(args, id, repo);
|
|
469
|
+
await runShortcutJobCommand(args, id, repo, (store, bus) => runtime(store, args, bus, codexAndZaiUsageRegistry(), true));
|
|
456
470
|
return;
|
|
457
471
|
}
|
|
458
472
|
if (action === 'shortcut-receipt') {
|
|
@@ -540,12 +554,12 @@ async function runJobCommand(action, args) {
|
|
|
540
554
|
console.log(JSON.stringify(await relayControlCommand(args, { command: 'job.update', jobId: id, patch }), null, 2));
|
|
541
555
|
}
|
|
542
556
|
export function runtimePlanner(args) { const plannerCommand = arg([...args], '--planner-command'); const modelRuntime = arg([...args], '--codex', 'codex'); return plannerCommand ? new CommandObjectivePlanner(plannerCommand) : new AgentObjectivePlanner(modelRuntime); }
|
|
543
|
-
export function runtime(store, args, bus, usageRegistry = codexAndZaiUsageRegistry()) {
|
|
557
|
+
export function runtime(store, args, bus, usageRegistry = codexAndZaiUsageRegistry(), shortcutRunnerOwner = false) {
|
|
544
558
|
const emit = (event) => { process.stderr.write(`${JSON.stringify(event)}\n`); };
|
|
545
559
|
const modelRuntime = arg(args, '--codex', 'codex');
|
|
546
560
|
const policy = chatGptTabClosePolicy(args);
|
|
547
561
|
const planner = runtimePlanner(args);
|
|
548
|
-
return new Reconciler(store, { noGitHub: noGitHubMode(args), owner: arg(args, '--owner', `cli-${process.pid}`), maxConcurrent: Number(arg(args, '--concurrency', '4')), leaseMs: Number(arg(args, '--lease-ms', '300000')), adapters: [new CodexAdapter(modelRuntime), new ChatGptAdapter({ tabClosePolicy: policy }), new ZAdapter()], continuations: [new CodexThreadContinuation(modelRuntime), new CommandContinuation(), new WebhookContinuation()], planner, usageSnapshotProvider: () => usageRegistry.snapshot(), decisionEngine: executionDecisionEngine(), decisionMode: decisionMode(), reviewer: runtimeReviewer(args), eventBus: bus, emit, chatgptTabClosePolicy: policy, executionContextRoots: { workspaceRoot: arg(args, '--workspace-root') || process.env.AGENTS_RELAY_WORKSPACE_ROOT }, projectPathForJob: async (job, task) => {
|
|
562
|
+
return new Reconciler(store, { shortcutRunnerOwner, noGitHub: noGitHubMode(args), owner: arg(args, '--owner', `cli-${process.pid}`), maxConcurrent: Number(arg(args, '--concurrency', '4')), leaseMs: Number(arg(args, '--lease-ms', '300000')), adapters: [new CodexAdapter(modelRuntime), new ChatGptAdapter({ tabClosePolicy: policy }), new ZAdapter()], continuations: [new CodexThreadContinuation(modelRuntime), new CommandContinuation(), new WebhookContinuation()], planner, usageSnapshotProvider: () => usageRegistry.snapshot(), decisionEngine: executionDecisionEngine(), decisionMode: decisionMode(), reviewer: runtimeReviewer(args), eventBus: bus, emit, chatgptTabClosePolicy: policy, executionContextRoots: { workspaceRoot: arg(args, '--workspace-root') || process.env.AGENTS_RELAY_WORKSPACE_ROOT }, projectPathForJob: async (job, task) => {
|
|
549
563
|
const workspaceRoot = await resolveWorkspaceRoot(arg(args, '--workspace-root') || undefined);
|
|
550
564
|
const canonical = await resolveManagedProjectPath(noGitHubMode(args) ? undefined : job.repository, arg(args, '--project-path'), workspaceRoot);
|
|
551
565
|
if (!(task ? taskRequiresManagedWorktree(job, task) : Boolean(job.localMerge?.sourceRef)))
|
package/dist/dashboard-html.js
CHANGED
|
@@ -246,7 +246,7 @@ const CHAT_SHORTCUT_TARGET='agents-relay-shortcut';
|
|
|
246
246
|
function chatShortcutField(job){const box=element('div','detail-group');box.append(element('p','detail-label',text('ChatGPT shortcut')));const select=document.createElement('select');select.className='job-filter job-chat-shortcut-select';select.setAttribute('aria-label','ChatGPT shortcut');select.append(new Option('',''));for(const item of parseChatShortcuts(chatShortcutText()))select.append(new Option(item.name,item.prompt));select.value='';select.addEventListener('change',()=>{if(!select.value)return;const prompt=select.value.replaceAll('%1',jobChatRef(job));window.open(chatShortcutUrl(prompt),CHAT_SHORTCUT_TARGET,'noopener');select.value='';});box.append(select);return box;}
|
|
247
247
|
function renderJobList(){jobList.replaceChildren();const visible=filteredJobs();if(!jobs.length){jobList.append(element('li','empty',text('No durable jobs discovered.')));return;}if(!visible.length){jobList.append(element('li','empty',text('No jobs match the selected filters.')));return;}for(const job of visible){const row=element('div','job-row'+(isCompleteUnmerged(job)?' complete-unmerged':''));row.setAttribute('aria-current',String(jobSelectionKey(job)===selectedJob));row.addEventListener('click',()=>selectJob(job));const content=element('div','job-content');const select=document.createElement('button');select.type='button';select.className='job-button';select.setAttribute('aria-current',String(jobSelectionKey(job)===selectedJob));select.title=job.title||job.id;select.addEventListener('click',event=>{event.stopPropagation();selectJob(job);});select.append(element('span','job-title',text(repoName(job.repository)+'/'+value(job.id)+(Number(job.prNumber||0)>0?'/PR#'+value(job.prNumber):'')+': '+value(job.title||job.id))));const states=element('span','job-status-line');states.append(element('span','badge '+value(job.state),text(value(job.state))),element('span','badge '+value(job.runtimeStatus||'IDLE'),text(value(job.runtimeStatus||'IDLE'))));if(job.publicationFailure)states.append(element('span','badge FAILED',text('PUBLISH FAILED: '+value(job.publicationFailure.stage))));else if(job.publication?.version)states.append(element('span','badge SUCCEEDED',text('v'+job.publication.version)));else if(Number(job.prNumber||0)>0&&job.githubState==='MERGED')states.append(element('span','badge MERGED',text('PR Merged')));else if(job.state==='COMPLETED'&&job.githubState==='CLOSED')states.append(element('span','badge SUCCEEDED',text('PR Archived')));if(job.state==='ACTIVE'&&job.reviewEnabled!==false)states.append(element('span','badge flag-review',text('REVIEW REQUIRED')));if(job.localMerge?.status==='failed')states.append(element('span','badge FAILED',text('MERGE FAILED: '+value(job.localMerge.error||'Unknown error'))));else if(isCompleteUnmerged(job))states.append(element('span','badge MERGE_PENDING',text('MERGE PENDING')));const primary=element('div','job-primary');primary.append(states);const lastLine=element('div','job-last-line');lastLine.append(element('span','subtle',text(compactCounts(counts(job.tasks)))),element('span','subtle',text(relativeTime(job.updatedAt))));content.append(select,primary,lastLine);row.append(content);jobList.append(element('li','',row));}}
|
|
248
248
|
function taskTagDisplay(job,task){const display=task.tag&&job?.tag?.values?.[task.tag];return typeof display==='string'&&display?display:null;}
|
|
249
|
-
function taskVerdict(job,task){if(task.state!=="SUCCEEDED")return null;const data=task.result?.data||{};if(task.agentName
|
|
249
|
+
function taskVerdict(job,task){if(task.state!=="SUCCEEDED")return null;const data=task.result?.data||{};if(["reviewer","job-acceptance-reviewer"].includes(task.agentName)){const verdict=data.verdict||((job?.review?.taskId===task.id)?job.review.outcome:null);return ({approved:"APPROVED",pass:"APPROVED","changes-required":"CHANGES REQUIRED",changes_required:"CHANGES REQUIRED"})[verdict]||null;}if(task.agentName==="troubleshooter"){const original=job?.tasks?.find(t=>t.id===task.parentTaskId);const resolution=original?.resolution;if(resolution?.state!=="resolved"||resolution.owner!=="troubleshooter")return null;return ({exact_original_retry:"RETRY VERIFIED",same_job_dependency:"DEPENDENCY REGISTERED",blocker_job_dependency:"BLOCKER REGISTERED",cancel_supersede:"SUPERSEDED"})[resolution.path]||null;}return null;}function taskSubtreeComplete(task,children){return ['SUCCEEDED','CANCELLED'].includes(task.state)&&(children.get(task.id)||[]).every(child=>taskSubtreeComplete(child,children));}
|
|
250
250
|
function taskStateLabel(task){const resolution=task?.resolution?.state;return task?.state==='FAILED'&&typeof resolution==='string'&&resolution.trim()?task.state+' / '+resolution:task.state;}
|
|
251
251
|
function taskNode(task,children,depth){const li=element('li');const nested=children.get(task.id)||[];const line=element('div','task-line');if(nested.length){const key=(selectedJob||'')+':'+task.id;const collapsed=collapsedTasks.has(key)||(!expandedTasks.has(key)&&taskSubtreeComplete(task,children));const fold=document.createElement('button');fold.type='button';fold.className='task-fold';fold.setAttribute('aria-expanded',String(!collapsed));fold.setAttribute('aria-label',(collapsed?'Expand ':'Collapse ')+task.id);fold.textContent=collapsed?'▸':'▾';line.append(fold);const ul=element('ul','tree');ul.hidden=collapsed;for(const child of nested)ul.append(taskNode(child,children,depth+1));fold.addEventListener('click',()=>{const next=!ul.hidden;ul.hidden=next;fold.setAttribute('aria-expanded',String(!next));fold.setAttribute('aria-label',(next?'Expand ':'Collapse ')+task.id);fold.textContent=next?'▸':'▾';if(next){collapsedTasks.add(key);expandedTasks.delete(key);}else{collapsedTasks.delete(key);expandedTasks.add(key);}});li.append(line,ul);}else li.append(line);const row=document.createElement('button');row.type='button';row.className='task-row';row.setAttribute('aria-current',String(task.id===selectedTaskId));row.title=task.id;row.addEventListener('click',()=>{const deselect=selectedTaskId===task.id;selectedTaskId=deselect?null:task.id;eventTaskId=deselect?null:task.id;rememberSelection();clearEvents();renderAll();void loadEventHistory();});const label=element('span','task-id',text(value(task.id)+': '+value(task.title||task.input?.split(/\\r?\\n/).find(line=>line.trim())?.trim()||shortManagedId(task.id,selected()?.repository,'t'))));label.style.paddingLeft=Math.min(depth,4)*6+'px';const verdict=taskVerdict(selected(),task);row.append(label,element('span','badge '+(verdict==='APPROVED'||verdict==='RESOLVED'?'SUCCEEDED':verdict==='CHANGES REQUIRED'||verdict==='WAITING'?'BLOCKED':value(task.state)),text(task.state==='FAILED'?taskStateLabel(task):(verdict||task.state))));const tag=taskTagDisplay(selected(),task);if(tag){const badge=element('span','task-tag',text(tag));badge.title=(selected()?.tag?.description||'Task tag')+': '+task.tag;row.append(badge);}line.append(row);return li;}
|
|
252
252
|
function buildTree(tasks){taskTree.replaceChildren();if(!Array.isArray(tasks)||!tasks.length){taskTree.append(element('li','empty',text('No tasks in durable state.')));return;}const work=tasks.filter(task=>task.kind!=='planner');if(!work.length){taskTree.append(element('li','empty',text('No work tasks in durable state.')));return;}const known=new Set(work.map(task=>task.id));const children=new Map();const roots=[];for(const task of work){if(!task.parentTaskId||!known.has(task.parentTaskId))roots.push(task);else{const siblings=children.get(task.parentTaskId)||[];siblings.push(task);children.set(task.parentTaskId,siblings);}}for(const task of roots)taskTree.append(taskNode(task,children,0));}
|
|
@@ -260,7 +260,7 @@ function taskStateField(task){const box=element('div','detail-group');box.append
|
|
|
260
260
|
function manualOverrideField(task){const rows=Array.isArray(task.manualStateOverrides)?task.manualStateOverrides:[];const last=rows.at(-1);return field('Manual override',last?last.from+' → '+last.to+' · '+relativeTime(last.at):'—');}
|
|
261
261
|
function iconSvg(name){const paths={close:'M5 5l14 14M19 5 5 19',detail:'M7 3h7l4 4v14H7zM14 3v5h4M10 12h5m-5 4h5'};const ns='http://www.w3.org/2000/svg';const svg=document.createElementNS(ns,'svg');svg.setAttribute('viewBox','0 0 24 24');svg.setAttribute('aria-hidden','true');const path=document.createElementNS(ns,'path');path.setAttribute('d',paths[name]);svg.append(path);return svg;}
|
|
262
262
|
function showDetailsDialog(title,sections){const dialog=element('dialog','details-dialog');dialog.setAttribute('aria-label',title);const head=element('div','details-dialog-head');const name=element('strong','',text(title));const close=element('button','icon-button');close.append(iconSvg('close'));close.type='button';close.setAttribute('aria-label','Close details');close.title='Close details';close.addEventListener('click',()=>dialog.close());head.append(name,close);dialog.append(head);for(const [label,value] of sections){if(value===undefined||value===null||value==='')continue;dialog.append(element('h3','',text(label)));const content=element('pre');content.textContent=typeof value==='string'?value:JSON.stringify(value,null,2);dialog.append(content);}dialog.addEventListener('close',()=>dialog.remove());document.body.append(dialog);dialog.showModal();}function openJobDetails(){const job=selected();if(!job)return;showDetailsDialog('Job '+job.id+' · '+value(job.title),[['Objective',job.objective],['Description',job.description],['State',job.state],['Plans',job.plans?.map(p=>({id:p.id,status:p.status,assessment:p.assessment,error:p.error,generatedTaskIds:p.generatedTaskIds}))],['Review',job.review],['Outcome',job.result],['Publication',job.publication],['Failure',job.error]]);}function openTaskDetails(task){const result=task.result?.data??task.result;showDetailsDialog('Task '+task.id+' · '+value(task.title),[['Input / task objective',task.input],['State',task.state],['Conclusion',result],['Result summary',task.result?.summary],['Planner assessment',task.plannerResult?.assessment],['Resolution',task.resolution],['Resolution classification',task.resolutionClassification],['Failure',task.failureReason||task.error],['Dependencies',task.dependencies]]);}document.querySelector('#job-content-open').addEventListener('click',openJobDetails);function renderTaskDetail(task){taskDetailRoot.replaceChildren();if(!task){taskDetailRoot.append(element('p','empty',text('Select a task to inspect execution details.')));return;}const routing=task.routing||{};const groups=element('div','detail-groups');groups.append(field('Title',task.title||'—'),field('Task ID',task.id),field('Kind',task.kind||'work'),taskStateField(task),...(task.state==='FAILED'&&task.resolution?.state?[field('Resolution state',task.resolution.state),field('Resolution path',task.resolution.path||'—'),field('Resolution target',task.resolution.targetTaskId||'—')]:[]),manualOverrideField(task),field('Planning decision',task.planningDecisionId||'—'),field('Planning source',task.planningSource||'—'),field('Planning round',task.planningRound===undefined?'—':String(task.planningRound)),field('Project / agent',value(task.projectName)+' / '+value(task.agentName)),field('Parent task',task.parentTaskId||'root'),...(task.resolutionClassification?[field('Resolution classification',task.resolutionClassification.kind),field('Resolution target',task.resolutionClassification.targetTaskId),field('Resolution evidence',task.resolutionClassification.evidence),field('Resolution reason',task.resolutionClassification.reason)]:[]),field('Adapter',task.adapter),field('Provider / model',value(routing.provider)+' / '+value(routing.model)),field('Reasoning / profile',value(routing.reasoning||routing.profile)),field('Attempt',attemptBudget(task)),field('Dependencies',Array.isArray(task.dependencies)&&task.dependencies.length?task.dependencies.join(', '):'none'),taskCommentField(task),chatField(task));const job=selected();if(task.reviewHeadSha&&job)groups.append(commitField('HEAD commit',job,task.reviewHeadSha));const graph=agentGraphField(task);if(graph)groups.append(graph);if(task.plannerResult)groups.append(field('Objective status',task.plannerResult.objective_status),markdownField('Assessment',task.plannerResult.assessment));if(task.error)groups.append(field('Error',task.error));const result=task.result?.data??task.result;if(result){groups.append(field('Conclusion',result.verdict||result.outcome?.verdict||task.result?.summary||'Available'));}taskDetailRoot.append(groups);const details=element('button','icon-button');details.append(iconSvg('detail'));details.type='button';details.setAttribute('aria-label','Task details and conclusion');details.title='Task details and conclusion';details.addEventListener('click',()=>openTaskDetails(task));taskDetailRoot.append(details);}
|
|
263
|
-
function reviewStatus(job){const review=job?.review;if(!review)return 'Not started';if(review.outcome==='approved'&&review.headSha===job.headSha)return 'MERGE READY · approved';const stale=Array.isArray(job?.tasks)&&job.tasks.some(task=>task.agentName
|
|
263
|
+
function reviewStatus(job){const review=job?.review;if(!review)return 'Not started';if(review.outcome==='approved'&&review.headSha===job.headSha)return 'MERGE READY · approved';const stale=Array.isArray(job?.tasks)&&job.tasks.some(task=>['reviewer','job-acceptance-reviewer'].includes(task.agentName)&&task.reviewHeadSha&&job.headSha&&task.reviewHeadSha!==job.headSha);if(stale)return 'STALE · awaiting review';return String(review.outcome||'pending').replace('_',' ').toUpperCase();}function renderSelectedJob(){jobDetail.replaceChildren();const job=selected();if(!job){selectedJobTitle.textContent='';jobContentButton.disabled=true;jobContentButton.dataset.state='IDLE';jobDetail.append(element('div','empty',text('No durable jobs discovered.')));buildTree([]);renderTaskDetail(null);return;}selectedJobTitle.textContent=value(job.title||job.id);jobContentButton.disabled=false;jobContentButton.dataset.state=JOB_STATES.includes(job.state)?job.state:'IDLE';jobContentButton.setAttribute('aria-label','Job details · '+value(job.state));jobContentButton.title='Job details · '+value(job.state);if(jobSelectionKey(job)!==selectedJob){selectedJob=jobSelectionKey(job);selectedTaskId=null;eventTaskId=null;clearEvents();rememberSelection();}const summary=element('div','job-summary');summary.append(field('PR state',job.githubState||'UNKNOWN'),jobStateField(job),field('Runtime status',job.runtimeStatus||'IDLE'),field('Review',reviewStatus(job)),field('Creator thread',job.creatorThreadId||'—'),threadField('Implementation thread',job.implementationThreadId),threadField('Reviewer thread',job.reviewerThreadId),commitField('Review head SHA',job,job.review?.headSha||job.headSha||''),prField(job),field('Repository',job.repository||'—'),field('Last activity',relativeTime(job.updatedAt)),field('Task states',compactCounts(job.tasks)),chatShortcutField(job));jobDetail.append(summary);const selectedTask=(job.tasks||[]).find(task=>task.id===selectedTaskId)||null;if(selectedTaskId&&!selectedTask){selectedTaskId=null;eventTaskId=null;clearEvents();rememberSelection();}buildTree(job.tasks||[]);renderTaskDetail(selectedTask);renderEventScope();}function renderAll(){jobs.sort(compareJobs);syncFilters();renderJobList();renderSelectedJob();syncMobileJobsView();}
|
|
264
264
|
function isCompleteUnmerged(job){return job.runtimeStatus==='MERGE_PENDING';}
|
|
265
265
|
function compareJobs(a,b){const timestamp=job=>{const updated=Date.parse(job.updatedAt||'');if(Number.isFinite(updated))return updated;const created=Date.parse(job.createdAt||'');return Number.isFinite(created)?created:0;};return timestamp(b)-timestamp(a)||String(a.repository||'').localeCompare(String(b.repository||''))||String(a.id||'').localeCompare(String(b.id||''));}
|
|
266
266
|
async function loadJSON(url){const response=await fetch(url);if(!response.ok)throw new Error(response.status+' '+response.statusText);return response.json();}
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
2
|
+
import { createTaskEntity } from './workflow/entity-creation.js';
|
|
3
|
+
import { tryApplyTaskCancelAction } from './task-actions.js';
|
|
4
|
+
import { decideDependencyRevision } from './workflow/dependency-revision-v2.js';
|
|
5
|
+
import { dependencyRevisionVector, dependencyValidity, sameDependencyRevisionVector } from './review-revision-model.js';
|
|
6
|
+
import { isFinalReviewAgent } from './final-review-role.js';
|
|
7
|
+
function latestDirectRevision(job, original) {
|
|
8
|
+
return job.tasks.filter(task => task.revision?.originalTaskId === original.id && task.state === 'SUCCEEDED')
|
|
9
|
+
.sort((a, b) => a.createdAt.localeCompare(b.createdAt) || a.id.localeCompare(b.id)).at(-1);
|
|
10
|
+
}
|
|
11
|
+
/** Original results have baseline upstream evidence; subsequent descendants
|
|
12
|
+
* carry their checked vector. No external path, Git diff or filename inference. */
|
|
13
|
+
function priorVector(job, original) {
|
|
14
|
+
return latestDirectRevision(job, original)?.revision?.dependencyVector
|
|
15
|
+
?? Object.fromEntries(original.dependencies.filter(id => dependencyValidity(original, id) !== 'order-only')
|
|
16
|
+
.map(id => {
|
|
17
|
+
const dependency = job.tasks.find(task => task.id === id);
|
|
18
|
+
if (!dependency)
|
|
19
|
+
throw new Error(`missing original dependency ${id}`);
|
|
20
|
+
return [id, `${id}:${dependency.attempt}`];
|
|
21
|
+
}));
|
|
22
|
+
}
|
|
23
|
+
/** Last-minute execution and terminal fence: never accept verification of a
|
|
24
|
+
* superseded upstream evidence generation, including after process restart. */
|
|
25
|
+
export function dependencyRevisionStillCurrent(job, task) {
|
|
26
|
+
const revision = task.revision;
|
|
27
|
+
if (!revision || (revision.kind !== 'rerun' && revision.kind !== 'revalidate'))
|
|
28
|
+
return true;
|
|
29
|
+
const original = job.tasks.find(item => item.id === revision.originalTaskId);
|
|
30
|
+
if (!original || !revision.dependencyVector)
|
|
31
|
+
return false;
|
|
32
|
+
try {
|
|
33
|
+
if (!sameDependencyRevisionVector(dependencyRevisionVector(job, original), revision.dependencyVector))
|
|
34
|
+
return false;
|
|
35
|
+
const explicit = original.dependencies.filter(id => dependencyValidity(original, id) !== 'order-only');
|
|
36
|
+
return explicit.every(id => !job.tasks.some(candidate => candidate.id !== task.id
|
|
37
|
+
&& candidate.revision?.originalTaskId === id && !['SUCCEEDED', 'CANCELLED'].includes(candidate.state)));
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
return false;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
export function reconcileDependencyRevisionFacts(job) {
|
|
44
|
+
const created = [];
|
|
45
|
+
const changedStale = [];
|
|
46
|
+
const originals = job.tasks.filter(task => task.kind !== 'planner' && !isFinalReviewAgent(task.agentName)
|
|
47
|
+
&& task.agentName !== 'troubleshooter' && task.state === 'SUCCEEDED' && !task.revision);
|
|
48
|
+
// Stable topological order ensures dependent Tasks wait for intermediate
|
|
49
|
+
// scheduled work and never bypass a changed ancestor at multi-input fan-in.
|
|
50
|
+
const visited = new Set();
|
|
51
|
+
const sorted = [];
|
|
52
|
+
const visit = (task) => {
|
|
53
|
+
if (visited.has(task.id))
|
|
54
|
+
return;
|
|
55
|
+
visited.add(task.id);
|
|
56
|
+
for (const id of task.dependencies) {
|
|
57
|
+
const dependency = originals.find(candidate => candidate.id === id);
|
|
58
|
+
if (dependency)
|
|
59
|
+
visit(dependency);
|
|
60
|
+
}
|
|
61
|
+
sorted.push(task);
|
|
62
|
+
};
|
|
63
|
+
originals.forEach(visit);
|
|
64
|
+
for (const original of sorted) {
|
|
65
|
+
// A queued/DRAFT child whose upstream evidence moved is superseded by the
|
|
66
|
+
// authoritative Task cancellation graph. Running work is settled via the
|
|
67
|
+
// correlated terminal-generation fence in reconciler-runtime.
|
|
68
|
+
for (const stale of job.tasks.filter(task => task.revision?.originalTaskId === original.id
|
|
69
|
+
&& (task.revision.kind === 'revalidate' || task.revision.kind === 'rerun')
|
|
70
|
+
&& ['DRAFT', 'QUEUED'].includes(task.state) && !dependencyRevisionStillCurrent(job, task))) {
|
|
71
|
+
const decision = decideDependencyRevision('dependency.stale', {}, 'PROPOSED');
|
|
72
|
+
if (decision.accepted && decision.target === 'STALE' && decision.actions.some(action => action.id === 'dependencyRevision.markStale')) {
|
|
73
|
+
tryApplyTaskCancelAction(stale, 'Superseded upstream dependency evidence vector changed before execution');
|
|
74
|
+
changedStale.push(stale.id);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
const policies = original.dependencies.filter(id => dependencyValidity(original, id) !== 'order-only');
|
|
78
|
+
if (!policies.length)
|
|
79
|
+
continue;
|
|
80
|
+
const inputsSettled = policies.every(id => !job.tasks.some(task => task.revision?.originalTaskId === id
|
|
81
|
+
&& !['SUCCEEDED', 'CANCELLED'].includes(task.state)))
|
|
82
|
+
&& !job.tasks.some(task => task.revision?.originalTaskId === original.id && !['SUCCEEDED', 'CANCELLED'].includes(task.state));
|
|
83
|
+
if (!inputsSettled)
|
|
84
|
+
continue;
|
|
85
|
+
const vector = dependencyRevisionVector(job, original);
|
|
86
|
+
const previous = priorVector(job, original);
|
|
87
|
+
const changed = !sameDependencyRevisionVector(vector, previous);
|
|
88
|
+
const rerunRequired = policies.some(id => vector[id] !== previous[id] && dependencyValidity(original, id) === 'rerun');
|
|
89
|
+
const stableKey = JSON.stringify([original.id, vector]);
|
|
90
|
+
const id = 'dependency-revision-' + createHash('sha256').update(stableKey).digest('hex').slice(0, 24);
|
|
91
|
+
const duplicate = job.tasks.some(task => task.id === id || task.revision?.originalTaskId === original.id
|
|
92
|
+
&& task.revision.kind !== 'targeted' && sameDependencyRevisionVector(task.revision.dependencyVector ?? {}, vector));
|
|
93
|
+
const decision = decideDependencyRevision('dependency.reconcile', {
|
|
94
|
+
upstreamEvidenceChanged: changed, explicitValidityPolicy: policies.length > 0,
|
|
95
|
+
allInputsSettled: inputsSettled, notAlreadyRecorded: !duplicate, rerunRequired,
|
|
96
|
+
});
|
|
97
|
+
if (!decision.accepted || decision.target !== 'PROPOSED')
|
|
98
|
+
continue;
|
|
99
|
+
// The canonical Dependency Revision Graph owns rerun vs revalidate.
|
|
100
|
+
// Facts supply evidence, but never select the workflow action here.
|
|
101
|
+
const selectedActions = decision.actions.map(action => action.id);
|
|
102
|
+
if (selectedActions.length !== 1 || !['dependencyRevision.createRerun', 'dependencyRevision.createRevalidation'].includes(selectedActions[0])) {
|
|
103
|
+
throw new Error('Dependency Revision Graph did not select exactly one child action');
|
|
104
|
+
}
|
|
105
|
+
const mode = selectedActions[0] === 'dependencyRevision.createRerun' ? 'rerun' : 'revalidate';
|
|
106
|
+
const inputs = policies.map(id => {
|
|
107
|
+
const originalDependency = job.tasks.find(task => task.id === id);
|
|
108
|
+
return latestDirectRevision(job, originalDependency) ?? originalDependency;
|
|
109
|
+
});
|
|
110
|
+
const upstreamRequests = inputs.flatMap(task => task.revision?.requestIds ?? []);
|
|
111
|
+
const ancestorReview = inputs.find(task => task.revision)?.revision?.reviewTaskId ?? job.review?.taskId ?? '';
|
|
112
|
+
const current = new Date().toISOString();
|
|
113
|
+
const child = createTaskEntity(job, {
|
|
114
|
+
jobId: job.id, id, title: `${mode === 'rerun' ? 'Rerun' : 'Revalidate'} ${original.title ?? original.id}`,
|
|
115
|
+
kind: 'work', parentTaskId: original.id, agentName: original.agentName,
|
|
116
|
+
priority: original.priority ?? job.priority, storySize: original.storySize ?? 'M', projectName: original.projectName,
|
|
117
|
+
dependencies: [...new Set([original.id, ...inputs.map(task => task.id)])],
|
|
118
|
+
capabilities: [...original.capabilities], workerRequirements: original.workerRequirements,
|
|
119
|
+
adapter: original.adapter, output: original.output ?? { kind: 'task_pr' },
|
|
120
|
+
input: [
|
|
121
|
+
`${mode === 'rerun' ? 'MANDATORY RERUN' : 'EXPLICIT REVALIDATION'} of original Task ${original.id}.`,
|
|
122
|
+
`Semantic dependency evidence vector (all inputs must be validated): ${JSON.stringify(vector)}.`,
|
|
123
|
+
mode === 'rerun' ? 'Re-execute the original deliverable from the current upstream evidence; do not merely sign off the old output.'
|
|
124
|
+
: 'Verify whether the original delivered result remains valid against every new upstream generation. Update code/output if required and report exact verification evidence.',
|
|
125
|
+
'Original durable Task objective: ' + original.input,
|
|
126
|
+
'Original result: ' + JSON.stringify(original.result),
|
|
127
|
+
].join('\n\n'),
|
|
128
|
+
revision: { kind: mode, originalTaskId: original.id,
|
|
129
|
+
requestIds: [...new Set(upstreamRequests)], reviewTaskId: ancestorReview,
|
|
130
|
+
basedOnHeadSha: job.headSha ?? '', dependencyVector: vector },
|
|
131
|
+
attempt: 0, maxAttempts: Math.max(3, original.maxAttempts),
|
|
132
|
+
leaseOwner: null, leaseExpiresAt: null, executionId: null, threadId: null,
|
|
133
|
+
result: null, error: null, timeoutMs: original.timeoutMs,
|
|
134
|
+
createdAt: current, updatedAt: current, continuation: null, continuationDeliveredAt: null,
|
|
135
|
+
});
|
|
136
|
+
job.tasks.push(child);
|
|
137
|
+
created.push(id);
|
|
138
|
+
}
|
|
139
|
+
if (created.length || changedStale.length)
|
|
140
|
+
job.updatedAt = new Date().toISOString();
|
|
141
|
+
return created;
|
|
142
|
+
}
|
|
143
|
+
export async function reconcileDependencyRevisions(store, jobId) {
|
|
144
|
+
if (!store.mutateJob)
|
|
145
|
+
return [];
|
|
146
|
+
let created = [];
|
|
147
|
+
await store.mutateJob(jobId, job => {
|
|
148
|
+
created = reconcileDependencyRevisionFacts(job);
|
|
149
|
+
return job;
|
|
150
|
+
});
|
|
151
|
+
return created;
|
|
152
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export function validateDependencyValidity(dependencies, value, field = 'dependencyValidity') {
|
|
2
|
+
if (value === undefined || value === null)
|
|
3
|
+
return undefined;
|
|
4
|
+
if (typeof value !== 'object' || Array.isArray(value))
|
|
5
|
+
throw new Error(`${field} must be an object`);
|
|
6
|
+
const allowed = new Set(dependencies);
|
|
7
|
+
const result = {};
|
|
8
|
+
for (const [taskId, policy] of Object.entries(value)) {
|
|
9
|
+
if (!allowed.has(taskId))
|
|
10
|
+
throw new Error(`${field} key ${taskId} must identify a declared dependency`);
|
|
11
|
+
if (policy !== 'order-only' && policy !== 'revalidate' && policy !== 'rerun') {
|
|
12
|
+
throw new Error(`${field}[${taskId}] must be order-only, revalidate, or rerun`);
|
|
13
|
+
}
|
|
14
|
+
result[taskId] = policy;
|
|
15
|
+
}
|
|
16
|
+
return result;
|
|
17
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/** Stable internal review lifecycle role with a new externally visible Agent identity. */
|
|
2
|
+
export const FINAL_REVIEW_AGENT = 'job-acceptance-reviewer';
|
|
3
|
+
export function isFinalReviewAgent(name) {
|
|
4
|
+
return name === FINAL_REVIEW_AGENT || name === 'reviewer';
|
|
5
|
+
}
|
|
6
|
+
export function nextFinalReviewTaskId(job, headSha) {
|
|
7
|
+
const base = 'final-review-' + headSha.slice(0, 12);
|
|
8
|
+
const ids = new Set(job.tasks.filter(task => task.reviewHeadSha === headSha && isFinalReviewAgent(task.agentName)).map(task => task.id));
|
|
9
|
+
if (!ids.has(base))
|
|
10
|
+
return base;
|
|
11
|
+
for (let round = 2; round < 1000; round += 1) {
|
|
12
|
+
const candidate = base + '-r' + round;
|
|
13
|
+
if (!ids.has(candidate))
|
|
14
|
+
return candidate;
|
|
15
|
+
}
|
|
16
|
+
throw new Error('Too many final review rounds for ' + headSha);
|
|
17
|
+
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { isFinalReviewAgent } from './final-review-role.js';
|
|
1
2
|
import { classifyTaskResolution } from './workflow/task-resolution.js';
|
|
2
3
|
import { tryTransitionTaskEvent } from './task-transitions.js';
|
|
3
4
|
import { satisfiesWorker } from './worker-routing.js';
|
|
5
|
+
import { isSuperseded } from './runtime-status.js';
|
|
4
6
|
function dependencySatisfied(task, byId) {
|
|
5
7
|
return task.dependencies.every(id => {
|
|
6
8
|
const dependency = byId.get(id);
|
|
@@ -74,8 +76,9 @@ export function objectiveSatisfiedForReview(job) {
|
|
|
74
76
|
const latest = (job.plans ?? []).at(-1);
|
|
75
77
|
if (latest?.status !== 'SUCCEEDED' || latest.objectiveStatus !== 'satisfied')
|
|
76
78
|
return false;
|
|
77
|
-
const
|
|
78
|
-
|
|
79
|
+
const byId = new Map(job.tasks.map(task => [task.id, task]));
|
|
80
|
+
const implementation = job.tasks.filter(task => task.kind !== 'planner' && !isFinalReviewAgent(task.agentName) && task.agentName !== 'troubleshooter'
|
|
81
|
+
&& !isSuperseded(task, byId));
|
|
79
82
|
return implementation.length > 0 && implementation.every(task => task.state === 'SUCCEEDED');
|
|
80
83
|
}
|
|
81
84
|
/** Apply Planner-proposed history dispositions to a private candidate snapshot.
|
|
@@ -100,7 +103,7 @@ export function applyPlannerHistoryCleanup(job, expectedTaskIds, cleanup, now) {
|
|
|
100
103
|
if (item.outcome === 'unresolved')
|
|
101
104
|
continue;
|
|
102
105
|
if (item.outcome === 'cancelled_review') {
|
|
103
|
-
if (task.agentName
|
|
106
|
+
if (!isFinalReviewAgent(task.agentName) || !tryTransitionTaskEvent(task, 'cancel').accepted) {
|
|
104
107
|
issues.push(`Task ${item.taskId} cannot be cancelled as a failed review. Only a FAILED reviewer Task can use cancelled_review.`);
|
|
105
108
|
continue;
|
|
106
109
|
}
|
|
@@ -8,11 +8,14 @@ export function jobHasActiveExecution(job, except = {}) {
|
|
|
8
8
|
if (task.id === except.taskId)
|
|
9
9
|
return false;
|
|
10
10
|
const shortcut = task.result?.data?.shortcut;
|
|
11
|
+
const delegatedWorker = job.executionMode === 'shortcut' && job.contentOnly === true && task.state === 'RUNNING'
|
|
12
|
+
&& task.result?.data?.shortcut && typeof task.result.data.shortcut === 'object'
|
|
13
|
+
&& Object.keys(task.result.data.shortcut.workerNodes ?? {}).length > 0;
|
|
11
14
|
const durableWait = job.executionMode === 'shortcut' && job.contentOnly === true && task.state === 'RUNNING'
|
|
12
15
|
&& task.leaseOwner === null && shortcut && typeof shortcut === 'object'
|
|
13
16
|
&& shortcut.waits
|
|
14
17
|
&& Object.keys(shortcut.waits).length > 0;
|
|
15
|
-
return !durableWait && (task.state === 'RUNNING' || (task.executionId !== null && !['SUCCEEDED', 'FAILED', 'CANCELLED'].includes(task.state)));
|
|
18
|
+
return !durableWait && !delegatedWorker && (task.state === 'RUNNING' || (task.executionId !== null && !['SUCCEEDED', 'FAILED', 'CANCELLED'].includes(task.state)));
|
|
16
19
|
});
|
|
17
20
|
const planner = (job.plans ?? []).some(plan => plan.id !== except.planId
|
|
18
21
|
&& plan.executionId !== null && plan.status === 'PLANNING');
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isFinalReviewAgent } from './final-review-role.js';
|
|
1
2
|
import { deriveTaskTitle } from './task-title.js';
|
|
2
3
|
export function normalizeLegacyJobPrNumber(input) {
|
|
3
4
|
const record = input;
|
|
@@ -7,7 +8,7 @@ export function normalizeLegacyJobPrNumber(input) {
|
|
|
7
8
|
input.prNumber = Number(legacy);
|
|
8
9
|
delete record[legacyKey];
|
|
9
10
|
for (const task of input.tasks ?? []) {
|
|
10
|
-
if (task.id.startsWith('final-review-') && task.agentName
|
|
11
|
+
if (task.id.startsWith('final-review-') && isFinalReviewAgent(task.agentName) && /^Job ID:\s*\d+$/i.test(task.title?.trim() ?? '')) {
|
|
11
12
|
task.title = `Final review: ${input.title}`;
|
|
12
13
|
}
|
|
13
14
|
if (!task.title?.trim())
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { isFinalReviewAgent } from './final-review-role.js';
|
|
1
2
|
import { buildAgentPrompt, buildRelayWorkPrompt, renderAgentPrompt } from './agent-prompt-builder.js';
|
|
2
3
|
import { resolveAgentContract } from './execution-context.js';
|
|
3
4
|
import { dirname, join } from 'node:path';
|
|
@@ -25,7 +26,7 @@ export async function managedWorkerInput(job, task, context, mode = 'production'
|
|
|
25
26
|
throw new Error(`Agent ${agentName} requires ${requiredRuntime} runtime; ${adapter} cannot launch this Task`);
|
|
26
27
|
}
|
|
27
28
|
const agent = selected.definition;
|
|
28
|
-
const role = agentName
|
|
29
|
+
const role = isFinalReviewAgent(agentName) ? 'reviewer' : agentName === 'planner' || agentName === 'troubleshooter' ? agentName : 'worker';
|
|
29
30
|
if (mode === 'evaluation') {
|
|
30
31
|
const safeAgent = agent.replace(/^.*(?:task\.started|task\.completed|task\.failed|events__publish|NEO_EVENTS_EMIT).*\n?/gm, '');
|
|
31
32
|
return renderAgentPrompt(buildAgentPrompt({ role, system: [safeAgent, '[Read-only evaluation safety boundary]\nDo not use tools, files, events or external services. Evaluate the role instructions as criteria only.'].filter(Boolean).join('\n\n'), user: `[Isolated prompt evaluation mode]\nTask: ${task.id}\n${task.input}` }), adapter);
|
package/dist/model-routing.js
CHANGED
|
@@ -71,6 +71,14 @@ async function readConfig(path) {
|
|
|
71
71
|
return null;
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
|
+
/** Only a real top-level Codex config model counts as a configured default. */
|
|
75
|
+
export async function configuredCodexDefault(codexHome = process.env.CODEX_HOME ?? join(homedir(), '.codex')) {
|
|
76
|
+
const config = await readConfig(join(codexHome, 'config.toml'));
|
|
77
|
+
return config?.model
|
|
78
|
+
? { provider: config.provider ?? 'openai', model: config.model,
|
|
79
|
+
...(config.reasoning ? { reasoning: config.reasoning } : {}) }
|
|
80
|
+
: null;
|
|
81
|
+
}
|
|
74
82
|
function withResource(candidate, usage) {
|
|
75
83
|
const resource = usageForProvider(usage, candidate.provider);
|
|
76
84
|
return { ...candidate, resourceHealthy: resource.healthy, resourceUsedPercent: resource.usedPercent, resourceRemainingPercent: resource.remainingPercent, resourceResetAt: resource.resetAt, resourceResetInMinutes: resource.resetInMinutes, resourceWindows: resource.windows };
|