Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions internal/runtime/conversation_process.go
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,10 @@ func (p *ConversationProcessPool) Handle(ctx context.Context, root, workspace st
defer stopWrite()
if req.EOF {
err = input.Close()
// Process teardown can close stdin before the caller sends EOF.
if errors.Is(err, os.ErrClosed) {
err = nil
}
} else {
_, err = io.WriteString(input, conversationRemap(req.Data, req.SourceRoot, root))
}
Expand Down
22 changes: 22 additions & 0 deletions internal/runtime/conversation_process_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,28 @@ func TestConversationProcessBidirectionalAndRootFence(t *testing.T) {
}
}

func TestConversationProcessEOFAfterExit(t *testing.T) {
ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
defer cancel()
root := t.TempDir()
pool := &ConversationProcessPool{}
start, err := pool.Handle(ctx, root, "", nil, ConversationProcessRequest{
Operation: "start",
Command: &ConversationCommand{Argv: []string{"sh", "-c", "echo done"}, Interactive: true},
}, nil)
if err != nil {
t.Fatal(err)
}
if output := conversationPoll(t, pool, ctx, root, start.ID); strings.TrimSpace(output) != "done" {
t.Fatalf("finished process output = %q", output)
}
if _, err := pool.Handle(ctx, root, "", nil, ConversationProcessRequest{
Operation: "write", ID: start.ID, EOF: true,
}, nil); err != nil {
t.Fatalf("close stdin after process exit: %v", err)
}
}

