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>
|
||||
);
|
||||
|
||||
@@ -0,0 +1,58 @@
|
||||
.worker-console { --worker-ink: #153047; --worker-muted: #587087; --worker-line: #c7d3de; --worker-blue: #2560a3; --worker-wash: #edf3fa; --worker-alert: #925619; color: var(--worker-ink); font-family: 'Segoe UI', 'Microsoft YaHei', sans-serif; display: grid; gap: 20px; min-width: 0; }
|
||||
.worker-console h2, .worker-console h3, .worker-console p { margin: 0; }
|
||||
.worker-console h2 { font-size: 21px; line-height: 1.4; font-weight: 650; letter-spacing: -.3px; }
|
||||
.worker-console h3 { font-size: 16px; line-height: 1.5; }
|
||||
.worker-console p { line-height: 1.65; }
|
||||
.worker-console code { font-family: 'Cascadia Code', Consolas, monospace; font-size: 12px; overflow-wrap: anywhere; }
|
||||
.worker-console-heading { display: flex; align-items: flex-start; justify-content: space-between; gap: 16px; }
|
||||
.worker-console-heading p:not(.worker-eyebrow) { color: var(--worker-muted); margin-top: 5px; font-size: 13px; }
|
||||
.worker-console .worker-eyebrow { color: var(--worker-blue); font-size: 11px; letter-spacing: .08em; font-weight: 650; margin-bottom: 5px; }
|
||||
.worker-error { padding: 12px 15px; border: 1px solid #dfc4a7; border-left: 3px solid var(--worker-alert); background: #fff8ee; color: #794d21; overflow-wrap: anywhere; font-size: 13px; }
|
||||
.worker-history { display: grid; grid-template-columns: auto minmax(0, 1fr); align-items: center; gap: 12px; font-size: 12px; color: var(--worker-muted); }
|
||||
.worker-console input, .worker-console textarea, .worker-console select { width: 100%; border: 1px solid var(--worker-line); border-radius: 5px; background: #fff; padding: 9px 10px; color: var(--worker-ink); font-size: 13px; font-family: inherit; min-width: 0; }
|
||||
.worker-console textarea { resize: vertical; line-height: 1.6; }
|
||||
.worker-console input:focus-visible, .worker-console textarea:focus-visible, .worker-console select:focus-visible, .worker-console button:focus-visible { outline: 2px solid var(--worker-blue); outline-offset: 3px; }
|
||||
.worker-plan-form { display: grid; gap: 18px; }
|
||||
.worker-plan-form label { display: grid; gap: 7px; font-size: 12px; font-weight: 600; }
|
||||
.worker-lanes { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); gap: 14px; align-items: stretch; }
|
||||
.worker-lanes fieldset { border: 1px solid var(--worker-line); border-top: 3px solid var(--worker-blue); border-radius: 6px; padding: 16px; display: grid; gap: 13px; min-width: 0; }
|
||||
.worker-lanes legend { padding: 0 8px; font-size: 12px; color: var(--worker-muted); }
|
||||
.worker-budget-form { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 12px; }
|
||||
.worker-parent { border: 1px solid var(--worker-line); background: var(--worker-wash); border-radius: 6px; padding: 18px 20px; display: grid; gap: 12px; }
|
||||
.worker-parent-top { display: flex; justify-content: space-between; align-items: center; gap: 12px; flex-wrap: wrap; }
|
||||
.worker-parent h3, .worker-goal { overflow-wrap: anywhere; white-space: pre-wrap; }
|
||||
.worker-parent > p { font-size: 13px; color: var(--worker-muted); }
|
||||
.worker-parent dl { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); gap: 12px 18px; border-top: 1px solid var(--worker-line); padding-top: 12px; margin: 0; }
|
||||
.worker-parent dl div { min-width: 0; }
|
||||
.worker-parent dt { font-size: 11px; color: var(--worker-muted); margin-bottom: 4px; }
|
||||
.worker-parent dd { font-size: 12px; margin: 0; overflow-wrap: anywhere; }
|
||||
.worker-lane { border: 1px solid var(--worker-line); border-top: 3px solid var(--worker-blue); border-radius: 6px; padding: 16px; background: #fff; display: flex; flex-direction: column; gap: 12px; min-width: 0; }
|
||||
.worker-lane-title { display: flex; align-items: center; justify-content: space-between; gap: 8px; font-size: 11px; color: var(--worker-muted); }
|
||||
.worker-status { display: inline-flex; align-items: center; background: #e2ecf6; color: var(--worker-blue); border: 1px solid #c2d5e8; border-radius: 3px; padding: 3px 7px; font-size: 11px; line-height: 1.4; white-space: nowrap; font-weight: 600; }
|
||||
.worker-status.attention { color: var(--worker-alert); border-color: #dec6a8; background: #fff6e9; }
|
||||
.worker-goal { font-size: 13px; flex: 1; }
|
||||
.worker-scope { border-left: 2px solid var(--worker-line); padding-left: 10px; display: grid; gap: 5px; }
|
||||
.worker-scope > span, .worker-meter { font-size: 11px; color: var(--worker-muted); }
|
||||
.worker-summary { color: var(--worker-muted); font-size: 12px; overflow-wrap: anywhere; }
|
||||
.worker-proof { display: flex; align-items: center; gap: 6px; font-size: 11px; color: var(--worker-blue); }
|
||||
.worker-actions { display: flex; gap: 10px; align-items: center; flex-wrap: wrap; }
|
||||
.worker-primary-actions { padding-top: 16px; border-top: 1px solid var(--worker-line); }
|
||||
.worker-console .button { font-size: 12px; min-height: 36px; }
|
||||
.worker-console .worker-stop { background: #fff8ee; border-color: #dfc4a7; color: #794d21; }
|
||||
.worker-review { border-left: 3px solid var(--worker-blue); padding: 2px 0 2px 15px; display: grid; gap: 12px; }
|
||||
.worker-review-title { display: flex; align-items: center; gap: 8px; }
|
||||
.worker-review > p { color: var(--worker-muted); font-size: 12px; }
|
||||
.worker-conflicts { padding: 0; margin: 0; list-style: none; display: grid; gap: 7px; }
|
||||
.worker-conflicts li { display: grid; gap: 4px; padding: 10px; background: #fff8ee; border: 1px solid #dfc4a7; font-size: 12px; overflow-wrap: anywhere; }
|
||||
.worker-note, .worker-boundary { color: var(--worker-muted); font-size: 11px; }
|
||||
.worker-boundary { display: flex; align-items: flex-start; gap: 7px; padding-top: 12px; border-top: 1px solid var(--worker-line); }
|
||||
.worker-boundary svg { flex: 0 0 auto; margin-top: 2px; }
|
||||
.worker-origin { display: flex; gap: 13px; padding: 20px; background: var(--worker-wash); border: 1px solid var(--worker-line); border-radius: 6px; }
|
||||
.worker-origin div { display: grid; gap: 12px; min-width: 0; }
|
||||
.worker-origin p { font-size: 13px; overflow-wrap: anywhere; }
|
||||
.worker-confirm { display: grid; gap: 18px; }
|
||||
.worker-confirm p { line-height: 1.7; font-size: 13px; }
|
||||
.worker-confirm strong { display: block; margin-top: 12px; white-space: pre-wrap; overflow-wrap: anywhere; }
|
||||
.worker-record { display: grid; gap: 12px; min-width: 0; }
|
||||
.worker-record pre { font: 12px/1.6 'Cascadia Code', Consolas, monospace; white-space: pre-wrap; overflow-wrap: anywhere; max-height: 65vh; overflow: auto; padding: 14px; background: #f5f8fb; border: 1px solid #c7d3de; }
|
||||
@media (max-width: 620px) { .worker-console { gap: 16px; } .worker-console h2 { font-size: 18px; } .worker-lanes { grid-template-columns: minmax(0, 1fr); } .worker-budget-form { grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); } .worker-parent { padding: 14px; } .worker-parent dl { grid-template-columns: minmax(0, 1fr); } .worker-actions .button { min-height: 42px; } .worker-console-heading { gap: 10px; } .worker-history { grid-template-columns: minmax(0, 1fr); gap: 6px; } }
|
||||
@@ -0,0 +1,105 @@
|
||||
import { useCallback, useEffect, useRef, useState } from 'react';
|
||||
import { ArrowUpRight, Check, GitBranch, LoaderCircle, Play, RefreshCw, ShieldCheck, Square } from 'lucide-react';
|
||||
import { api, downloadBlob } from './api';
|
||||
import { Modal } from './components';
|
||||
import type { CollaborationGroup, Config, Session, WorkerView } from './types';
|
||||
import './WorkerPanel.css';
|
||||
|
||||
const active = ['preparing', 'starting', 'running', 'stopping', 'collecting', 'merge_preparing', 'reconciling'];
|
||||
const labels: Record<string, string> = { planned: '计划已封存', unprepared: '待创建', partially_prepared: '部分工作区已创建', ready: '就绪', preparing: '创建工作区', starting: '启动中', running: '执行中', stopping: '停止中', collecting: '核对成果', merge_preparing: '准备合并审查', reconciling: '核对现场', completed: '完成', ready_to_collect: '待核对成果', collected: '成果可审查', conflict: '需要处理冲突', merge_prepared: '等待合并审查', failed: '需要处理', paused: '已暂停', awaiting_review: '等待改动审查', needs_review: '等待改动审查', unknown: '结果待核对', stale: '来源已变化', discarded: '计划已撤销', resolved_external: '已保留现场' };
|
||||
const number = (value?: number) => (value ?? 0).toLocaleString('zh-CN');
|
||||
const statusLabel = (value: string) => value === 'awaiting_approval' ? '等待检查审批' : labels[value] ?? value;
|
||||
const splitPaths = (value: string) => value.split(/[\n,,]/).map(path => path.trim()).filter(Boolean);
|
||||
|
||||
export function WorkerPanel({ session, config, busy, onSession, onNavigate, onReview }: {
|
||||
session: Session; config: Config; busy: boolean; onSession: (value: Session) => void;
|
||||
onNavigate: (projectId: string, sessionId: string) => Promise<void>; onReview: () => void;
|
||||
}) {
|
||||
const [view, setView] = useState<WorkerView | null>(null), [selectedId, setSelectedId] = useState('');
|
||||
const [error, setError] = useState(''), [action, setAction] = useState(''), [loading, setLoading] = useState(false);
|
||||
const [goal, setGoal] = useState(''), [creating, setCreating] = useState(false);
|
||||
const [drafts, setDrafts] = useState([{ label: '核心实现', goal: '', paths: '' }, { label: '独立模块', goal: '', paths: '' }]);
|
||||
const [tokens, setTokens] = useState(config.maxRunTokens), [steps, setSteps] = useState(Math.min(200, config.maxSteps * 2));
|
||||
const [duration, setDuration] = useState(Math.floor(config.maxRunDurationMs / 60000)), [toolCalls, setToolCalls] = useState(96);
|
||||
const [confirmation, setConfirmation] = useState<{ group: CollaborationGroup; operation: string; workerId?: string; retain?: boolean } | null>(null);
|
||||
const [preview, setPreview] = useState<{ title: string; content: string; groupId: string } | null>(null), [readEvidenceSha, setReadEvidenceSha] = useState('');
|
||||
const scope = useRef(0), requestId = useRef(0), fetchPending = useRef<number | null>(null), selectedGroup = useRef('');
|
||||
const load = useCallback(async (quiet = false) => {
|
||||
if (fetchPending.current !== null) return;
|
||||
const generation = scope.current, request = ++requestId.current; fetchPending.current = request;
|
||||
if (!quiet) setLoading(true);
|
||||
try { const result = await api<WorkerView>('/sessions/' + session.id + '/collaborations'); if (generation === scope.current && request === requestId.current) setView(result); }
|
||||
catch (failure) { if (generation === scope.current) setError(failure instanceof Error ? failure.message : String(failure)); }
|
||||
finally { if (fetchPending.current === request) fetchPending.current = null; if (generation === scope.current) setLoading(false); }
|
||||
}, [session.id]);
|
||||
useEffect(() => { scope.current++; fetchPending.current = null; setView(null); setSelectedId(''); setCreating(false); void load(); return () => { scope.current++; requestId.current++; }; }, [load]);
|
||||
useEffect(() => { void load(true); }, [session.revision, load]);
|
||||
const group = view?.groups.find(value => value.id === selectedId) ?? view?.groups.at(-1), running = !!group && active.includes(group.status);
|
||||
selectedGroup.current = group?.id ?? '';
|
||||
useEffect(() => { setError(''); setAction(''); setConfirmation(null); setPreview(null); setReadEvidenceSha(''); }, [session.id, group?.id, group?.evidence?.sha256]);
|
||||
useEffect(() => { if (!running) return; const timer = setInterval(() => void load(true), 1500); return () => clearInterval(timer); }, [running, load]);
|
||||
async function execute(group: CollaborationGroup, operation: string, extra: Record<string, unknown> = {}) {
|
||||
if (selectedGroup.current !== group.id) return;
|
||||
const generation = scope.current; setAction(operation); setError(''); setConfirmation(null);
|
||||
try {
|
||||
const result = await api<{ session: Session }>('/sessions/' + session.id + '/collaborations/' + group.id + '/' + operation, { fingerprint: group.fingerprint, ...extra });
|
||||
if (generation !== scope.current || selectedGroup.current !== group.id) return;
|
||||
onSession(result.session); await load(true);
|
||||
} catch (failure) { if (generation === scope.current && selectedGroup.current === group.id) setError(failure instanceof Error ? failure.message : String(failure)); }
|
||||
finally { if (generation === scope.current && selectedGroup.current === group.id) setAction(''); }
|
||||
}
|
||||
async function create() {
|
||||
const generation = scope.current; setAction('plan'); setError('');
|
||||
try {
|
||||
const result = await api<{ group: CollaborationGroup; session: Session }>('/sessions/' + session.id + '/collaborations', {
|
||||
goal, children: drafts.map(child => ({ label: child.label, goal: child.goal, paths: splitPaths(child.paths) })),
|
||||
budget: { maxTokens: tokens, maxSteps: steps, maxToolCalls: toolCalls, maxDurationMs: duration * 60000 },
|
||||
});
|
||||
if (generation !== scope.current) return;
|
||||
setSelectedId(result.group.id); setCreating(false); onSession(result.session); await load(true);
|
||||
} catch (failure) { if (generation === scope.current) setError(failure instanceof Error ? failure.message : String(failure)); }
|
||||
finally { if (generation === scope.current) setAction(''); }
|
||||
}
|
||||
async function showRecord(group: CollaborationGroup, kind: 'collection' | 'evidence') {
|
||||
const generation = scope.current; setAction('record'); setError('');
|
||||
try { const result = await api<unknown>('/sessions/' + session.id + '/collaborations/' + group.id + '/' + kind); if (generation === scope.current && selectedGroup.current === group.id) { setPreview({ title: kind === 'collection' ? '原成果核对记录' : '原输入与现场核对', content: JSON.stringify(result, null, 2), groupId: group.id }); if (kind === 'evidence') setReadEvidenceSha(group.evidence?.sha256 ?? ''); } }
|
||||
catch (failure) { if (generation === scope.current && selectedGroup.current === group.id) setError(failure instanceof Error ? failure.message : String(failure)); }
|
||||
finally { if (generation === scope.current && selectedGroup.current === group.id) setAction(''); }
|
||||
}
|
||||
const canPlan = !!view && !view.worker && !busy && !action && view.groups.every(value => ['completed', 'discarded', 'resolved_external'].includes(value.status));
|
||||
return <div className="worker-console" aria-label="隔离协作控制台">
|
||||
<div className="worker-console-heading"><div><p className="worker-eyebrow">工程执行 / 隔离协作</p><h2>一个目标,两个独立执行通道</h2><p>分工和预算固定,成果核对后进入父工程审查。</p></div><button className="button secondary" disabled={loading || !!action} onClick={() => void load()}><RefreshCw size={14} />刷新</button></div>
|
||||
{error && <div className="worker-error" role="alert">{error}</div>}
|
||||
{loading && !view && <p role="status"><LoaderCircle className="spin" size={16} />正在读取当前任务记录</p>}
|
||||
{view?.worker ? <div className="worker-origin"><ShieldCheck size={22} /><div><h3>当前是受限子任务:{view.worker.label}</h3><p>固定范围:{view.worker.paths.join('、')}。开始、停止全部与成果合并在父目标中处理。</p><button className="button secondary" onClick={() => void onNavigate(view.worker!.parentProjectId, view.worker!.parentSessionId)}>返回父目标<ArrowUpRight size={14} /></button></div></div> : <>
|
||||
{!!view?.groups.length && <label className="worker-history">协作记录<select value={group?.id ?? ''} onChange={event => { setSelectedId(event.target.value); setCreating(false); }} aria-label="选择协作记录">{view.groups.map(value => <option key={value.id} value={value.id}>{statusLabel(value.status)} · {value.goal.slice(0, 40)}</option>)}</select></label>}
|
||||
{(!group || creating) && <div className="worker-plan-form">
|
||||
<label>父目标<textarea value={goal} onChange={event => setGoal(event.target.value)} placeholder="描述需要交付的结果与验收要求" maxLength={20000} rows={3} /></label>
|
||||
<div className="worker-lanes">{drafts.map((child, index) => <fieldset key={index}><legend>子任务 {index + 1}</legend><label>任务名称<input value={child.label} maxLength={64} onChange={event => setDrafts(values => values.map((value, i) => i === index ? { ...value, label: event.target.value } : value))} /></label><label>独立子目标<textarea value={child.goal} maxLength={8000} rows={3} onChange={event => setDrafts(values => values.map((value, i) => i === index ? { ...value, goal: event.target.value } : value))} /></label><label>允许修改的文件或目录<textarea value={child.paths} rows={2} placeholder="例如 src/parser.mjs,每行一个相对路径" onChange={event => setDrafts(values => values.map((value, i) => i === index ? { ...value, paths: event.target.value } : value))} /></label></fieldset>)}</div>
|
||||
<div className="worker-budget-form"><label>总 token 预算<input type="number" min={1000} max={config.maxRunTokens} value={tokens} onChange={event => setTokens(Number(event.target.value))} /></label><label>总请求轮次<input type="number" min={2} max={200} value={steps} onChange={event => setSteps(Number(event.target.value))} /></label><label>总工具次数<input type="number" min={2} max={512} value={toolCalls} onChange={event => setToolCalls(Number(event.target.value))} /></label><label>总时限(分钟)<input type="number" min={1} max={Math.floor(config.maxRunDurationMs / 60000)} value={duration} onChange={event => setDuration(Number(event.target.value))} /></label></div>
|
||||
<p className="worker-note">两份预算各分一半,续接沿用累计用量与原时限。来源只检出已提交 HEAD,原暂存和未提交修改保留。</p>
|
||||
<div className="worker-actions"><button className="button" disabled={!canPlan || !goal.trim() || drafts.some(child => !child.goal.trim() || !splitPaths(child.paths).length)} onClick={() => void create()}><ShieldCheck size={15} />封存分工计划</button>{creating && <button className="button secondary" onClick={() => setCreating(false)}>返回原协作</button>}</div>
|
||||
</div>}
|
||||
{group && !creating && <>
|
||||
<section className="worker-parent"><div className="worker-parent-top"><span className={'worker-status ' + (group.requiresVerification || group.status === 'conflict' ? 'attention' : '')}>{statusLabel(group.status)}</span><code>{group.source.identity.branch} · {group.source.identity.head.slice(0, 12)}</code></div><h3>{group.goal}</h3><p>{group.summary}</p><dl><div><dt>模型</dt><dd>{group.model.mode === 'demo' ? '离线演示' : group.model.model}</dd></div><div><dt>总预算</dt><dd>{number(group.budget.maxTokens)} tokens / {group.budget.maxSteps} 轮 / {group.budget.maxToolCalls} 次工具</dd></div><div><dt>累计用量</dt><dd>{number(group.usage?.accountedTokens)} tokens / {group.usage?.steps ?? 0} 轮 / {group.usage?.toolCalls ?? 0} 次工具</dd></div><div><dt>原修改</dt><dd>{group.source.changedPaths.length ? group.source.changedPaths.map(value => value.path).join('、') : '无未提交修改'}</dd></div></dl></section>
|
||||
<div className="worker-lanes">{(group.workers ?? []).map((child, index) => <section className="worker-lane" key={child.id}><div className="worker-lane-title"><span>通道 {index + 1}</span><span className={'worker-status ' + (child.requiresVerification ? 'attention' : '')}>{statusLabel(child.sessionStatus === 'awaiting_approval' ? 'awaiting_approval' : child.status)}</span></div><h3>{child.label}</h3><p className="worker-goal">{child.goal}</p><div className="worker-scope"><span>允许修改</span>{child.paths.map(path => <code key={path}>{path}</code>)}</div><p className="worker-meter">{number(child.usage?.accountedTokens)} / {number(child.budget.maxTokens)} tokens · {child.usage?.steps ?? 0}/{child.budget.maxSteps} 轮</p><p className="worker-summary">{child.summary ?? '先创建独立工作区,再开始子任务。'}</p>{child.result && <div className="worker-proof"><Check size={14} />{child.result.paths.length} 个原改动 · 当前检查已封存</div>}<div className="worker-actions">{child.status !== 'unprepared' && <button className="button secondary" onClick={() => void onNavigate(child.projectId, child.sessionId)}>{child.sessionStatus === 'awaiting_approval' ? '查看并审批检查' : child.sessionStatus === 'needs_review' ? '审查子任务改动' : '打开子任务'}<ArrowUpRight size={13} /></button>}{['ready', 'paused', 'failed', 'awaiting_review'].includes(child.status) && !running && child.sessionStatus !== 'needs_review' && <button className="text-button" disabled={!!action || config.mode === 'demo' || group.requiresVerification} onClick={() => setConfirmation({ group, operation: 'start', workerId: child.id })}><Play size={13} />继续子任务</button>}</div></section>)}</div>
|
||||
<section className="worker-review"><div className="worker-review-title"><GitBranch size={18} /><h3>父工程成果审查</h3></div>{group.collection ? <><p>{group.collection.paths.length} 个路径已核对,原记录 <code>{group.collection.sha256.slice(0, 16)}</code></p>{group.collection.conflicts.length > 0 && <ul className="worker-conflicts">{group.collection.conflicts.map((conflict, i) => <li key={i}><code>{conflict.path}</code><span>{conflict.reason}</span></li>)}</ul>}<button className="text-button" disabled={!!action} onClick={() => void showRecord(group, 'collection')}>查看原成果记录</button></> : <p>等待两个子任务完成实际修改与检查。重叠路径、来源变化或原证据失效会阻止合并。</p>}{group.merge?.changeSetId && <button className="button secondary" onClick={onReview}>打开父工程变更集审查<ArrowUpRight size={14} /></button>}</section>
|
||||
<div className="worker-actions worker-primary-actions">
|
||||
{['planned', 'partially_prepared'].includes(group.status) && <button className="button" disabled={!!action || busy} onClick={() => setConfirmation({ group, operation: 'prepare' })}><GitBranch size={15} />创建两个工作区</button>}
|
||||
{['ready', 'paused', 'awaiting_review'].includes(group.status) && <button className="button" disabled={!!action || running || config.mode === 'demo' || group.requiresVerification || group.workers?.some(child => child.sessionStatus === 'needs_review')} onClick={() => setConfirmation({ group, operation: 'start' })}><Play size={15} />{group.status === 'ready' ? '开始两个子任务' : '继续未完成子任务'}</button>}
|
||||
{running && <button className="button worker-stop" disabled={action === 'stop'} onClick={() => void execute(group, 'stop')}><Square size={14} />停止全部</button>}
|
||||
{['ready_to_collect', 'collected', 'conflict'].includes(group.status) && <button className="button secondary" disabled={!!action || running} onClick={() => void execute(group, 'collect')}><ShieldCheck size={15} />核对成果</button>}
|
||||
{group.status === 'collected' && <button className="button" disabled={!!action} onClick={() => void execute(group, 'merge')}><GitBranch size={15} />准备合并审查</button>}
|
||||
{group.merge?.changeSetId && <button className="button secondary" disabled={!!action || busy} onClick={() => void execute(group, 'finalize')}>核对检查与 Git 交付</button>}
|
||||
{group.requiresVerification && <><button className="button secondary" disabled={!!action || running} onClick={() => void execute(group, 'reconcile')}>核对原输入与现场</button>{group.evidence && <><button className="text-button" disabled={!!action} onClick={() => void showRecord(group, 'evidence')}>查看核对记录</button><button className="button secondary" disabled={!!action || readEvidenceSha !== group.evidence.sha256} onClick={() => setConfirmation({ group, operation: 'acknowledge' })}>确认核对并继续</button><button className="text-button" disabled={!!action || readEvidenceSha !== group.evidence.sha256} onClick={() => setConfirmation({ group, operation: 'acknowledge', retain: true })}>确认核对并保留现场结束</button></>}</>}
|
||||
{!running && !group.requiresVerification && !['completed', 'discarded', 'resolved_external'].includes(group.status) && <button className="text-button" disabled={!!action} onClick={() => setConfirmation({ group, operation: 'discard' })}>结束协作并保留现场</button>}
|
||||
{canPlan && <button className="button secondary" onClick={() => setCreating(true)}>创建下一父目标</button>}
|
||||
</div>
|
||||
{config.mode === 'demo' && ['ready', 'paused'].includes(group.status) && <p className="worker-note">当前为离线演示。请先配置可用模型,再新建使用该模型快照的协作计划。</p>}
|
||||
</>}
|
||||
</>}
|
||||
<p className="worker-boundary"><ShieldCheck size={14} />独立工作区与受限工具用于约束任务;审批的工程程序仍以本机账户执行。</p>
|
||||
{confirmation && <Modal title={confirmation.operation === 'start' ? '确认受限子执行' : confirmation.operation === 'prepare' ? '确认创建隔离工作区' : confirmation.operation === 'acknowledge' && !confirmation.retain ? '确认原结果核对' : '确认保留现场'} onClose={() => setConfirmation(null)}><div className="worker-confirm"><p>{confirmation.operation === 'start' ? '将请求已封存模型并使用剩余累计预算。每项工程检查仍在对应子任务中审批;旧工具不会重放。' : confirmation.operation === 'prepare' ? '按已封存 HEAD 串行创建两个独立 Git 工作区。原暂存与未提交修改保持在来源工程。' : confirmation.operation === 'acknowledge' && !confirmation.retain ? '按已阅读的原输入与现场记录解除核对门控。原未知结果保留,继续需要新检查和审批。' : '保留实际工作区、原任务、改动与报告,撤销未执行计划并结束本次协作;本次不记为交付完成。'}<strong>{confirmation.group.goal}</strong></p><button className="button" disabled={!!action || confirmation.operation === 'acknowledge' && readEvidenceSha !== confirmation.group.evidence?.sha256} onClick={() => void execute(confirmation.group, confirmation.operation, { ...(confirmation.workerId ? { workerId: confirmation.workerId } : {}), ...(confirmation.operation === 'acknowledge' ? { evidenceSha256: readEvidenceSha, retain: !!confirmation.retain } : {}) })}>确认{confirmation.operation === 'start' ? '开始' : confirmation.operation === 'prepare' ? '创建' : confirmation.operation === 'acknowledge' && !confirmation.retain ? '核对并继续' : '保留现场结束'}</button></div></Modal>}
|
||||
{preview && <Modal title={preview.title} wide onClose={() => setPreview(null)}><div className="worker-record"><button className="button secondary" onClick={() => downloadBlob(new Blob([preview.content], { type: 'application/json' }), 'agent-workbench-collaboration-' + preview.groupId + '.json')}>导出原记录</button><pre>{preview.content}</pre></div></Modal>}
|
||||
</div>;
|
||||
}
|
||||
+21
-1
@@ -160,7 +160,27 @@ export interface TaskPlanView {
|
||||
contract_artifact_id?: string; contract_sha256?: string; checked_at?: string; error?: string;
|
||||
}
|
||||
export interface TaskPlanReply { session: Session; plan: TaskPlanView; verification?: { status: string; reused?: boolean; proof_id: string; message?: string } }
|
||||
export interface ExecutionSnapshot { schemaVersion: number; task: Task | null; run: Run | null; runs: RunBrief[]; progress: { totalTools: number; completedTools: number; requiresVerification: { id: string; tool: string; state: string; callId: string }[] }; artifacts: Artifact[]; checks: CheckJob[]; mcpJobs?: McpJob[]; plans?: CheckPlan[]; deliveries?: DeliveryJob[]; deliveryPlans?: DeliveryPlan[]; changeSets?: ChangeSet[]; contextPlans?: ContextPlan[]; workspaces?: WorkspaceRecord[]; researchTargets?: ResearchTarget[]; researchJobs?: ResearchJob[]; engineJobs?: EngineJob[]; browserPlans?: BrowserPlan[]; browserJobs?: BrowserJob[]; taskPlans?: TaskPlanRecord[]; taskProofs?: { id: string; planId: string; stepKey: string; status: string }[]; workspaceIdentity?: WorkspaceIdentity; accountedTaskTokens: number }
|
||||
export interface ExecutionSnapshot { schemaVersion: number; task: Task | null; run: Run | null; runs: RunBrief[]; progress: { totalTools: number; completedTools: number; requiresVerification: { id: string; tool: string; state: string; callId: string }[] }; artifacts: Artifact[]; checks: CheckJob[]; mcpJobs?: McpJob[]; plans?: CheckPlan[]; deliveries?: DeliveryJob[]; deliveryPlans?: DeliveryPlan[]; changeSets?: ChangeSet[]; contextPlans?: ContextPlan[]; workspaces?: WorkspaceRecord[]; researchTargets?: ResearchTarget[]; researchJobs?: ResearchJob[]; engineJobs?: EngineJob[]; browserPlans?: BrowserPlan[]; browserJobs?: BrowserJob[]; taskPlans?: TaskPlanRecord[]; taskProofs?: { id: string; planId: string; stepKey: string; status: string }[]; collaborations?: CollaborationGroup[]; workers?: WorkerRecord[]; workspaceIdentity?: WorkspaceIdentity; accountedTaskTokens: number }
|
||||
export interface WorkerBudget { maxTokens: number; maxSteps: number; maxToolCalls: number }
|
||||
export interface WorkerDefinition { id: string; label: string; goal: string; paths: string[]; budget: WorkerBudget; workspaceId: string; projectId: string; sessionId: string; taskId: string }
|
||||
export interface WorkerRecord extends WorkerDefinition {
|
||||
collaborationId: string; parentProjectId: string; parentSessionId: string; parentTaskId: string; parentRunId: string;
|
||||
runId: string; currentRunId: string | null; runIds: string[]; baseCommit: string; fingerprint: string; status: string; requiresVerification: boolean;
|
||||
startedAt: string | null; finishedAt: string | null; summary: string; result: { artifactId: string; sha256: string; checkJobId: string; paths: string[] } | null;
|
||||
usage?: Usage & { accountedTokens: number; steps: number; toolCalls: number }; sessionStatus?: string;
|
||||
}
|
||||
export interface WorkerConflict { path: string; reason: string; workerIds: string[] }
|
||||
export interface CollaborationGroup {
|
||||
id: string; taskId: string; runId: string; projectId: string; sessionId: string; goal: string; fingerprint: string;
|
||||
status: string; phase?: string; requiresVerification: boolean; summary: string; createdAt: string; startedAt: string | null; finishedAt: string | null; deadline: number | null;
|
||||
model: { mode: string; model: string; baseUrl: string }; budget: WorkerBudget & { maxDurationMs: number };
|
||||
source: { identity: { root: string; head: string; branch: string; indexSha256: string }; dirty: boolean; changedPaths: { path: string; status: string }[] };
|
||||
children: WorkerDefinition[]; workers?: WorkerRecord[]; usage?: { accountedTokens: number; steps: number; toolCalls: number; unknownRequests: number };
|
||||
collection: { artifactId: string; sha256: string; conflicts: WorkerConflict[]; paths: string[] } | null;
|
||||
merge: { changeSetId?: string; fingerprint?: string; changeIds?: string[] } | null;
|
||||
evidence?: { artifactId: string; sha256: string } | null;
|
||||
}
|
||||
export interface WorkerView { groups: CollaborationGroup[]; worker: WorkerRecord | null }
|
||||
export interface McpTool { name: string; description: string; inputSchema: Record<string, unknown>; unsupported?: string }
|
||||
export interface McpRegistration {
|
||||
id: string; projectId: string; name: string; launch: { executable: { path: string; sha256: string; bytes: number }; entry: { path: string; sha256: string; bytes: number } | null; args: string[]; environment: string; identityScope: string };
|
||||
|
||||
Reference in New Issue
Block a user