feat: seal isolated worker recovery, parent integration and review console
This commit is contained in:
+16
-7
@@ -13,6 +13,7 @@ import { ModelCenter } from './ModelCenter';
|
||||
import { ProjectMemoryPanel } from './ProjectMemoryPanel';
|
||||
import { SkillCenter } from './SkillCenter';
|
||||
import { McpPanel } from './McpPanel';
|
||||
import { WorkerPanel } from './WorkerPanel';
|
||||
|
||||
const activeStates = ['running', 'awaiting_approval', 'stopping'];
|
||||
const activeMcpStates = ['queued', 'connecting', 'discovering', 'calling', 'closing', 'stopping'];
|
||||
@@ -73,6 +74,7 @@ export default function App() {
|
||||
const [memoryOpen, setMemoryOpen] = useState(false);
|
||||
const [skillsOpen, setSkillsOpen] = useState(false);
|
||||
const [mcpOpen, setMcpOpen] = useState(false);
|
||||
const [workersOpen, setWorkersOpen] = useState(false);
|
||||
const [researchDocs, setResearchDocs] = useState<ResearchDoc[]>([]);
|
||||
const [report, setReport] = useState<{ title: string; content: string } | null>(null);
|
||||
const chatEnd = useRef<HTMLDivElement>(null);
|
||||
@@ -99,8 +101,10 @@ export default function App() {
|
||||
|| session.execution?.researchJobs?.some(value => ['queued', 'connecting', 'analyzing', 'stopping'].includes(value.status)) === true
|
||||
|| session.execution?.engineJobs?.some(value => ['queued', 'starting', 'initializing', 'checking', 'stopping'].includes(value.status)) === true
|
||||
|| session.execution?.mcpJobs?.some(value => activeMcpStates.includes(value.status)) === true
|
||||
|| session.execution?.collaborations?.some(value => ['preparing', 'starting', 'running', 'stopping', 'collecting', 'merge_preparing', 'reconciling'].includes(value.status)) === true
|
||||
|| session.execution?.browserJobs?.some(value => ['queued', 'snapshotting', 'launching', 'running', 'closing'].includes(value.status)) === true);
|
||||
const anyRunning = isRunning || briefs.some(item => activeStates.includes(item.status));
|
||||
const restrictedWorker = !!session?.execution?.workers?.length;
|
||||
const pending = session?.changes.filter(change => ['pending', 'conflict'].includes(change.status)) || [];
|
||||
const reviewedRun = session?.execution?.run;
|
||||
const canContinueReview = !!session && pending.length === 0 && !isRunning
|
||||
@@ -230,6 +234,7 @@ export default function App() {
|
||||
}
|
||||
async function submit() {
|
||||
if (!composer.trim() || sending || isRunning || (sessionId && !session)) return;
|
||||
if (restrictedWorker || session?.execution?.collaborations?.some(value => !['completed', 'discarded', 'resolved_external'].includes(value.status))) { setWorkersOpen(true); return; }
|
||||
if (config.mode === 'compatible' && !config.model) { openSettings(); notify('请先填写模型名称。'); return; }
|
||||
setSending(true);
|
||||
const content = composer.trim();
|
||||
@@ -335,12 +340,14 @@ export default function App() {
|
||||
catch (error) { failure(error); } finally { setDiagnosticsBusy(false); }
|
||||
}
|
||||
async function resumeSession() {
|
||||
if (session?.execution?.workers?.length || session?.execution?.collaborations?.some(value => !['completed', 'discarded', 'resolved_external'].includes(value.status))) { setWorkersOpen(true); return; }
|
||||
if (!session || resuming || isRunning) return;
|
||||
setResuming(true);
|
||||
try { acceptSession(await api<Session>('/sessions/' + session.id + '/resume', {})); }
|
||||
catch (error) { failure(error); } finally { setResuming(false); }
|
||||
}
|
||||
async function continueReviewed() {
|
||||
if (session?.execution?.workers?.length || session?.execution?.collaborations?.some(value => !['completed', 'discarded', 'resolved_external'].includes(value.status))) { setWorkersOpen(true); return; }
|
||||
if (!session || resuming || isRunning) return; setResuming(true);
|
||||
try { acceptSession(await api<Session>('/sessions/' + session.id + '/continue-reviewed', {})); }
|
||||
catch (error) { failure(error); } finally { setResuming(false); }
|
||||
@@ -495,8 +502,8 @@ export default function App() {
|
||||
<aside className="project-sidebar">
|
||||
<div className="brand"><span className="brand-mark">AW</span><div><strong>Agent Workbench</strong><span>本地编程工作台 · 正式版</span></div><IconButton label="收起项目栏" onClick={() => setSidebarOpen(false)}><PanelLeftClose size={16} /></IconButton></div>
|
||||
<div className="project-selector"><span className="field-eyebrow">当前项目</span><div className="project-select-row"><FolderOpen size={17} /><select aria-label="当前项目" value={projectId} onChange={event => chooseProject(event.target.value)}>{projects.map(project => <option key={project.id} value={project.id}>{project.name}{project.id === exampleId ? '(示例)' : ''}</option>)}{!projects.length && <option value="">选择一个项目</option>}</select><IconButton label="打开项目" onClick={() => setProjectOpen(true)}><Plus size={15} /></IconButton></div>{selectedProject && <span className="project-root" title={selectedProject.root}>{selectedProject.root}</span>}{projectId === exampleId && <span className="example-tag">当前为自带示例,可打开自己的项目开始开发</span>}</div>
|
||||
<div className="sidebar-section sessions-section"><div className="section-label"><span>任务会话</span><IconButton label="新建任务" disabled={creatingSession} onClick={() => newSession().catch(failure)}><Plus size={15} /></IconButton></div>
|
||||
<button type="button" className="new-task-button" disabled={creatingSession} onClick={() => newSession().catch(failure)}><Plus size={15} />新建任务<span>↵</span></button>
|
||||
<div className="sidebar-section sessions-section"><div className="section-label"><span>任务会话</span><IconButton label="新建任务" disabled={creatingSession || restrictedWorker} onClick={() => newSession().catch(failure)}><Plus size={15} /></IconButton></div>
|
||||
<button type="button" className="new-task-button" disabled={creatingSession || restrictedWorker} onClick={() => newSession().catch(failure)}><Plus size={15} />新建任务<span>↵</span></button>
|
||||
<div className="session-list">{projectSessions.slice(0, 15).map(item => <div key={item.id} className={'session-item ' + (item.id === sessionId ? 'selected' : '')}>
|
||||
<button type="button" className="session-select" onClick={() => chooseSession(item.id)}><MessageSquare size={14} /><span>{item.title}</span>{item.changeCount > 0 && <b>{item.changeCount}</b>}</button>
|
||||
{!activeStates.includes(item.status) && <IconButton label={'归档会话 ' + item.title} onClick={() => api('/sessions/' + item.id + '/archive', {}).then(() => { if (item.id === selectedSessionRef.current) selectSession(''); }).catch(failure)}><Trash2 size={12} /></IconButton>}
|
||||
@@ -508,7 +515,7 @@ export default function App() {
|
||||
if (file.kind === 'directory') setCollapsed(previous => { const next = new Set(previous); if (next.has(file.path)) next.delete(file.path); else next.add(file.path); return next; }); else loadFile(file.path);
|
||||
}}>{file.kind === 'directory' ? <><span className="tree-chevron">{collapsed.has(file.path) ? <ChevronRight size={11} /> : <ChevronDown size={11} />}</span><Folder size={14} /></> : <><span className="tree-chevron" /><File size={13} /></>}<span>{filter ? file.path : file.name}</span></button>)}{filter && !visibleFiles.length && <p className="sidebar-hint">没有匹配的文件。</p>}</div>
|
||||
</div>
|
||||
<div className="sidebar-footer"><button onClick={openResearch}><BookOpenText size={16} />机制研究与设计<ChevronRight size={13} /></button><button onClick={() => setMemoryOpen(true)} disabled={!selectedProject}><Brain size={16} />项目记忆<ChevronRight size={13} /></button><button onClick={() => openDiagnostics()}><Activity size={16} />运行诊断<ChevronRight size={13} /></button><button onClick={openSettings}><Settings2 size={16} />模型连接<ChevronRight size={13} /></button><div className={'connection ' + (ready ? 'connected' : '')}><span />{ready ? '本地服务已连接' : '正在连接本地服务'}<small>v{version}</small></div></div>
|
||||
<div className="sidebar-footer"><button onClick={openResearch}><BookOpenText size={16} />机制研究与设计<ChevronRight size={13} /></button><button onClick={() => setMemoryOpen(true)} disabled={!selectedProject || restrictedWorker}><Brain size={16} />项目记忆<ChevronRight size={13} /></button><button onClick={() => openDiagnostics()}><Activity size={16} />运行诊断<ChevronRight size={13} /></button><button onClick={openSettings}><Settings2 size={16} />模型连接<ChevronRight size={13} /></button><div className={'connection ' + (ready ? 'connected' : '')}><span />{ready ? '本地服务已连接' : '正在连接本地服务'}<small>v{version}</small></div></div>
|
||||
</aside>
|
||||
<main className="task-pane">
|
||||
<header className="work-header"><div className="work-title">{(!sidebarOpen || mobile) && <IconButton label="展开项目栏" onClick={() => setSidebarOpen(true)}><PanelLeftOpen size={18} /></IconButton>}<span className="header-symbol"><Code2 size={17} /></span><div><span className="header-breadcrumb">{selectedProject?.name || '工作空间'} <ChevronRight size={12} /> 任务</span><h1>{session?.title || '让任务走到完成'}</h1></div></div>
|
||||
@@ -516,11 +523,12 @@ export default function App() {
|
||||
</header>
|
||||
<div className="task-toolbar"><span className="task-local"><GitBranch size={13} />本地项目</span>{session ? <Status value={session.status} /> : <span className="subtle">等待新任务</span>}<div className="toolbar-actions">
|
||||
<IconButton label="运行诊断" onClick={() => openDiagnostics()}><Activity size={15} /></IconButton>
|
||||
<IconButton label="项目技能" onClick={() => setSkillsOpen(true)} disabled={!selectedProject}><BookOpenText size={15} /></IconButton>
|
||||
<IconButton label="项目MCP工具" onClick={() => setMcpOpen(true)} disabled={!selectedProject}><Puzzle size={15} /></IconButton>
|
||||
<IconButton label="项目技能" onClick={() => setSkillsOpen(true)} disabled={!selectedProject || restrictedWorker}><BookOpenText size={15} /></IconButton>
|
||||
<IconButton label="项目MCP工具" onClick={() => setMcpOpen(true)} disabled={!selectedProject || restrictedWorker}><Puzzle size={15} /></IconButton>
|
||||
<IconButton label="查看任务记录" onClick={() => showInspector('task')}><ClipboardCheck size={15} /></IconButton>
|
||||
<IconButton label="本地代理引擎" onClick={() => setEngineOpen(true)} disabled={!session}><Link2 size={15} /></IconButton>
|
||||
<IconButton label="REA 工件研究" onClick={() => void openRea()} disabled={!selectedProject || creatingSession}><BookOpenText size={15} /></IconButton>
|
||||
<IconButton label="隔离协作" onClick={() => setWorkersOpen(true)} disabled={!session}><GitBranch size={15} /></IconButton>
|
||||
<IconButton label="本地代理引擎" onClick={() => setEngineOpen(true)} disabled={!session || restrictedWorker}><Link2 size={15} /></IconButton>
|
||||
<IconButton label="REA 工件研究" onClick={() => void openRea()} disabled={!selectedProject || creatingSession || restrictedWorker}><BookOpenText size={15} /></IconButton>
|
||||
{narrow && <><IconButton label="查看文件" onClick={() => showInspector('file')}><FileCode2 size={16} /></IconButton><IconButton label="查看改动" onClick={() => showInspector('changes')}><GitBranch size={16} /></IconButton><IconButton label="查看执行轨迹" onClick={() => showInspector('trace')}><SquareTerminal size={16} /></IconButton></>}
|
||||
{pending.length > 0 && <button className="text-button review-toolbar" onClick={() => { setChangeId(pending[0].id); showInspector('changes'); }}><FileCode2 size={13} />审核 {pending.length} 项</button>}
|
||||
{session && <><IconButton label="导出会话" onClick={() => exportSession(session.id).catch(failure)}><ArrowDownToLine size={15} /></IconButton>
|
||||
@@ -565,6 +573,7 @@ export default function App() {
|
||||
{memoryOpen && selectedProject && <Modal title="项目记忆" description="项目事实与决策绑定源码指纹,变化后自动要求重新核对。" wide onClose={() => setMemoryOpen(false)}><ProjectMemoryPanel key={selectedProject.id + ':' + (session?.id ?? '')} project={selectedProject} session={session?.projectId === selectedProject.id ? session : null} /></Modal>}
|
||||
{skillsOpen && selectedProject && <Modal title="项目技能" description="管理当前项目的技能来源、版本与启用状态。" wide onClose={() => setSkillsOpen(false)}><SkillCenter key={selectedProject.id} projectId={selectedProject.id} busy={isRunning} /></Modal>}
|
||||
{mcpOpen && selectedProject && <Modal title="项目 MCP 工具" description="实际探测本地 stdio 服务,选择可以请求的工具,并核对每次运行原记录。" wide onClose={() => setMcpOpen(false)}><McpPanel key={selectedProject.id + ':' + (session?.id ?? '')} projectId={selectedProject.id} session={session?.projectId === selectedProject.id ? session : null} busy={isRunning} onSession={acceptSession} onError={session ? failureFor(session) : failure} /></Modal>}
|
||||
{workersOpen && session && <Modal title="隔离协作" description="固定父子目标、独立工作区、预算与原成果审查。" wide onClose={() => setWorkersOpen(false)}><WorkerPanel key={session.id} session={session} config={config} busy={isRunning} onSession={acceptSession} onNavigate={async (projectId, sessionId) => { setWorkersOpen(false); await navigateWorkspace(projectId, sessionId); }} onReview={() => { setWorkersOpen(false); showInspector('changes'); }} /></Modal>}
|
||||
{toast && <div className="toast" role="status"><span>{toast}</span><IconButton label="关闭提示" onClick={() => setToast('')}><X size={14} /></IconButton></div>}
|
||||
</div>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user