func TestConversationCLIVersionPreservesOutputQuota(t *testing.T) {
ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
defer cancel()
Expand Down
27 changes: 21 additions & 6 deletions web/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -737,12 +737,25 @@ function scopedWorkflows(){
return all.filter(w=>!catalogGeneric(w)&&catalogOwned(w.projectId));
}
function catalogAgents(){return (state.data?.agents||[]).filter(a=>catalogVisible(a.projectId,a.shared))}
function projectWorkflowAgent(agent,projectId){
return !!agent.projectId&&(agent.projectId===projectId||agent.shared);
}
function workflowAgents(){
if(catalogGeneric(state.workflow))return state.genericTemplateAgents||[];
const projectId=state.workflow?.projectId||state.projectFilter||'';
return (state.data?.agents||[]).filter(a=>!!a.projectId&&(a.projectId===projectId||(a.shared&&a.projectId!==projectId)));
return (state.data?.agents||[]).filter(a=>projectWorkflowAgent(a,projectId));
}
function workflowAgent(id){return workflowAgents().find(a=>a.id===id)}
async function refreshWorkflowAgents(){
const wf=state.workflow;
if(catalogGeneric(wf))return hydrateGenericWorkflowRoles(wf);
const projectId=wf?.projectId||state.projectFilter;
if(!projectId)return;
const agents=await api('/api/agents?projectId='+encodeURIComponent(projectId),{silent:true});
if(state.workflow!==wf)return;
const ids=new Set(agents.map(a=>a.id));
state.data.agents=(state.data.agents||[]).filter(a=>!projectWorkflowAgent(a,projectId)&&!ids.has(a.id)).concat(agents);
}
function clearGenericTemplateAgents(){state.genericTemplateAgents=[];state.genericTemplateAgentWorkflowId=''}
async function hydrateGenericWorkflowRoles(wf=state.workflow){
if(!catalogGeneric(wf)){
Expand Down Expand Up @@ -1101,7 +1114,7 @@ function bind(){
$('#refreshDashboard').onclick=refreshDashboard;
$('#refreshIssues').onclick=refreshIssues;
$('#refreshSOPs').onclick=refreshWorkflowMetrics;
$('#agentSearch').oninput=renderAgents;$('#agentPrev').onclick=agentWizardPrev;$('#agentNext').onclick=agentWizardNext;$$('[data-wizard-steps="agent"] [data-agent-tab]').forEach(b=>b.onclick=()=>setAgentTab(b.dataset.agentTab));$$('[data-wizard-steps="agent-create"] [data-create-step]').forEach(b=>b.onclick=()=>{if(!b.disabled)setAgentCreateStep(Number(b.dataset.createStep))});bindAgentModalInputs();$$('.agent-close').forEach(b=>b.onclick=()=>$('#agentModal').classList.remove('open'));
$('#agentSearch').oninput=renderAgents;$('#agentPrev').onclick=agentWizardPrev;$('#agentNext').onclick=agentWizardNext;$$('[data-wizard-steps="agent"] [data-agent-tab]').forEach(b=>b.onclick=()=>setAgentTab(b.dataset.agentTab));$$('[data-wizard-steps="agent-create"] [data-create-step]').forEach(b=>b.onclick=()=>{if(!b.disabled)setAgentCreateStep(Number(b.dataset.createStep))});bindAgentModalInputs();$$('.agent-close').forEach(b=>b.onclick=closeAgentWizard);
$('#newRunFromRuns')&&($('#newRunFromRuns').onclick=()=>switchView('issues'));
$('#runSearch').oninput=e=>{state.runQuery=e.target.value.trim().toLowerCase();resetListPage('runs');renderRuns()};
$('#runWorkflowFilter').onchange=e=>{state.runWorkflowFilter=e.target.value;resetListPage('runs');renderRuns()};
Expand Down Expand Up @@ -1307,6 +1320,7 @@ function bind(){
}
const open=[...$$('.modal.open')].pop();
if(open?.id==='scheduleModal')return closeScheduleJobModal();
if(open?.id==='agentModal')return closeAgentWizard();
if(open)return open.classList.remove('open');
const panel=$('#flowSettingsPanel');
if(panel&&!panel.hidden){panel.hidden=true;$('#flowSettingsToggle')?.classList.remove('active');return}
Expand Down Expand Up @@ -1847,14 +1861,14 @@ function applyAssetRoute(){
}
async function applyAgentRoute(){
const id=agentRouteId();
if(!id)return;
if(!id){$('#agentModal')?.classList.remove('open');return}
try{
const agent=await api(`/api/agents/${encodeURIComponent(id)}`);
if(agentRouteId()!==id||activeViewName()!=='agents')return;
const index=(state.data.agents||[]).findIndex(a=>a.id===id);
if(index>=0)state.data.agents[index]=agent;else state.data.agents.push(agent);
openAgentWizard(agent);
}catch(error){toast(error.message,'err')}
openAgentWizard(agent,routePart(2)==='gov'?3:1,{loaded:true});
}catch(error){if(agentRouteId()===id)toast(error.message,'err')}
}
// Only SOPs visible in the active project can be restored from the URL or localStorage.
function openableWorkflow(id){return id?catalogWorkflows().find(w=>w.id===id)||null:null}
Expand Down Expand Up @@ -1902,7 +1916,7 @@ function persistView(name,push=false){
if(linked)next=runViewHash(linked);
}
if(name==='flow')next=flowViewHash();
if(name==='agents'&&agentRouteId())next=`#/agents/${encodeURIComponent(agentRouteId())}`;
if(name==='agents'&&agentRouteId())next=`#/agents/${encodeURIComponent(agentRouteId())}${routePart(2)==='gov'?'/gov':''}`;
if(isProjectSharedAsset(name)&&routePart(0)===name&&assetRouteId())next=`#/${name}/${encodeURIComponent(assetRouteId())}`;
if(name==='projects')next=projectAdminHash(state.projectAdminDetailId||'',state.projectAdminTab);
if(name==='collaboration'){
Expand Down Expand Up @@ -1932,6 +1946,7 @@ function switchView(name){
// 手敲 #/platform 或者从别的账号留下的 localStorage 恢复进来,都要挡住。
if(name==='platform'&&!isPlatformAdmin())name='collaboration';
const previous=activeViewName();
if(previous==='agents'&&name!=='agents')$('#agentModal')?.classList.remove('open');
if(!settingsRouteApplying){
const crossingSettings=previous!==name&&((previous==='collaboration'&&isSettingsManagementView(name))||(isSettingsManagementView(previous)&&name==='collaboration'));
if(crossingSettings&&!settingsRouteMotion.matches){startSettingsRouteTransition(name);return}
Expand Down
10 changes: 7 additions & 3 deletions web/app/agents.js
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,11 @@ function setAgentModalMode(mode){
state.agentModalMode=mode==='create'?'create':'edit';
const f=$('#agentForm');if(f)f.dataset.agentMode=state.agentModalMode;
}
function openAgentWizard(agent=null,initialStep=1){
function closeAgentWizard(){
$('#agentModal').classList.remove('open');
if(agentRouteId())history.replaceState(null,'','#/agents');
}
function openAgentWizard(agent=null,initialStep=1,{loaded=false}={}){
const open=a=>{
const presetHost=$('#agentPresetHost');if(presetHost)presetHost.dataset.ready='';
setAgentModalMode(a?.id?'edit':'create');
Expand All @@ -295,7 +299,7 @@ function openAgentWizard(agent=null,initialStep=1){
syncAgentTabIndicators();requestAnimationFrame(()=>syncAgentTabIndicators());
if(catalogGeneric(state.workflow))loadMCPMarket().then(()=>{const current=workflowAgent(state.selectedAgent)||state.agentDraft||a;if(current){renderAgentAssetsPanel(current);renderAgentSummary()}});
};
if(agent?.id && !agent.prompt){
if(agent?.id && !agent.prompt && !loaded && !catalogGeneric(state.workflow)){
api(`/api/agents/${encodeURIComponent(agent.id)}`).then(full=>{const i=state.data.agents.findIndex(x=>x.id===full.id);if(i>=0)state.data.agents[i]=full;open(full)}).catch(e=>{toast(e.message,'err');open(agent)});
return;
}
Expand Down Expand Up @@ -440,7 +444,7 @@ async function persistAgent(f){
// MR gates are checked by the platform and carry no commands; every other
// gate is saved as a command gate and dropped while it has no command.
function agentGatesForSave(gates){return (gates||[]).map((gate,i)=>{const base={id:gate.id||`gate-${i+1}`,name:gate.name||`门禁 ${i+1}`,stage:'after_execution',required:true,onFailure:['loop','reject','fail','human'].includes(gate.onFailure)?gate.onFailure:'loop'};return gate.mode==='mr'?{...base,mode:'mr'}:{...base,mode:'command',commands:(gate.commands||[]).map(c=>String(c||'').trim()).filter(Boolean),executionScope:gate.executionScope==='repositories'?'repositories':'run'}}).filter(g=>g.mode==='mr'||g.commands.length)}
async function persistAgentRequest(f,creating){const existing=state.data.agents.find(a=>a.id===f.elements.id.value);if(!catalogGeneric(state.workflow)&&existing&&catalogForeign(existing.projectId))return toast('这是其他项目的共享角色,请先复制到本项目再改');const checked=name=>[...f.querySelectorAll(`input[name="${name}"]:checked`)].map(x=>x.value);const draft=readAgentDraft(f);const artifacts=draft.artifactOutputs.map((x,i)=>({name:x.name||`artifact-${i+1}`,path:x.path||'result.md',mediaType:x.path?.endsWith('.json')?'application/json':(x.mediaType||'text/markdown'),required:!!x.required})),verification=agentGatesForSave(draft.verification),hooks=(draft.hooks||[]).map((h,i)=>({id:String(h.id||`hook-${i+1}`).trim(),name:String(h.name||`Hook ${i+1}`).trim(),event:h.event||'PreToolUse',matcher:String(h.matcher||'').trim(),language:h.language==='python'?'python':'shell',script:String(h.script||'').trim(),timeoutSec:Number(h.timeoutSec)||10,executionScope:h.executionScope==='repositories'?'repositories':'run'})).filter(h=>h.script),interventions=[];if(f.elements.interventionAfter?.checked)interventions.push({id:'human-review',name:'人工结果复核',stage:'after_execution',required:true});if(f.elements.interventionPublish?.checked)interventions.push({id:'publish-approval',name:'产物发布确认',stage:'before_publish',required:true});const a={id:f.elements.id.value.trim(),name:f.elements.name.value.trim(),version:(existing?.version||0)+1,projectId:existing?(existing.projectId||state.projectFilter||''):(state.projectFilter||''),shared:!!f.elements.shared?.checked,description:f.elements.description.value,prompt:draft.prompt,executorId:f.elements.executorId?.value||'',model:agentEffectiveModel(f),effort:f.elements.effort?.value||'',rules:checked('rules'),skills:checked('skills'),mcpServers:checked('mcpServers'),platformMcp:!!f.elements.platformMcp?.checked,knowledgeBase:!!f.elements.knowledgeBase?.checked,hooks,loop:{enabled:!!f.elements.loopEnabled?.checked,maxIterations:Number(f.elements.loopMaxIterations?.value)||1,exitCondition:'all_gates_pass',onExhausted:f.elements.loopOnExhausted?.value||'fail',feedbackPrompt:f.elements.loopFeedbackPrompt?.value||''},interventions,artifactOutputs:artifacts,verification};if(!a.id||!a.name)return toast('标识和名称不能为空');if(catalogGeneric(state.workflow)){if(!isPlatformAdmin())return toast('只有平台管理员可以编辑通用模板角色');const bundled=workflowAgent(a.id);if(!bundled)return toast('该角色不属于当前通用模板');a.projectId='';a.shared=false;a.rules=bundled.rules||[];a.skills=bundled.skills||[];a.mcpServers=f.querySelectorAll('input[name="mcpServers"]').length?checked('mcpServers'):(bundled.mcpServers||[]);a.hooks=Array.isArray(bundled.hooks)?bundled.hooks:a.hooks;a.version=bundled.version||0;try{const saved=await api(`/api/workflows/${encodeURIComponent(state.workflow.id)}/agents`,{method:'PUT',body:JSON.stringify(a)});const list=state.genericTemplateAgents||[];const gi=list.findIndex(x=>x.id===saved.id);if(gi>=0)list[gi]=saved;else list.push(saved);state.genericTemplateAgents=list;state.selectedAgent=saved.id;state.agentDraft=null;$('#agentModal').classList.remove('open');renderCanvas();renderProperties();toast('通用模板角色已保存,所有项目下次运行生效');}catch(err){toast(err.message)}return;}try{await api('/api/agents',{method:'PUT',body:JSON.stringify(a)});const i=state.data.agents.findIndex(x=>x.id===a.id);if(i>=0)state.data.agents[i]=a;else state.data.agents.push(a);if(a.shared){(state.data.rules||[]).forEach(item=>{if(a.rules.includes(item.id)&&item.projectId===a.projectId)item.shared=true});(state.data.skills||[]).forEach(item=>{if(a.skills.includes(item.id)&&item.projectId===a.projectId)item.shared=true})}state.selectedAgent=a.id;state.agentDraft=null;if(creating){state.agentScope='project';renderAgents();renderCanvas();toast('Agent 新版本已保存');showCreatedAgent(a);return a}$('#agentModal').classList.remove('open');renderAgents();renderCanvas();toast('Agent 新版本已保存');return a}catch(err){toast(err.message)}return null}
async function persistAgentRequest(f,creating){const existing=state.data.agents.find(a=>a.id===f.elements.id.value);if(!catalogGeneric(state.workflow)&&existing&&catalogForeign(existing.projectId))return toast('这是其他项目的共享角色,请先复制到本项目再改');const checked=name=>[...f.querySelectorAll(`input[name="${name}"]:checked`)].map(x=>x.value);const draft=readAgentDraft(f);const artifacts=draft.artifactOutputs.map((x,i)=>({name:x.name||`artifact-${i+1}`,path:x.path||'result.md',mediaType:x.path?.endsWith('.json')?'application/json':(x.mediaType||'text/markdown'),required:!!x.required})),verification=agentGatesForSave(draft.verification),hooks=(draft.hooks||[]).map((h,i)=>({id:String(h.id||`hook-${i+1}`).trim(),name:String(h.name||`Hook ${i+1}`).trim(),event:h.event||'PreToolUse',matcher:String(h.matcher||'').trim(),language:h.language==='python'?'python':'shell',script:String(h.script||'').trim(),timeoutSec:Number(h.timeoutSec)||10,executionScope:h.executionScope==='repositories'?'repositories':'run'})).filter(h=>h.script),interventions=[];if(f.elements.interventionAfter?.checked)interventions.push({id:'human-review',name:'人工结果复核',stage:'after_execution',required:true});if(f.elements.interventionPublish?.checked)interventions.push({id:'publish-approval',name:'产物发布确认',stage:'before_publish',required:true});const a={id:f.elements.id.value.trim(),name:f.elements.name.value.trim(),version:(existing?.version||0)+1,projectId:existing?(existing.projectId||state.projectFilter||''):(state.projectFilter||''),shared:!!f.elements.shared?.checked,description:f.elements.description.value,prompt:draft.prompt,executorId:f.elements.executorId?.value||'',model:agentEffectiveModel(f),effort:f.elements.effort?.value||'',rules:checked('rules'),skills:checked('skills'),mcpServers:checked('mcpServers'),platformMcp:!!f.elements.platformMcp?.checked,knowledgeBase:!!f.elements.knowledgeBase?.checked,hooks,loop:{enabled:!!f.elements.loopEnabled?.checked,maxIterations:Number(f.elements.loopMaxIterations?.value)||1,exitCondition:'all_gates_pass',onExhausted:f.elements.loopOnExhausted?.value||'fail',feedbackPrompt:f.elements.loopFeedbackPrompt?.value||''},interventions,artifactOutputs:artifacts,verification};if(!a.id||!a.name)return toast('标识和名称不能为空');if(catalogGeneric(state.workflow)){if(!isPlatformAdmin())return toast('只有平台管理员可以编辑通用模板角色');const bundled=workflowAgent(a.id);if(!bundled)return toast('该角色不属于当前通用模板');a.projectId='';a.shared=false;a.rules=bundled.rules||[];a.skills=bundled.skills||[];a.mcpServers=f.querySelectorAll('input[name="mcpServers"]').length?checked('mcpServers'):(bundled.mcpServers||[]);a.hooks=Array.isArray(bundled.hooks)?bundled.hooks:a.hooks;a.version=bundled.version||0;try{const saved=await api(`/api/workflows/${encodeURIComponent(state.workflow.id)}/agents`,{method:'PUT',body:JSON.stringify(a)});const list=state.genericTemplateAgents||[];const gi=list.findIndex(x=>x.id===saved.id);if(gi>=0)list[gi]=saved;else list.push(saved);state.genericTemplateAgents=list;state.selectedAgent=saved.id;state.agentDraft=null;$('#agentModal').classList.remove('open');renderCanvas();renderProperties();toast('通用模板角色已保存,所有项目下次运行生效');}catch(err){toast(err.message)}return;}try{await api('/api/agents',{method:'PUT',body:JSON.stringify(a)});const i=state.data.agents.findIndex(x=>x.id===a.id);if(i>=0)state.data.agents[i]=a;else state.data.agents.push(a);if(a.shared){(state.data.rules||[]).forEach(item=>{if(a.rules.includes(item.id)&&item.projectId===a.projectId)item.shared=true});(state.data.skills||[]).forEach(item=>{if(a.skills.includes(item.id)&&item.projectId===a.projectId)item.shared=true})}state.selectedAgent=a.id;state.agentDraft=null;if(creating){state.agentScope='project';renderAgents();renderWorkflowMeta();renderCanvas();toast('Agent 新版本已保存');showCreatedAgent(a);return a}closeAgentWizard();renderAgents();renderCanvas();toast('Agent 新版本已保存');return a}catch(err){toast(err.message)}return null}
async function deleteAgent(id){
const a=(state.data.agents||[]).find(x=>x.id===id);
if(!a)return toast('角色不存在或已删除');
Expand Down
2 changes: 2 additions & 0 deletions web/app/flow-canvas.css
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,8 @@ html[data-theme="dark"] #flowView .fd-toast button{background:rgba(0,0,0,.06);co
#aiOrchestrator textarea::placeholder{color:var(--hui-tertiary)}
#aiOrchestrator textarea:focus{outline:0;box-shadow:none}
#aiOrchestrator .ai-orchestrator-toolbar{display:flex;align-items:center;justify-content:space-between;gap:6px;min-width:0}
/* Keep the floating feedback control clear of the send button. */
body:has(.fb-fab:not(.gone):not(.is-hidden)) #aiOrchestrator .ai-orchestrator-toolbar{padding-inline-end:52px}
#aiOrchestrator .ai-orchestrator-runtime{display:flex;align-items:center;gap:2px;flex:1;min-width:0}
#aiOrchestrator .ai-orchestrator-picker{min-width:0;flex:1}
#aiOrchestrator #aiOrchestratorCLIPicker{flex:0 1 116px}
Expand Down
Loading
Loading