agents-relay 2.0.252 → 2.0.254
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/README.md +25 -9
- package/dist/agent-graph.js +1 -1
- package/dist/agent-shortcut.js +1 -1
- package/dist/cli-help.js +20 -13
- package/dist/cli-job-create.js +3 -3
- package/dist/cli-shortcut.js +94 -4
- package/dist/cli.js +5 -5
- package/dist/dag-result-contract.js +48 -0
- package/dist/dag-task-runtime.js +214 -0
- package/dist/dashboard-html.js +3 -4
- package/dist/job-execution-slot.js +27 -21
- package/dist/pool.js +6 -3
- package/dist/reconciler-review.js +1 -1
- package/dist/reconciler-runtime.js +12 -4
- package/dist/reconciler.js +20 -21
- package/dist/relayd-control.js +1 -1
- package/dist/review-replan.js +5 -1
- package/dist/runtime-status.js +5 -0
- package/dist/script-task-adapter.js +118 -0
- package/dist/workflow/contracts.js +1 -0
- package/dist/workflow/definitions-v2.js +2 -1
- package/dist/workflow/planner-orchestration-v2.js +3 -1
- package/package.json +4 -4
- package/skills/agents-relay/SKILL.md +38 -26
- package/skills/agents-relay/contracts/event-contract.md +17 -15
- package/workflow/job-lifecycle.mmd +4 -0
- package/workflow/planner-orchestration.mmd +6 -1
package/dist/dashboard-html.js
CHANGED
|
@@ -191,7 +191,7 @@ function relativeTime(timestamp){if(!timestamp)return '—';const parsed=Date.pa
|
|
|
191
191
|
function safePrUrl(repository,prNumber){if(typeof repository!=='string'||!Number.isInteger(prNumber)||prNumber<=0)return null;const parts=repository.split('/');if(parts.length!==2)return null;const [owner,repo]=parts;if(!owner||!repo||owner==='.'||owner==='..'||repo==='.'||repo==='..')return null;if(!/^[A-Za-z0-9-]+$/.test(owner)||!/^[A-Za-z0-9._-]+$/.test(repo))return null;return 'https://github.com/'+owner+'/'+repo+'/pull/'+prNumber;}
|
|
192
192
|
function safeCommitUrl(repository,sha){if(typeof repository!=='string'||typeof sha!=='string'||!/^[0-9a-f]{7,64}$/i.test(sha))return null;const parts=repository.split('/');if(parts.length!==2||!parts[0]||!parts[1])return null;return 'https://github.com/'+parts[0]+'/'+parts[1]+'/commit/'+sha;}
|
|
193
193
|
function commitField(label,job,sha){const box=element('div','detail-group');box.append(element('p','detail-label',text(label)));const line=element('p','detail-value');const url=safeCommitUrl(job?.repository,sha);if(url){const link=document.createElement('a');link.href=url;link.target='_blank';link.rel='noopener noreferrer';link.textContent=sha.slice(0,7);line.append(link);}else line.append(text(sha||'—'));box.append(line);return box;}
|
|
194
|
-
function prField(job){if(job.
|
|
194
|
+
function prField(job){if(Number(job.prNumber||0)===0)return field('GitHub PR','Not applicable');const box=element('div','detail-group');box.append(element('p','detail-label',text('GitHub PR')));const line=element('p','detail-value');const prNumber=Number(job.prNumber||0);const url=safePrUrl(job.repository,prNumber);if(url){const link=document.createElement('a');link.href=url;link.target='_blank';link.rel='noopener noreferrer';link.textContent='PR #'+prNumber;line.append(link);}else line.append(text('unavailable'));box.append(line);return box;}
|
|
195
195
|
function safeWorkerThreadUrl(input,adapter){try{const url=new URL(input);const parts=url.pathname.split('/');const domain=adapter==='z'?'chat.z.ai':'chatgpt.com';if(url.protocol!=='https:'||url.hostname!==domain||parts.length!==3||parts[1]!=='c'||!/^[A-Za-z0-9_-]{8,160}$/.test(parts[2]))return null;return url.origin+url.pathname;}catch{return null;}}
|
|
196
196
|
function chatField(task){const box=element('div','detail-group');box.append(element('p','detail-label',text('Worker threads')));const items=Array.isArray(task.threadHistory)?task.threadHistory.slice(-8).reverse():[];if(items.length===0)items.push({threadUrl:task.threadUrl,attempt:task.attempt});let shown=0;for(const item of items){const url=safeWorkerThreadUrl(item.threadUrl,task.adapter);if(!url)continue;const line=element('p','detail-value');const link=document.createElement('a');link.href=url;link.target='_blank';link.rel='noopener noreferrer';link.textContent='Open '+(task.adapter==='z'?'Z.ai':'ChatGPT')+' thread'+(Number.isInteger(item.attempt)?' · attempt '+item.attempt:'');line.append(link);box.append(line);shown++;}if(!shown){const line=element('p','detail-value');if(task.adapter==='chatgpt'&&typeof task.threadId==='string'){const url=safeWorkerThreadUrl('https://chatgpt.com/c/'+encodeURIComponent(task.threadId),'chatgpt');if(url){const link=document.createElement('a');link.href=url;link.target='_blank';link.rel='noopener noreferrer';link.textContent='Open ChatGPT thread';line.append(link);shown++;}}if(!shown)line.append(text('—'));box.append(line);}return box;}
|
|
197
197
|
function taskCommentField(task){const box=element('div','detail-group');box.append(element('p','detail-label',text('PR comment')));const line=element('p','detail-value');if(typeof task.taskUrl==='string'&&task.taskUrl.startsWith('https://github.com/')){const link=document.createElement('a');link.className='task-link';link.href=task.taskUrl;link.target='_blank';link.rel='noopener noreferrer';link.textContent='Open task comment';line.append(link);}else line.append(text('—'));box.append(line);return box;}
|
|
@@ -255,8 +255,7 @@ function applyJelHighlights(svg){
|
|
|
255
255
|
}
|
|
256
256
|
}
|
|
257
257
|
function jelField(job){const box=element('div','detail-group');box.append(element('p','detail-label',text('Job Execution Lifecycle')));const line=element('p','detail-value');const link=element('a','',text('View JEL chart'));link.href='#graph-dialog';link.addEventListener('click',event=>{event.preventDefault();void openJelChart(job);});line.append(link);box.append(line);return box;}
|
|
258
|
-
function
|
|
259
|
-
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))));if(job.executionMode==='shortcut')states.append(element('span','badge shortcut-mode',text('SHORTCUT')));states.append(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));}}
|
|
258
|
+
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))));states.append(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));}}
|
|
260
259
|
function taskTagDisplay(job,task){const display=task.tag&&job?.tag?.values?.[task.tag];return typeof display==='string'&&display?display:null;}
|
|
261
260
|
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));}
|
|
262
261
|
function taskStateLabel(task){const resolution=task?.resolution?.state;return task?.state==='FAILED'&&typeof resolution==='string'&&resolution.trim()?task.state+' / '+resolution:task.state;}
|
|
@@ -272,7 +271,7 @@ function taskStateField(task){const box=element('div','detail-group');box.append
|
|
|
272
271
|
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):'—');}
|
|
273
272
|
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;}
|
|
274
273
|
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);}
|
|
275
|
-
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.
|
|
274
|
+
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',Number(job.prNumber||0)===0?'Not applicable':job.githubState||'UNKNOWN'),jobStateField(job),field('Runtime status',job.runtimeStatus||'IDLE'),field('Review',job.reviewEnabled===false?'Not required':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)),jelField(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();}
|
|
276
275
|
function isCompleteUnmerged(job){return job.runtimeStatus==='MERGE_PENDING';}
|
|
277
276
|
function compareJobs(a,b){const lifecycleGroup=job=>job.state==='COMPLETED'||job.state==='CANCELLED'?1:0;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 lifecycleGroup(a)-lifecycleGroup(b)||timestamp(b)-timestamp(a)||String(a.repository||'').localeCompare(String(b.repository||''))||String(a.id||'').localeCompare(String(b.id||''));}
|
|
278
277
|
async function loadJSON(url){const response=await fetch(url);if(!response.ok)throw new Error(response.status+' '+response.statusText);return response.json();}
|
|
@@ -1,23 +1,29 @@
|
|
|
1
|
-
/**
|
|
2
|
-
*
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
/** A Coordinator is a durable Task but does not occupy a Worker execution slot.
|
|
2
|
+
* Legacy delegated Shortcut Workers preserve their original foreground semantics. */
|
|
3
|
+
function occupiesSlot(job, task) {
|
|
4
|
+
if (task.agentGraph && task.result?.data?.dag?.version === 1)
|
|
5
|
+
return false;
|
|
6
|
+
const shortcut = task.result?.data?.shortcut;
|
|
7
|
+
const delegatedWorker = job.executionMode === 'shortcut' && job.contentOnly === true && task.state === 'RUNNING'
|
|
8
|
+
&& shortcut && typeof shortcut === 'object'
|
|
9
|
+
&& Object.keys(shortcut.workerNodes ?? {}).length > 0;
|
|
10
|
+
const durableWait = job.executionMode === 'shortcut' && job.contentOnly === true && task.state === 'RUNNING'
|
|
11
|
+
&& task.leaseOwner === null && shortcut && typeof shortcut === 'object'
|
|
12
|
+
&& Object.keys(shortcut.waits ?? {}).length > 0;
|
|
13
|
+
return task.state !== 'AWAITING_DECISION' && !durableWait && !delegatedWorker &&
|
|
14
|
+
(task.state === 'RUNNING' || (task.executionId !== null && !['SUCCEEDED', 'FAILED', 'CANCELLED'].includes(task.state)));
|
|
15
|
+
}
|
|
16
|
+
function plannerOccupies(job, planId) {
|
|
17
|
+
return (job.plans ?? []).some(plan => plan.id !== planId && plan.executionId !== null && plan.status === 'PLANNING');
|
|
18
|
+
}
|
|
6
19
|
export function jobHasActiveExecution(job, except = {}) {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
&& shortcut.waits
|
|
17
|
-
&& Object.keys(shortcut.waits).length > 0;
|
|
18
|
-
return task.state !== 'AWAITING_DECISION' && !durableWait && !delegatedWorker && (task.state === 'RUNNING' || (task.executionId !== null && !['SUCCEEDED', 'FAILED', 'CANCELLED'].includes(task.state)));
|
|
19
|
-
});
|
|
20
|
-
const planner = (job.plans ?? []).some(plan => plan.id !== except.planId
|
|
21
|
-
&& plan.executionId !== null && plan.status === 'PLANNING');
|
|
22
|
-
return worker || planner;
|
|
20
|
+
return job.tasks.some(task => task.id !== except.taskId && occupiesSlot(job, task)) || plannerOccupies(job, except.planId);
|
|
21
|
+
}
|
|
22
|
+
/** Only sibling DAG Tasks may execute concurrently; unrelated Tasks retain
|
|
23
|
+
* the existing one-active-execution-per-Job safety boundary. */
|
|
24
|
+
export function jobHasConflictingExecution(job, candidate) {
|
|
25
|
+
if (!candidate.dagNode)
|
|
26
|
+
return jobHasActiveExecution(job, { taskId: candidate.id });
|
|
27
|
+
return plannerOccupies(job) || job.tasks.some(task => task.id !== candidate.id && occupiesSlot(job, task) &&
|
|
28
|
+
task.dagNode?.parentTaskId !== candidate.dagNode?.parentTaskId);
|
|
23
29
|
}
|
package/dist/pool.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { unifiedDAG } from './dag-task-runtime.js';
|
|
1
2
|
import { listManagedGitHubJobs } from './store.js';
|
|
2
3
|
import { eventFor } from './events.js';
|
|
3
4
|
import { ReconcileCoordinator } from './reconcile-coordinator.js';
|
|
@@ -41,6 +42,8 @@ export function needsLifecycleReconciliation(job, now = Date.now()) {
|
|
|
41
42
|
if (review.accepted && review.actions.some(action => action.id === 'review.create'))
|
|
42
43
|
return true;
|
|
43
44
|
}
|
|
45
|
+
if (job.tasks.some(task => unifiedDAG(job, task) && task.state === 'RUNNING'))
|
|
46
|
+
return true;
|
|
44
47
|
if (job.tasks.some(task => (task.state === 'QUEUED' && task.executionId === null)
|
|
45
48
|
|| (task.state === 'RUNNING' && task.adapter === 'orchestrator' && task.executionId === null)
|
|
46
49
|
|| (task.state === 'DRAFT' && task.dependencies.length > 0)))
|
|
@@ -153,7 +156,7 @@ export class RepositoryWorkerPool {
|
|
|
153
156
|
const outcome = await reconciler.applyEvent(signal.event);
|
|
154
157
|
// The decision is durably applied before invoking the Shortcut CLI hook.
|
|
155
158
|
// A replay can also wake a still-QUEUED Task without a new decision.
|
|
156
|
-
if (signal.event.type === 'task.interactive_decision' &&
|
|
159
|
+
if (signal.event.type === 'task.interactive_decision' && !target.job.tasks.some(t => unifiedDAG(target.job, t)) &&
|
|
157
160
|
['task.interactive_decision.accepted', 'task.interactive_decision.duplicate'].includes(outcome.reason) &&
|
|
158
161
|
await this.onShortcutDecision?.(jobId, signal.event.task_id))
|
|
159
162
|
continue;
|
|
@@ -168,8 +171,8 @@ export class RepositoryWorkerPool {
|
|
|
168
171
|
for (const job of jobs) {
|
|
169
172
|
if (capacity <= 0)
|
|
170
173
|
break;
|
|
171
|
-
//
|
|
172
|
-
if (job.executionMode === 'shortcut')
|
|
174
|
+
// Legacy in-flight Shortcut Jobs retain their original foreground owner.
|
|
175
|
+
if (job.executionMode === 'shortcut' && !job.tasks.some(t => unifiedDAG(job, t)))
|
|
173
176
|
continue;
|
|
174
177
|
const store = await this.requireLocalStore(job.id);
|
|
175
178
|
await store.hydrate?.(job);
|
|
@@ -123,7 +123,7 @@ export class ReconcilerReviewBase extends ReconcilerRuntimeBase {
|
|
|
123
123
|
'This is a PRE-MERGE artifact approval gate: inspect exact PR head, requirements, tests and genuine blocking defects.',
|
|
124
124
|
'Do not block approval because automatic merge, Job COMPLETED, or post-merge validation has not occurred yet.',
|
|
125
125
|
'All non-review Tasks have terminal outcomes. Examine FAILED and CANCELLED Tasks and their recovery evidence; never approve an unresolved required outcome.',
|
|
126
|
-
'The Final Review is the Job completion check. Persist concrete, owner-attributed findings with a changes-required verdict; Relay
|
|
126
|
+
'The Final Review is the Job completion check. Persist concrete, owner-attributed findings with a changes-required verdict. A Job without an explicit Planner remains plan-free; request targeted revisions rather than assuming Relay creates a Planner round.',
|
|
127
127
|
'Do not treat historical failed attempts as current artifact defects; distinguish preserved baseline files from implementation.',
|
|
128
128
|
].join('\n\n');
|
|
129
129
|
const task = createTaskEntity(job, {
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { dagCompletionError } from './dag-result-contract.js';
|
|
1
2
|
import { dependencyRevisionStillCurrent } from './dependency-revision-execution.js';
|
|
2
3
|
import { isFinalReviewAgent } from './final-review-role.js';
|
|
3
4
|
import { handleWorkerLaunchFailure } from './worker-failure-recovery.js';
|
|
@@ -92,6 +93,13 @@ export class ReconcilerRuntimeBase {
|
|
|
92
93
|
if (event.type === 'task.completed') {
|
|
93
94
|
const latest = await this.store.load(event.job_id);
|
|
94
95
|
const task = latest.tasks.find(item => item.id === event.task_id);
|
|
96
|
+
if (task?.dagNode) {
|
|
97
|
+
const projectPath = this.options.projectPathForJob ? await this.options.projectPathForJob(latest, task) : undefined;
|
|
98
|
+
const invalid = await dagCompletionError(task, projectPath);
|
|
99
|
+
if (invalid)
|
|
100
|
+
return this.applyTerminalEvent({ ...event, type: 'task.failed',
|
|
101
|
+
message: invalid, data: { ...event.data, reason: 'invalid_dag_result' } });
|
|
102
|
+
}
|
|
95
103
|
// Source generation still goes through canonical Task terminal
|
|
96
104
|
// correlation; convert stale verification into a safe supersede event.
|
|
97
105
|
if (task?.revision && task.revision.kind !== 'targeted' && !dependencyRevisionStillCurrent(latest, task)) {
|
|
@@ -246,7 +254,7 @@ export class ReconcilerRuntimeBase {
|
|
|
246
254
|
return true;
|
|
247
255
|
const sourceId = eventSourceId(event);
|
|
248
256
|
const expected = executionEventSource(jobId, task.id, task.executionId);
|
|
249
|
-
if ((['codex', 'chatgpt', 'z'].includes(task.adapter)) && sourceId !== expected)
|
|
257
|
+
if ((['codex', 'chatgpt', 'z', 'script'].includes(task.adapter)) && sourceId !== expected)
|
|
250
258
|
return false;
|
|
251
259
|
if (afterCommit)
|
|
252
260
|
claimTerminalExecution(expected);
|
|
@@ -403,7 +411,7 @@ export class ReconcilerRuntimeBase {
|
|
|
403
411
|
const lifecycleEvent = event.type;
|
|
404
412
|
const transition = await withExecutionBoundary(event.job_id, event.task_id, () => this.taskTransitions.apply(event.job_id, event.task_id, lifecycleEvent, {
|
|
405
413
|
eligible: (_job, task) => {
|
|
406
|
-
if (!['codex', 'chatgpt', 'z', 'orchestrator'].includes(task.adapter))
|
|
414
|
+
if (!['codex', 'chatgpt', 'z', 'script', 'orchestrator'].includes(task.adapter))
|
|
407
415
|
return false;
|
|
408
416
|
if (event.type === 'task.blocked' && (!trustedInternal || task.agentName !== 'troubleshooter'))
|
|
409
417
|
return false;
|
|
@@ -416,7 +424,7 @@ export class ReconcilerRuntimeBase {
|
|
|
416
424
|
return false;
|
|
417
425
|
if (event.type === 'task.completed' && task.interactiveInvocation?.status !== undefined && task.interactiveInvocation.status !== 'approved')
|
|
418
426
|
return false; // current interactive revision requires durable approval
|
|
419
|
-
const modelBacked = ['codex', 'chatgpt', 'z'].includes(task.adapter);
|
|
427
|
+
const modelBacked = ['codex', 'chatgpt', 'z', 'script'].includes(task.adapter);
|
|
420
428
|
if (!trustedInternal && modelBacked && !isCorrelatedWorkerEvent(task, event)) {
|
|
421
429
|
const eventExecutionId = executionIdFromSource(eventSourceId(event), _job.id, task.id);
|
|
422
430
|
const prior = eventExecutionId ? task.executionHistory?.find(item => item.id === eventExecutionId) : undefined;
|
|
@@ -432,7 +440,7 @@ export class ReconcilerRuntimeBase {
|
|
|
432
440
|
return { recoverableExecution: isRecoverableWatchdogFailure(task) && freshEnough, awaitingInteractiveDecision: lifecycleEvent === 'task.interactive_waiting' && task.interactiveInvocation?.status === 'awaiting_decision' };
|
|
433
441
|
},
|
|
434
442
|
mutate: (job, task) => {
|
|
435
|
-
const modelBacked = ['codex', 'chatgpt', 'z'].includes(task.adapter);
|
|
443
|
+
const modelBacked = ['codex', 'chatgpt', 'z', 'script'].includes(task.adapter);
|
|
436
444
|
const acceptedExecutionId = task.executionId;
|
|
437
445
|
const eventExecutionId = executionIdFromSource(eventSourceId(event), job.id, task.id);
|
|
438
446
|
const terminalExecutionId = eventExecutionId ?? acceptedExecutionId;
|
package/dist/reconciler.js
CHANGED
|
@@ -29,7 +29,7 @@ import { CallbackWorkflowEffectHandler } from './workflow/effects.js';
|
|
|
29
29
|
import { exhaustedTroubleshooterRecoveries, pendingTroubleshooterTasks, pendingTroubleshooterReopens, pendingTroubleshooterRetries, refreshTroubleshooterInput } from './troubleshooter.js';
|
|
30
30
|
import { fallbackFailedTroubleshooters, escalateExhaustedTroubleshooters } from './troubleshooter-fallback.js';
|
|
31
31
|
import { cleanupMergedJobWorktree } from './job-worktree-cleanup.js';
|
|
32
|
-
import {
|
|
32
|
+
import { jobHasConflictingExecution } from './job-execution-slot.js';
|
|
33
33
|
import { requiresWorkerInactivityWatchdog } from './task-inactivity-watchdog.js';
|
|
34
34
|
import { managedWorkerInput } from './managed-worker-input.js';
|
|
35
35
|
import { launchShortcutEffect, resumeShortcutEffect, resumeShortcutEventWaits } from './reconciler-shortcut.js';
|
|
@@ -42,6 +42,8 @@ import { repairLegacyOrchestrators } from './legacy-orchestrator-repair.js';
|
|
|
42
42
|
import { launchPlanExecution } from './planner-runtime.js';
|
|
43
43
|
import { classifyFailure, errorMessage, observability, withObservabilityCorrelation } from './observability.js';
|
|
44
44
|
import { recoverInteractiveDecisions } from './interactive-resume.js';
|
|
45
|
+
import { reconcileDAGSchedule, unifiedDAG } from './dag-task-runtime.js';
|
|
46
|
+
import { ScriptTaskAdapter } from './script-task-adapter.js';
|
|
45
47
|
const PRIORITY_RANK = { P0: 0, P1: 1, P2: 2, P3: 3 };
|
|
46
48
|
export function compareTaskPriority(a, b, jobPriority = 'P2') { const ar = PRIORITY_RANK[a.priority ?? jobPriority]; const br = PRIORITY_RANK[b.priority ?? jobPriority]; return ar - br || a.createdAt.localeCompare(b.createdAt) || a.id.localeCompare(b.id); }
|
|
47
49
|
export class Reconciler extends ReconcilerReviewBase {
|
|
@@ -62,9 +64,7 @@ export class Reconciler extends ReconcilerReviewBase {
|
|
|
62
64
|
}
|
|
63
65
|
async dispatchExecutableTasks(jobId) {
|
|
64
66
|
const scheduled = refreshTaskDependencies(await this.store.load(jobId));
|
|
65
|
-
|
|
66
|
-
// Only the explicit foreground runner may use existing Worker Adapters.
|
|
67
|
-
if (scheduled.executionMode === 'shortcut' && !this.options.shortcutRunnerOwner)
|
|
67
|
+
if (scheduled.executionMode === 'shortcut' && !scheduled.tasks.some(t => unifiedDAG(scheduled, t)) && !this.options.shortcutRunnerOwner)
|
|
68
68
|
return scheduled;
|
|
69
69
|
if (scheduled.pause)
|
|
70
70
|
return scheduled;
|
|
@@ -72,17 +72,15 @@ export class Reconciler extends ReconcilerReviewBase {
|
|
|
72
72
|
this.detach(this.deliverContinuation(scheduled, task), scheduled.id, task.id, 'continuation');
|
|
73
73
|
}
|
|
74
74
|
const capacity = Math.max(0, (this.options.maxConcurrent ?? 4) - this.live.size - this.plannerLive.size);
|
|
75
|
-
const
|
|
76
|
-
.
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
.sort((a, b) => compareTaskPriority(a, b, scheduled.priority ?? 'P2'))
|
|
82
|
-
.slice(0, Math.min(capacity, 1));
|
|
75
|
+
const ready = scheduled.tasks.filter(task => !unifiedDAG(scheduled, task) && revisionRequestReady(scheduled, task) &&
|
|
76
|
+
task.state === 'QUEUED' && task.executionId === null && task.kind !== 'planner' && task.adapter !== 'orchestrator' &&
|
|
77
|
+
dependencyReady(task, new Map(scheduled.tasks.map(item => [item.id, item]))) && !jobHasConflictingExecution(scheduled, task))
|
|
78
|
+
.sort((a, b) => compareTaskPriority(a, b, scheduled.priority ?? 'P2'));
|
|
79
|
+
const firstDAG = ready[0]?.dagNode?.parentTaskId;
|
|
80
|
+
const dispatchable = (firstDAG ? ready.filter(t => t.dagNode?.parentTaskId === firstDAG) : ready.slice(0, 1)).slice(0, capacity);
|
|
83
81
|
for (const task of dispatchable) {
|
|
84
82
|
const shortcut = task.result?.data?.shortcut;
|
|
85
|
-
await transitionTaskEvent(task, 'dispatch', { dispatchable: true, shortcutExecution: scheduled.executionMode === 'shortcut' && scheduled.contentOnly === true && shortcut?.workerFallback !== true && Boolean(task.agentGraph), shortcutFallback: shortcut?.workerFallback === true, shortcutHasGraph: Boolean(task.agentGraph) }, async (actionId) => {
|
|
83
|
+
await transitionTaskEvent(task, 'dispatch', { dispatchable: true, shortcutExecution: scheduled.executionMode === 'shortcut' && scheduled.contentOnly === true && shortcut?.workerFallback !== true && Boolean(task.agentGraph) && !unifiedDAG(scheduled, task), shortcutFallback: shortcut?.workerFallback === true, shortcutHasGraph: Boolean(task.agentGraph) }, async (actionId) => {
|
|
86
84
|
const outcomes = await this.workflowEffects.execute([actionId], { jobId: scheduled.id, taskId: task.id, transitionKey: `dispatch:${task.attempt}`, data: { attempt: task.attempt, ...(task.interactiveInvocation?.decidedAt ? { reviewInvocationId: task.interactiveInvocation.invocationId } : {}) } });
|
|
87
85
|
await this.applyTaskEffectOutcomes(scheduled, task, outcomes);
|
|
88
86
|
}, async () => { await this.store.saveTask(task); });
|
|
@@ -97,7 +95,7 @@ export class Reconciler extends ReconcilerReviewBase {
|
|
|
97
95
|
let job = await this.store.load(jobId);
|
|
98
96
|
// The same durable Job flag covers children, retries, and Troubleshooters.
|
|
99
97
|
// Do not let a background Reconciler mutate or dispatch any of them.
|
|
100
|
-
if (job.executionMode === 'shortcut' && !this.options.shortcutRunnerOwner)
|
|
98
|
+
if (job.executionMode === 'shortcut' && !job.tasks.some(t => unifiedDAG(job, t)) && !this.options.shortcutRunnerOwner)
|
|
101
99
|
return job;
|
|
102
100
|
await drainProductionWorkflowOutbox(this.store, this.options);
|
|
103
101
|
await deliverPendingEscalations(this.store, jobId, this.options.escalationNotifier);
|
|
@@ -206,6 +204,7 @@ export class Reconciler extends ReconcilerReviewBase {
|
|
|
206
204
|
scheduled = refreshTaskDependencies(await this.store.load(jobId));
|
|
207
205
|
}
|
|
208
206
|
scheduled = refreshTaskDependencies(await this.maybeCreatePlanner(scheduled));
|
|
207
|
+
scheduled = refreshTaskDependencies(await reconcileDAGSchedule({ store: this.store, jobId, job: scheduled, projectPathForTask: async (j, t) => j.graphStartContext?.projectPath ?? j.shortcutRunnerContext?.projectPath ?? (this.options.projectPathForJob ? this.options.projectPathForJob(j, t) : t.routing?.cwd ?? process.cwd()), roots: this.options.executionContextRoots }));
|
|
209
208
|
if (scheduled.state !== previousState || scheduled.updatedAt !== job.updatedAt)
|
|
210
209
|
await this.store.saveJob(scheduled);
|
|
211
210
|
scheduled = await this.dispatchExecutableTasks(jobId);
|
|
@@ -286,11 +285,11 @@ export class Reconciler extends ReconcilerReviewBase {
|
|
|
286
285
|
emitFailed: async (task, reason) => { await this.emit(eventFor(job.id, task.id, task.parentTaskId, 'task.failed', 'failed', task.error ?? reason, 'user', { reason })); },
|
|
287
286
|
};
|
|
288
287
|
}
|
|
289
|
-
async recoverLostExecutions(job, now) { if (job.executionMode !== 'shortcut' || this.options.shortcutRunnerOwner)
|
|
288
|
+
async recoverLostExecutions(job, now) { if (job.executionMode !== 'shortcut' || job.tasks.some(t => unifiedDAG(job, t)) || this.options.shortcutRunnerOwner)
|
|
290
289
|
await recoverExpiredExecutions(job, now, this.executionRecoveryPorts(job)); }
|
|
291
290
|
async recoverStartupOrphans(jobId) {
|
|
292
291
|
const job = await this.store.load(jobId);
|
|
293
|
-
if (job.state === 'ACTIVE' && (job.executionMode !== 'shortcut' || this.options.shortcutRunnerOwner === true)) {
|
|
292
|
+
if (job.state === 'ACTIVE' && (job.executionMode !== 'shortcut' || job.tasks.some(t => unifiedDAG(job, t)) || this.options.shortcutRunnerOwner === true)) {
|
|
294
293
|
await recoverStartupExecutionOrphans(job, this.executionRecoveryPorts(job));
|
|
295
294
|
}
|
|
296
295
|
return this.store.load(jobId);
|
|
@@ -366,12 +365,12 @@ export class Reconciler extends ReconcilerReviewBase {
|
|
|
366
365
|
return;
|
|
367
366
|
if (freshTask.executionId !== null)
|
|
368
367
|
return;
|
|
369
|
-
if (
|
|
368
|
+
if (jobHasConflictingExecution(freshJob, freshTask))
|
|
370
369
|
return;
|
|
371
370
|
if (isFinalReviewAgent(freshTask.agentName) && freshTask.planningDecisionId && freshTask.dependencies.length)
|
|
372
371
|
await bindPlannedReviewHead(this.store, freshTask, await this.currentHeadSha(freshJob));
|
|
373
372
|
const implementationThread = resolveImplementationTaskThreadDestination(freshJob, freshTask);
|
|
374
|
-
if ((!freshTask.routing || ((implementationThread || (isFinalReviewAgent(freshTask.agentName) && resolveReviewerThreadDestination(freshJob, this.options.reviewer?.threadId))) && freshTask.adapter !== 'chatgpt')) && freshTask.adapter !== 'orchestrator') {
|
|
373
|
+
if (freshTask.adapter !== 'script' && (!freshTask.routing || ((implementationThread || (isFinalReviewAgent(freshTask.agentName) && resolveReviewerThreadDestination(freshJob, this.options.reviewer?.threadId))) && freshTask.adapter !== 'chatgpt')) && freshTask.adapter !== 'orchestrator') {
|
|
375
374
|
const routed = await this.routeTaskForExecutionFailClosed(freshJob, freshTask);
|
|
376
375
|
if (!routed)
|
|
377
376
|
return;
|
|
@@ -456,7 +455,7 @@ export class Reconciler extends ReconcilerReviewBase {
|
|
|
456
455
|
if (!reserved)
|
|
457
456
|
throw new Error('already reserved launch attempt: reconcile existing generation');
|
|
458
457
|
}
|
|
459
|
-
const adapter = this.options.adapters.find(x => x.name === task.adapter);
|
|
458
|
+
const adapter = task.adapter === 'script' ? new ScriptTaskAdapter(event => this.options.eventBus ? this.emit(event) : this.handleEvent(event), this.options.executionContextRoots) : this.options.adapters.find(x => x.name === task.adapter);
|
|
460
459
|
if (!adapter) {
|
|
461
460
|
await this.failLaunch(job.id, task.id, task.executionId, 'No adapter ' + task.adapter);
|
|
462
461
|
return;
|
|
@@ -464,7 +463,7 @@ export class Reconciler extends ReconcilerReviewBase {
|
|
|
464
463
|
let executionContext;
|
|
465
464
|
try {
|
|
466
465
|
const role = isFinalReviewAgent(task.agentName) ? 'reviewer' : task.agentName === 'troubleshooter' ? 'troubleshooter' : task.parentTaskId ? 'nested-worker' : 'worker';
|
|
467
|
-
const projectPath = this.options.projectPathForJob ? await this.options.projectPathForJob(job, task) : task.routing?.cwd ?? process.cwd();
|
|
466
|
+
const projectPath = task.dagNode && (job.graphStartContext?.projectPath ?? job.shortcutRunnerContext?.projectPath) ? (job.graphStartContext?.projectPath ?? job.shortcutRunnerContext.projectPath) : this.options.projectPathForJob ? await this.options.projectPathForJob(job, task) : task.routing?.cwd ?? process.cwd();
|
|
468
467
|
executionContext = await this.resolvedContext(job, task, role, projectPath);
|
|
469
468
|
}
|
|
470
469
|
catch (error) {
|
|
@@ -478,7 +477,7 @@ export class Reconciler extends ReconcilerReviewBase {
|
|
|
478
477
|
const sourceId = executionEventSource(job.id, task.id, durableExecutionId);
|
|
479
478
|
let baseWorkerInput;
|
|
480
479
|
try {
|
|
481
|
-
baseWorkerInput = await managedWorkerInput(job, task, executionContext);
|
|
480
|
+
baseWorkerInput = task.adapter === 'script' ? task.input : await managedWorkerInput(job, task, executionContext);
|
|
482
481
|
}
|
|
483
482
|
catch (error) {
|
|
484
483
|
await this.failLaunch(job.id, task.id, task.executionId, `Execution contract unavailable: ${error instanceof Error ? error.message : String(error)}`);
|
package/dist/relayd-control.js
CHANGED
|
@@ -34,7 +34,7 @@ export function createWorkspaceControl(deps) {
|
|
|
34
34
|
priority: options.priority,
|
|
35
35
|
tag: options.tag,
|
|
36
36
|
reviewEnabled: typeof options.reviewEnabled === 'boolean' ? options.reviewEnabled : undefined,
|
|
37
|
-
|
|
37
|
+
contentOnly: options.contentOnly === true || options.executionMode === 'shortcut',
|
|
38
38
|
continuation: options.continuation,
|
|
39
39
|
reviewerThreadId: typeof options.reviewerThreadId === 'string' ? options.reviewerThreadId : undefined,
|
|
40
40
|
creatorThreadId: typeof options.creatorThreadId === 'string' ? options.creatorThreadId : undefined,
|
package/dist/review-replan.js
CHANGED
|
@@ -25,7 +25,11 @@ export function reviewPlanReady(job) {
|
|
|
25
25
|
return false;
|
|
26
26
|
const latest = (job.plans ?? []).at(-1);
|
|
27
27
|
const legacy = !latest && job.tasks.some(task => task.kind === 'planner' && task.state === 'SUCCEEDED');
|
|
28
|
-
|
|
28
|
+
// A plan-free Graph Job has no Planner round to wait for. Final Review
|
|
29
|
+
// still validates its durable Agent Tasks under the same Job lifecycle.
|
|
30
|
+
if (!legacy && latest && latest.status !== 'SUCCEEDED')
|
|
31
|
+
return false;
|
|
32
|
+
if (!job.tasks.some(task => task.kind !== 'planner' && !isFinalReviewAgent(task.agentName)))
|
|
29
33
|
return false;
|
|
30
34
|
const review = job.review;
|
|
31
35
|
if (!review?.taskId || review.revisionDisposition === 'targeted')
|
package/dist/runtime-status.js
CHANGED
|
@@ -69,6 +69,11 @@ export function deriveJobRuntimeStatus(job, _prState = 'OPEN') {
|
|
|
69
69
|
return 'BLOCKED';
|
|
70
70
|
return 'WAITING'; // External Shortcut Runner has not started or needs a resume.
|
|
71
71
|
}
|
|
72
|
+
// A DAG Coordinator is not a leased worker. Human review waiting takes
|
|
73
|
+
// precedence unless another Agent Task is genuinely running.
|
|
74
|
+
if (job.tasks.some(t => t.state === 'AWAITING_DECISION') &&
|
|
75
|
+
!job.tasks.some(t => t.state === 'RUNNING' && t.executionId !== null && t.leaseOwner))
|
|
76
|
+
return 'WAITING';
|
|
72
77
|
const currentPlan = job.plans?.at(-1);
|
|
73
78
|
// An unresolved planner failure is a Job failure, not an idle Job.
|
|
74
79
|
// Active task execution still takes precedence below.
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
import { once } from 'node:events';
|
|
3
|
+
import { dirname, isAbsolute } from 'node:path';
|
|
4
|
+
import { mkdir, writeFile } from 'node:fs/promises';
|
|
5
|
+
import { pathToFileURL } from 'node:url';
|
|
6
|
+
import { eventFor } from './events.js';
|
|
7
|
+
import { executionEventSource } from './execution-event-identity.js';
|
|
8
|
+
import { discoverShortcut } from './agent-shortcut.js';
|
|
9
|
+
import { spawnOwnedProcess } from './owned-process.js';
|
|
10
|
+
const valid = (value) => {
|
|
11
|
+
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
12
|
+
return false;
|
|
13
|
+
const r = value;
|
|
14
|
+
return r.status === 'COMPLETED' && !!r.output && typeof r.output === 'object' && !Array.isArray(r.output)
|
|
15
|
+
&& (!!r.artifacts && typeof r.artifacts === 'object');
|
|
16
|
+
};
|
|
17
|
+
async function runCommand(args, cwd, signal) {
|
|
18
|
+
if (!args.length || args.some(a => typeof a !== 'string' || !a))
|
|
19
|
+
throw Error('Script command requires an argv vector');
|
|
20
|
+
const child = spawnOwnedProcess(args[0], args.slice(1), { invocation: 'dag.script-command', signal, spawn: { cwd, stdio: ['ignore', 'pipe', 'pipe'] } });
|
|
21
|
+
let stdout = '', stderr = '';
|
|
22
|
+
child.stdout?.on('data', c => { stdout += String(c); });
|
|
23
|
+
child.stderr?.on('data', c => { stderr += String(c); });
|
|
24
|
+
const [code] = await once(child, 'close');
|
|
25
|
+
return { stdout, stderr, code: code ?? -1 };
|
|
26
|
+
}
|
|
27
|
+
/** Script is just another Task Worker Adapter. It publishes exactly the same
|
|
28
|
+
* execution-scoped Task lifecycle events as a Model Worker. */
|
|
29
|
+
export class ScriptTaskAdapter {
|
|
30
|
+
onEvent;
|
|
31
|
+
roots;
|
|
32
|
+
name = 'script';
|
|
33
|
+
id = 'script';
|
|
34
|
+
capabilities = ['script'];
|
|
35
|
+
constructor(onEvent, roots = {}) {
|
|
36
|
+
this.onEvent = onEvent;
|
|
37
|
+
this.roots = roots;
|
|
38
|
+
}
|
|
39
|
+
launch(task, signal, context = {}) {
|
|
40
|
+
const dag = task.dagNode;
|
|
41
|
+
if ((dag && dag.executor !== 'script') || !task.executionId || !task.jobId || !task.agentName)
|
|
42
|
+
throw Error('Script Adapter requires a leased Agent Task');
|
|
43
|
+
if (task.output?.kind !== 'file' || !isAbsolute(task.output.path))
|
|
44
|
+
throw Error('Script Task requires absolute file output');
|
|
45
|
+
const outputPath = task.output.path;
|
|
46
|
+
const executionId = task.executionId;
|
|
47
|
+
const executionAbort = new AbortController();
|
|
48
|
+
const forwardAbort = () => executionAbort.abort(signal.reason ?? new Error('Script Task cancelled'));
|
|
49
|
+
if (signal.aborted)
|
|
50
|
+
forwardAbort();
|
|
51
|
+
else
|
|
52
|
+
signal.addEventListener('abort', forwardAbort, { once: true });
|
|
53
|
+
const source = { id: executionEventSource(task.jobId, task.id, executionId), agent: task.agentName, component: 'agents-relay' };
|
|
54
|
+
const send = async (type, status, message, data = {}) => {
|
|
55
|
+
await this.onEvent(eventFor(task.jobId, task.id, task.parentTaskId, type, status, message, 'orchestrator', data, source));
|
|
56
|
+
};
|
|
57
|
+
const promise = (async () => {
|
|
58
|
+
let stage = 'running';
|
|
59
|
+
try {
|
|
60
|
+
let input;
|
|
61
|
+
if (dag) {
|
|
62
|
+
input = JSON.parse(task.input);
|
|
63
|
+
if (input.source !== 'relay-dag-task' || input.nodeId !== dag.nodeId || input.taskId && input.taskId !== task.id)
|
|
64
|
+
throw Error('Script Task is not bound to its declared DAG node');
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
let parsed;
|
|
68
|
+
try {
|
|
69
|
+
parsed = JSON.parse(task.input);
|
|
70
|
+
}
|
|
71
|
+
catch { }
|
|
72
|
+
input = parsed && typeof parsed === 'object' && !Array.isArray(parsed) ? parsed : { taskInput: task.input };
|
|
73
|
+
input = { ...input, source: 'relay-agent-task', taskId: task.id, outputPath };
|
|
74
|
+
}
|
|
75
|
+
const projectPath = context.executionContext?.project.path ?? input.projectPath;
|
|
76
|
+
if (typeof projectPath !== 'string' || !isAbsolute(projectPath))
|
|
77
|
+
throw Error('No trusted Script Project context');
|
|
78
|
+
const script = await discoverShortcut(task.agentName, projectPath, this.roots.sharedRoot ?? undefined, this.roots.workspaceRoot ?? undefined, this.roots.globalRoot ?? undefined);
|
|
79
|
+
if (!script)
|
|
80
|
+
throw Error(`Declared Agent Shortcut is unavailable: ${task.agentName}`);
|
|
81
|
+
await send('task.started', 'running', 'Script Worker started');
|
|
82
|
+
const module = await import(pathToFileURL(script).href);
|
|
83
|
+
if (typeof module.run !== 'function')
|
|
84
|
+
throw Error('Agent Shortcut must export run(context)');
|
|
85
|
+
const invocation = task.interactiveInvocation;
|
|
86
|
+
const review = invocation?.decidedAt && ['approved', 'changes_requested'].includes(invocation.status)
|
|
87
|
+
? { status: invocation.status, revision: invocation.revision, invocationId: invocation.invocationId, feedback: invocation.feedback, comments: invocation.comments } : undefined;
|
|
88
|
+
if (executionAbort.signal.aborted)
|
|
89
|
+
throw executionAbort.signal.reason;
|
|
90
|
+
const result = await Promise.race([module.run({ input: { ...input, jobId: task.jobId, taskId: task.id, executionId,
|
|
91
|
+
...(review ? { reviewDecision: review } : {}) }, signal,
|
|
92
|
+
runCommand: (args, cwd) => runCommand(args, cwd, executionAbort.signal) }), new Promise((_resolve, reject) => {
|
|
93
|
+
if (executionAbort.signal.aborted)
|
|
94
|
+
reject(executionAbort.signal.reason);
|
|
95
|
+
else
|
|
96
|
+
executionAbort.signal.addEventListener('abort', () => reject(executionAbort.signal.reason), { once: true });
|
|
97
|
+
})]);
|
|
98
|
+
if (result && typeof result === 'object' && result.status === 'WAITING_REVIEW') {
|
|
99
|
+
stage = 'waiting';
|
|
100
|
+
return { summary: 'Script Task waiting for authorized human review' };
|
|
101
|
+
}
|
|
102
|
+
if (!valid(result))
|
|
103
|
+
throw Error('Script Worker did not return a completed artifact contract');
|
|
104
|
+
await mkdir(dirname(outputPath), { recursive: true, mode: 0o700 });
|
|
105
|
+
await writeFile(outputPath, JSON.stringify(result, null, 2) + '\n');
|
|
106
|
+
await send('task.completed', 'succeeded', 'Script Worker completed', { status: 'COMPLETED', output: result.output, artifacts: result.artifacts });
|
|
107
|
+
stage = 'completed';
|
|
108
|
+
return { summary: 'Script Task completed' };
|
|
109
|
+
}
|
|
110
|
+
catch (error) {
|
|
111
|
+
if (!executionAbort.signal.aborted && stage === 'running')
|
|
112
|
+
await send('task.failed', 'failed', error instanceof Error ? error.message : String(error), { reason: 'script_execution_failed' });
|
|
113
|
+
throw error;
|
|
114
|
+
}
|
|
115
|
+
})().finally(() => signal.removeEventListener('abort', forwardAbort));
|
|
116
|
+
return { id: randomUUID(), promise, cancel: () => executionAbort.abort(new Error('Script Task cancelled')) };
|
|
117
|
+
}
|
|
118
|
+
}
|
|
@@ -5,7 +5,7 @@ import { WORKFLOW_EFFECT_NAMES, WORKFLOW_EVENT_NAMES, WORKFLOW_MUTATION_NAMES, }
|
|
|
5
5
|
const TASK_STATES = ['DRAFT', 'QUEUED', 'RUNNING', 'AWAITING_DECISION', 'BLOCKED', 'SUCCEEDED', 'FAILED', 'CANCELLED'];
|
|
6
6
|
const JOB_STATES = ['DRAFT', 'ACTIVE', 'COMPLETED', 'CANCELLED'];
|
|
7
7
|
const conditionRegistry = new ConditionRegistry([
|
|
8
|
-
...new Set(['dependenciesSatisfied', 'dependenciesUnsatisfied', 'runnable', 'dispatchable', 'recoverableExecution', 'troubleshooterRecovery', 'troubleshooterTask', 'awaitingInteractiveDecision', 'retryAvailable', 'notMerged', 'autoMerge', 'prOpen', 'reviewDisabled', 'implementationComplete', 'headAvailable', 'mergeCapable', 'localCompletionAllowed', 'localMergeReady', 'shortcutCompletionAllowed'])
|
|
8
|
+
...new Set(['dependenciesSatisfied', 'dependenciesUnsatisfied', 'runnable', 'dispatchable', 'recoverableExecution', 'troubleshooterRecovery', 'troubleshooterTask', 'awaitingInteractiveDecision', 'retryAvailable', 'notMerged', 'autoMerge', 'prOpen', 'reviewDisabled', 'implementationComplete', 'headAvailable', 'mergeCapable', 'localCompletionAllowed', 'localMergeReady', 'shortcutCompletionAllowed', 'contentCompletionAllowed'])
|
|
9
9
|
].map(booleanCondition));
|
|
10
10
|
const boolGuard = (name) => conditionRegistry.guard(name);
|
|
11
11
|
export const lifecycleConditions = conditionRegistry;
|
|
@@ -64,6 +64,7 @@ export const jobLifecycleV2 = load('job-lifecycle', JOB_STATES, {
|
|
|
64
64
|
&& values.reviewHeadCurrent === true && values.mergeAttemptReady === true;
|
|
65
65
|
},
|
|
66
66
|
shortcutCompletionAllowed: facts => facts.durableFacts.shortcutCompletionAllowed === true,
|
|
67
|
+
contentCompletionAllowed: facts => facts.durableFacts.contentCompletionAllowed === true,
|
|
67
68
|
});
|
|
68
69
|
function topologyTargets(graph, from) {
|
|
69
70
|
const source = [...graph.nodes.values()].find(node => node.kind === 'state' && node.semanticId === from);
|
|
@@ -7,7 +7,7 @@ const source = readFileSync(new URL('../../workflow/planner-orchestration.mmd',
|
|
|
7
7
|
const boolGuard = (name) => (facts) => facts.durableFacts[name] === true;
|
|
8
8
|
export const plannerOrchestrationV2 = new GraphRuntime(source, {
|
|
9
9
|
states: new Set([
|
|
10
|
-
'idle', 'check_legacy_pending', 'check_recover', 'check_plan_failure', 'check_plan_recovery', 'check_plan_recovery_exists', 'check_seed', 'check_planner', 'check_resolution_ownership',
|
|
10
|
+
'idle', 'check_legacy_pending', 'check_recover', 'check_plan_failure', 'check_plan_recovery', 'check_plan_recovery_exists', 'check_seed', 'check_planner_opt_in', 'check_planner', 'check_resolution_ownership',
|
|
11
11
|
'check_blocked', 'check_work', 'check_materialized', 'check_review', 'wait', 'recovered', 'created',
|
|
12
12
|
]),
|
|
13
13
|
guards: {
|
|
@@ -17,6 +17,7 @@ export const plannerOrchestrationV2 = new GraphRuntime(source, {
|
|
|
17
17
|
planRecoveryExists: boolGuard('planRecoveryExists'),
|
|
18
18
|
planRecoveryVerified: boolGuard('planRecoveryVerified'),
|
|
19
19
|
hasSeedWork: boolGuard('hasSeedWork'),
|
|
20
|
+
planningRequested: boolGuard('planningRequested'),
|
|
20
21
|
noActivePlanner: boolGuard('noActivePlanner'),
|
|
21
22
|
resolutionOwnedByTroubleshooter: boolGuard('resolutionOwnedByTroubleshooter'),
|
|
22
23
|
noBlockedWork: boolGuard('noBlockedWork'),
|
|
@@ -61,6 +62,7 @@ export function plannerOrchestrationFacts(job, recoverablePendingPlan) {
|
|
|
61
62
|
planRecoveryExists: Boolean(recovery),
|
|
62
63
|
planRecoveryVerified: recoveryVerified,
|
|
63
64
|
hasSeedWork: !((job.plans?.length ?? 0) === 0 && job.tasks.filter(task => task.kind !== 'planner').length === 0),
|
|
65
|
+
planningRequested: Boolean(job.initialPlanning || scopedPlans.length || scopedTasks.some(task => task.kind === 'planner') || !scopedTasks.some(task => Boolean(task.agentGraph)) || reviewNeedsReplan(job)),
|
|
64
66
|
noActivePlanner: failedPlan?.manualPlanning ? false : unblockNeedsNewPlan(job) || !unconsumedUnblockTrigger(job) ? !scopedPlans.some(plan => plan.status === 'PLANNING') : false,
|
|
65
67
|
noBlockedWork: Boolean(unconsumedUnblockTrigger(job)) || !scopedTasks.some(task => task.kind !== 'planner' && isEffectivelyBlocked(task)),
|
|
66
68
|
noActiveImplementation: !scopedTasks.some(task => task.kind !== 'planner' && (['QUEUED', 'RUNNING', 'AWAITING_DECISION'].includes(task.state) || (task.state === 'DRAFT' && !task.unblock))),
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "agents-relay",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.254",
|
|
4
4
|
"description": "Durable async agent jobs coordinated through GitHub pull requests",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -16,9 +16,9 @@
|
|
|
16
16
|
"test": "npm run test:full",
|
|
17
17
|
"test:chatgpt-temp-quality": "AGENTS_RELAY_RUN_CHATGPT_TEMP_QUALITY=1 sh -c \"npm run build && node test/quality/run-temporary-chat.mjs\"",
|
|
18
18
|
"dev": "tsx src/cli.ts",
|
|
19
|
-
"test:publish": "npm run build && node --import ./test/test-store-env.mjs --test --test-concurrency=1 --test-force-exit test/*.test.js test/verification/l3-shortcut-review.test.mjs",
|
|
20
|
-
"test:l3:shortcut": "npm run build && node --import ./test/test-store-env.mjs --test --test-concurrency=1 test/verification/l3-shortcut-review.test.mjs",
|
|
21
|
-
"test:shortcut:dags": "npm run build && node --import ./test/test-store-env.mjs --test --test-concurrency=1 test/verification/shortcut-dag-matrix.test.mjs test/verification/l3-shortcut-review.test.mjs test/agent-shortcut.test.js",
|
|
19
|
+
"test:publish": "npm run build && node --import ./test/test-store-env.mjs --test --test-concurrency=1 --test-force-exit test/*.test.js test/verification/l3-shortcut-review.test.mjs test/verification/l3-unified-dag.test.mjs",
|
|
20
|
+
"test:l3:shortcut": "npm run build && node --import ./test/test-store-env.mjs --test --test-concurrency=1 test/verification/l3-shortcut-review.test.mjs test/verification/l3-unified-dag.test.mjs",
|
|
21
|
+
"test:shortcut:dags": "npm run build && node --import ./test/test-store-env.mjs --test --test-concurrency=1 test/verification/shortcut-dag-matrix.test.mjs test/verification/l3-shortcut-review.test.mjs test/verification/l3-unified-dag.test.mjs test/agent-shortcut.test.js",
|
|
22
22
|
"test:fast": "npm run build && node --import ./test/test-store-env.mjs --test --test-concurrency=2 test/workflow-lifecycle.test.js test/workflow-v2-lifecycle-parity.test.js test/workflow-effects.test.js test/relay-store.test.js test/local-authority.test.js test/local-jobid-routing.test.js test/interactive-request.test.js test/local-sqlite-jobid.test.js test/no-github.test.js test/reconcile-coordinator.test.js test/service-publication.test.js test/github-webhook.test.js test/verification/shortcut-dag-matrix.test.mjs",
|
|
23
23
|
"test:full": "npm run build && node --import ./test/test-store-env.mjs --test --test-concurrency=1 test/*.test.js test/verification/shortcut-dag-matrix.test.mjs && npm run test:verification:l3",
|
|
24
24
|
"test:verification:l1": "npm run build && node --test test/verification/harness.test.mjs test/verification/contract.test.mjs test/browser-worker-pool-graph.test.js test/verification/graph-inventory.test.mjs test/verification/dashboard-drilldown.test.mjs test/verification/evidence-matrix.test.mjs test/verification/task-resolution-classification.test.mjs test/verification/planner-contract.test.mjs test/verification/force-restate-validation.test.mjs test/planner-child-recovery.test.js",
|