feat: integrate reviewed batches and preserve task continuation

This commit is contained in:
Agent Workbench Dev
2026-10-29 19:33:24 +08:00
parent 5d03af968c
commit 719174e2b1
43 changed files with 799 additions and 60 deletions
+27 -5
View File
@@ -6,13 +6,14 @@ import { DiffView, EmptyInspector, IconButton, Modal, ResearchContent, Status, T
import { DiagnosticsPanel } from './DiagnosticsPanel';
import { TaskPanel } from './TaskPanel';
import { CodeIndexPanel } from './CodeIndexPanel';
import { ChangesInspector } from './ChangesInspector';
const activeStates = ['running', 'awaiting_approval', 'stopping'];
const defaultConfig: Config = { mode: 'demo', baseUrl: 'http://127.0.0.1:11434/v1', model: '', contextLimit: 16000, maxSteps: 12, maxOutputTokens: 2048, hasKey: false, maxRunDurationMs: 600000, maxRunTokens: 200000, maxTaskTokens: 1000000 };
export default function App() {
const [token, setAccess] = useState('');
const [version, setVersion] = useState('1.3.0');
const [version, setVersion] = useState('1.4.0');
const [diagnosticsOpen, setDiagnosticsOpen] = useState(false);
const [diagnostics, setDiagnostics] = useState<RuntimeDiagnostics | null>(null);
const [diagnosticsBusy, setDiagnosticsBusy] = useState(false);
@@ -36,6 +37,7 @@ export default function App() {
const [changeBusy, setChangeBusy] = useState('');
const [deciding, setDeciding] = useState(false);
const [editing, setEditing] = useState(false);
const editingRef = useRef(editing); editingRef.current = editing;
const [draft, setDraft] = useState('');
const [composer, setComposer] = useState('');
const [sending, setSending] = useState(false);
@@ -76,9 +78,16 @@ export default function App() {
const sessionCreation = useRef<Promise<Session | null> | null>(null);
const selectedProject = projects.find(project => project.id === projectId);
const isRunning = !!session && (activeStates.includes(session.status) || session.execution?.checks.some(job => ['queued', 'running'].includes(job.status)) === true
|| session.execution?.deliveries?.some(job => ['queued', 'preparing', 'prepared', 'publishing', 'committed', 'reporting'].includes(job.status)) === true);
|| session.execution?.deliveries?.some(job => ['queued', 'preparing', 'prepared', 'publishing', 'committed', 'reporting'].includes(job.status)) === true
|| session.execution?.changeSets?.some(set => ['applying', 'rolling_back'].includes(set.status)) === true);
const anyRunning = isRunning || briefs.some(item => activeStates.includes(item.status));
const pending = session?.changes.filter(change => ['pending', 'conflict'].includes(change.status)) || [];
const reviewedRun = session?.execution?.run;
const canContinueReview = !!session && pending.length === 0 && !isRunning
&& (reviewedRun?.status === 'needs_review' || reviewedRun?.status === 'paused' && reviewedRun.stopReason === 'step_limit')
&& reviewedRun?.taskId === session.execution?.task?.id
&& !session.execution?.progress.requiresVerification.length
&& session.changes.some(change => change.status === 'applied' && (!change.taskId || change.taskId === session.execution?.task?.id));
const selectedChange = session?.changes.find(change => change.id === changeId) || pending[0] || session?.changes.at(-1);
const selectedEvent = session?.events.find(event => event.id === eventId) || session?.events.at(-1);
const approval = session?.approvals.find(item => item.status === 'pending');
@@ -107,7 +116,7 @@ export default function App() {
function failure(error: unknown) { notify(error instanceof Error ? error.message : String(error)); }
function selectSession(id: string) {
if (selectedSessionRef.current === id) return;
selectedSessionRef.current = id; setSessionId(id); setSession(null);
selectedSessionRef.current = id; setSessionId(id); setSession(null); setToast('');
localStorage.setItem('awb-session', id); setChangeId(''); setEventId('');
}
function acceptSession(updated: Session) {
@@ -138,6 +147,7 @@ export default function App() {
if (request === filesRequest.current && selectedProjectRef.current === id) setFiles(result.files);
}
async function chooseProject(id: string, preferredSession?: string) {
if (selectedProjectRef.current !== id) setToast('');
selectedProjectRef.current = id; setProjectId(id); localStorage.setItem('awb-project', id);
filesRequest.current++; fileRequest.current++;
setOpenFile(null); setFiles([]); setFileLoading(false); setFileLine(null); setFileNotice(''); setEditing(false); setCollapsed(new Set()); setFilter('');
@@ -231,6 +241,18 @@ export default function App() {
notify(action === 'apply' ? '已应用 ' + change.path : '已撤回提案。');
} catch (error) { failure(error); } finally { setChangeBusy(''); }
}
async function refreshBatchFiles() {
const targetProject = selectedProjectRef.current, marker = fileRequest.current, relative = openFile?.path;
await refreshFiles(targetProject);
if (!relative || selectedProjectRef.current !== targetProject || fileRequest.current !== marker) return;
if (editingRef.current) { setFileNotice('文件批次已更新项目;本地编辑草稿保留,请先核对当前文件。'); return; }
try {
const file = await api<OpenFile>('/projects/' + targetProject + '/file?path=' + encodeURIComponent(relative));
if (selectedProjectRef.current === targetProject && fileRequest.current === marker && !editingRef.current) {
setOpenFile(file); setDraft(file.content); setFileLine(null); setFileNotice('');
}
} catch (error) { if (selectedProjectRef.current === targetProject && fileRequest.current === marker) setFileNotice('批次更新后该文件已移除或不可读取,请从文件列表重新选择。'); }
}
async function decide(allow: boolean) {
if (!session || !approval || deciding) return;
setDeciding(true);
@@ -444,7 +466,7 @@ export default function App() {
</div>}
{approval && <div className="approval-card"><div className="approval-heading"><span><ShieldCheck size={17} /></span><div><strong>确认这次终端执行</strong><p>{approval.reason}</p></div></div><pre>{approval.command}</pre><div className="approval-path"><Folder size={12} /><span>{approval.cwd}</span></div><p className="approval-shell">{approval.shell || '项目终端'} · UTF-8</p><p className="approval-scope">确认后以你的系统权限执行。</p><div className="approval-actions"><button className="button secondary" onClick={() => decide(false)} disabled={deciding}>拒绝执行</button><button className="button primary" onClick={() => decide(true)} disabled={deciding}><Play size={14} />确认执行</button></div></div>}
{pending.length > 0 && !isRunning && <button className="review-callout" onClick={() => { setChangeId(pending[0].id); showInspector('changes'); }}><FileCode2 size={17} /><span><strong>{pending.length} 项改动等待审查</strong><small>查看差异后,再应用到项目文件。</small></span><ArrowRight size={17} /></button>}
{pending.length === 0 && !isRunning && session?.execution?.run?.status === 'needs_review' && session.changes.some(change => change.status === 'applied' && (!change.taskId || change.taskId === session.execution?.task?.id)) && <button type="button" aria-label="继续检查与交付" className="review-callout" disabled={resuming} onClick={continueReviewed}><ClipboardCheck size={17} /><span><strong>继续检查与交付</strong><small>改动已应用,沿用原任务继续实际测试和修复。</small></span><ArrowRight size={17} /></button>}
{canContinueReview && <button type="button" aria-label="继续检查与交付" className="review-callout" disabled={resuming} onClick={continueReviewed}><ClipboardCheck size={17} /><span><strong>继续检查与交付</strong><small>改动已应用,沿用原任务继续实际测试和修复。</small></span><ArrowRight size={17} /></button>}
<div ref={chatEnd} />
</section>
<footer className="composer-wrap"><form className="composer" onSubmit={event => { event.preventDefault(); submit(); }}><textarea ref={composerRef} aria-label="任务内容" placeholder={config.mode === 'demo' ? '先体验完整流程,或连接自己的模型开始开发…' : '描述项目任务,或询问工作台的执行状态与报错…'} value={composer} onChange={event => setComposer(event.target.value)} onKeyDown={event => { if ((event.ctrlKey || event.metaKey) && event.key === 'Enter') { event.preventDefault(); submit(); } }} maxLength={20000} rows={3} /><div className="composer-bottom"><span><Folder size={13} />{selectedProject?.name || '选择项目'}<span className="composer-divider" />{config.mode === 'demo' ? '固定演示脚本' : '兼容模型服务'}</span>{isRunning ? <button type="button" className="stop-button" onClick={() => session && api('/sessions/' + session.id + '/stop', {}).catch(failure)}><Square size={13} />停止</button> : <button type="submit" className="send-button" aria-label="发送任务" disabled={!composer.trim() || sending || creatingSession || !ready || !!(sessionId && !session)}>{sending ? <LoaderCircle size={17} className="spin" /> : <ArrowUp size={18} />}</button>}</div></form><div className="composer-footnote"><span>Ctrl + Enter 发送 · 会话自动保存</span><span>{session?.estimatedTokens ? '上下文估算 ' + session.estimatedTokens.toLocaleString() + ' tokens' : '改动与执行结果可追溯'}</span></div></footer>
@@ -453,7 +475,7 @@ export default function App() {
<aside className="inspector">
<div className="inspector-tabs"><button className={tab === 'file' ? 'selected' : ''} onClick={() => setTab('file')}><FileCode2 size={14} />文件</button><button className={tab === 'changes' ? 'selected' : ''} onClick={() => setTab('changes')}><GitBranch size={14} />改动{pending.length > 0 && <b>{pending.length}</b>}</button><button className={tab === 'trace' ? 'selected' : ''} onClick={() => setTab('trace')}><SquareTerminal size={14} />轨迹</button><button className={tab === 'task' ? 'selected' : ''} onClick={() => setTab('task')}><ClipboardCheck size={14} />任务</button><button className={tab === 'index' ? 'selected' : ''} onClick={() => setTab('index')}><Search size={14} />索引</button><IconButton label={narrow ? '关闭检视区' : wide ? '缩小检视区' : '放大检视区'} onClick={() => setWide(previous => !previous)}>{narrow ? <X size={16} /> : wide ? <Minimize2 size={14} /> : <Maximize2 size={14} />}</IconButton></div>
{tab === 'file' && (fileLoading ? <div className="loading-inspector"><LoaderCircle className="spin" size={24} />正在读取文件</div> : openFile ? <div className="file-inspector"><div className="file-heading"><FileCode2 size={15} /><span title={openFile.path}>{openFile.path}</span><IconButton label="复制文件内容" onClick={() => navigator.clipboard.writeText(openFile.content).then(() => notify('已复制文件内容。')).catch(failure)}><Copy size={14} /></IconButton><IconButton label={editing ? '取消编辑' : '编辑文件'} onClick={() => { setEditing(previous => !previous); setDraft(openFile.content); }}><Pencil size={14} /></IconButton></div><div className="file-details"><span>{lineCount} 行 · {openFile.bytes.toLocaleString()} B{fileLine ? ' · 定位第 ' + fileLine + ' 行' : ''}</span><span className="code-utility">{openFile.sha256.slice(0, 10)}</span></div>{fileNotice && <div className="file-index-notice" role="status">{fileNotice}</div>}{editing ? <><textarea className="code-editor" aria-label="编辑文件内容" spellCheck={false} value={draft} onChange={event => setDraft(event.target.value)} /><div className="editor-actions"><button className="button primary" onClick={saveDraft} disabled={draft === openFile.content || draftSaving}><GitBranch size={14} />保存为提案</button></div></> : <div className="code-view" ref={codeViewRef}>{openFile.content.split('\n').map((line, index) => <div key={index} data-line={index + 1} className={fileLine === index + 1 ? 'code-line-target' : ''}><span>{index + 1}</span><code>{line.replace(/\r$/, '') || ' '}</code></div>)}</div>}</div> : <EmptyInspector kind="file" />)}
{tab === 'changes' && (selectedChange ? <div className="changes-inspector"><div className="change-list">{session?.changes.map(change => <button key={change.id} className={selectedChange.id === change.id ? 'selected' : ''} onClick={() => setChangeId(change.id)}><FileCode2 size={14} /><span>{change.path}</span><span className="change-stats"><b>+{change.additions}</b><i>−{change.deletions}</i></span></button>)}</div><div className="change-summary"><div><strong>{selectedChange.path}</strong><Status value={selectedChange.status} /></div><p>{selectedChange.reason}</p>{selectedChange.patch && <p className="patch-detail">精确补丁 · {selectedChange.patch.edits} 处替换 · {selectedChange.patch.lineEnding === 'mixed' ? '按原文核对混合换行' : '保留 ' + selectedChange.patch.lineEnding.toUpperCase() + ' 换行'}{selectedChange.patch.preservedBom ? ' · 保留 BOM' : ''}</p>}</div><DiffView change={selectedChange} /><div className="change-actions">{['pending', 'conflict'].includes(selectedChange.status) ? <><button className="button secondary" onClick={() => changeAction(selectedChange, 'reject')} disabled={!!changeBusy || isRunning}>撤回提案</button><button className="button primary" disabled={selectedChange.status !== 'pending' || !!changeBusy || isRunning} onClick={() => changeAction(selectedChange, 'apply')}><Check size={14} />应用这项改动</button></> : <span className="subtle">{selectedChange.status === 'applied' ? '这项改动已写入项目。' : '这项提案已结束。'}</span>}<IconButton label="下载建议内容" onClick={() => downloadBlob(new Blob([selectedChange.content], { type: 'text/plain;charset=utf-8' }), selectedChange.path.split('/').at(-1) || 'proposal.txt')}><ArrowDownToLine size={15} /></IconButton></div></div> : <EmptyInspector kind="changes" />)}
{tab === 'changes' && (session ? <ChangesInspector session={session} selectedChange={selectedChange} busy={!!changeBusy} isRunning={isRunning} onSelect={setChangeId} onAction={changeAction} onSession={acceptSession} onError={failure} onFilesChanged={refreshBatchFiles} /> : <EmptyInspector kind="changes" />)}
{tab === 'trace' && (session?.events.length ? <div className="trace-inspector"><div className="trace-caption"><span>完整执行记录</span><span>{toolEvents.length} 次工具调用</span></div><div className="trace-list">{session.events.map(event => <ToolRow key={event.id} event={event} selected={selectedEvent?.id === event.id} onSelect={() => setEventId(event.id)} />)}</div>{selectedEvent && <div className="event-details"><div className="event-detail-heading"><strong>{selectedEvent.label}</strong><Status value={selectedEvent.phase} /></div>{selectedEvent.input && <><h4>输入</h4><pre>{JSON.stringify(selectedEvent.input, null, 2)}</pre></>}<h4>结果</h4><pre>{selectedEvent.output || (selectedEvent.phase === 'waiting' ? '等待确认后执行。' : '正在等待工具结果。')}</pre>{selectedEvent.durationMs !== undefined && <p className="subtle">耗时 {(selectedEvent.durationMs / 1000).toFixed(2)} 秒,包含确认等待。</p>}</div>}</div> : <EmptyInspector kind="trace" />)}
{tab === 'task' && (session ? <TaskPanel key={session.id} session={session} onSession={acceptSession} onError={failure} busy={isRunning} /> : <EmptyInspector kind="trace" />)}
{selectedProject && <CodeIndexPanel key={selectedProject.id} project={selectedProject} active={tab === 'index'} onOpen={(path, line, expectedSha256) => void loadFile(path, { line, expectedSha256 })} />}
+8
View File
@@ -0,0 +1,8 @@
.change-set-bar{display:flex;align-items:center;flex-wrap:wrap;gap:9px;padding:12px;border-bottom:1px solid #dce7d8;background:#f2f7ee;flex-shrink:0;color:#456243}
.change-set-bar>div{flex:1;min-width:150px}.change-set-bar strong{display:block;font-size:12px;font-weight:600}.change-set-bar small{display:block;font-size:10px;line-height:1.6;margin-top:3px;color:#71836b;overflow-wrap:anywhere}.change-set-bar .button{padding:7px 10px;font-size:11px;min-height:30px}
.batch-attention{background:#fff7ea;border-color:#e6d1ac;color:#7c613b}.batch-attention small{color:#8a7658}.batch-sealed-note{font-size:10px!important;color:#6b7d55!important}
.batch-select-list{flex:1;min-height:0;overflow:auto;border-top:1px solid #dce7d8}.batch-select-list>label{display:flex;align-items:center;gap:12px;padding:14px 8px;border-bottom:1px solid #e6ece1;cursor:pointer}.batch-select-list input{width:16px;height:16px;accent-color:#507247;flex-shrink:0}.batch-select-list>label>span:first-of-type{flex:1;min-width:0}.batch-select-list strong{display:block;font:12px Consolas,monospace;overflow-wrap:anywhere}.batch-select-list small{display:block;font-size:11px;color:#7c8b72;margin-top:5px;line-height:1.6;overflow-wrap:anywhere}
.batch-heading{display:flex;align-items:center;gap:10px;flex-wrap:wrap;font-size:11px;line-height:1.7;padding:10px 0 14px;flex-shrink:0}.batch-heading>span:nth-child(2){flex:1;min-width:180px;overflow-wrap:anywhere}.batch-heading select{max-width:100%;font-size:11px;border:1px solid #d9e5d4;padding:6px;border-radius:5px;color:#4a6646;background:#f7faf3}
.batch-review-grid{display:grid;grid-template-columns:minmax(180px,26%) minmax(0,1fr);flex:1;min-height:160px;border:1px solid #dfe8d7;border-radius:7px;overflow:hidden}.batch-file-list{overflow:auto;min-height:0;border-right:1px solid #dfe8d7;background:#f8faf5}.batch-file-list button{display:block;width:100%;text-align:left;padding:12px;border-bottom:1px solid #e7edde;color:#506647;outline-offset:-3px}.batch-file-list button.selected{background:#eaf2df;box-shadow:inset 3px 0 #6e8f54}.batch-file-list strong{display:block;font:11px Consolas,monospace;overflow-wrap:anywhere}.batch-file-list small{display:block;font-size:10px;margin-top:5px;color:#7c8b71}.batch-file-list code{display:block;font-size:10px;color:#8b967e;margin-top:5px}.batch-file-list .batch-problem{color:#966636;line-height:1.6;overflow-wrap:anywhere}.batch-diff{display:flex;flex-direction:column;min-width:0;min-height:0}.batch-diff-heading{display:flex;align-items:center;justify-content:space-between;gap:10px;padding:10px 12px;border-bottom:1px solid #dfe8d7;flex-shrink:0;font-size:11px}.batch-diff-heading strong{font:11px Consolas,monospace;overflow-wrap:anywhere}.batch-diff-heading span{color:#89957e;white-space:nowrap}
.batch-fingerprint{display:grid;grid-template-columns:60px minmax(0,1fr);gap:5px 12px;padding:11px 0;font-size:10px;flex-shrink:0;color:#8a967e}.batch-fingerprint code{font-size:10px;color:#6b7f58;overflow-wrap:anywhere}.batch-actions{display:flex;align-items:center;justify-content:flex-end;flex-wrap:wrap;gap:8px;padding-top:12px;border-top:1px solid #dfe8d7;flex-shrink:0}.batch-actions>span{font-size:10px;line-height:1.7;flex:1;min-width:130px;color:#7c8c70;overflow-wrap:anywhere}.batch-actions .button{font-size:11px;min-height:34px}.batch-confirmation{padding:12px;background:#fff7e9;border:1px solid #e3cdac;border-radius:7px;flex-shrink:0;font-size:12px;line-height:1.7;color:#82673f}.batch-confirmation p{font-size:11px;margin:6px 0 10px}.batch-confirmation .button{font-size:11px;margin-right:8px}.status-partial,.status-rolling_back{background:#fff0d8;color:#846129}.status-applying{background:#e9f2df;color:#617e42}.status-rolled_back,.status-resolved_external,.status-external_preserved{background:#edf2eb;color:#66805c}
@media(max-width:650px){.batch-review-grid{grid-template-columns:minmax(0,1fr);grid-template-rows:110px minmax(100px,1fr);min-height:180px}.batch-file-list{border-right:0;border-bottom:1px solid #dfe8d7}.batch-file-list button{padding:8px 10px}.batch-file-list small,.batch-file-list code{display:inline-block;margin:3px 10px 0 0}.batch-heading{padding:6px 0 9px}.batch-actions .button{flex:1;white-space:normal}.batch-actions>span{flex-basis:100%}.batch-fingerprint{gap:3px 8px;padding:8px 0}.batch-confirmation{padding:9px}.batch-confirmation .button{min-height:32px;padding:6px 8px}.change-set-bar>div{min-width:130px}.change-set-bar .button{font-size:10px}}
+107
View File
@@ -0,0 +1,107 @@
import { useEffect, useRef, useState } from 'react';
import { Check, Files, LoaderCircle, RotateCcw, ScanLine, ShieldCheck } from 'lucide-react';
import type { ChangeSet, Session } from './types';
import { api } from './api';
import { DiffView, Modal, Status } from './components';
import './ChangeSetPanel.css';
const openStates = ['prepared', 'applying', 'rolling_back', 'unknown', 'partial'];
const labels: Record<string, string> = { before: '原文件', after: '建议内容', external: '外部改动', unavailable: '无法读取', writing: '正在写入', restoring: '正在回退' };
export function ChangeSetPanel({ session, busy, onSession, onError, onFilesChanged }: {
session: Session; busy: boolean; onSession: (session: Session) => void; onError: (error: unknown) => void; onFilesChanged: () => Promise<void>;
}) {
const sets = session.execution?.changeSets ?? [], taskId = session.execution?.task?.id;
const pending = session.changes.filter(change => change.taskId === taskId && change.status === 'pending'
&& !sets.some(set => set.id === change.changeSetId && openStates.includes(set.status)));
const current = sets.slice().reverse().find(set => openStates.includes(set.status)) ?? sets.at(-1);
const [stage, setStage] = useState<'select' | 'review' | null>(null);
const [setId, setSetId] = useState(''), [fileId, setFileId] = useState('');
const [choices, setChoices] = useState<string[]>([]), [working, setWorking] = useState(false);
const [confirmation, setConfirmation] = useState<'rollback' | 'acknowledge' | null>(null);
const scope = session.id + ':' + (taskId ?? ''), scopeRef = useRef(scope); scopeRef.current = scope;
const filesSignature = sets.filter(set => ['completed', 'rolled_back', 'partial', 'unknown', 'resolved_external'].includes(set.status))
.map(set => set.id + ':' + set.status + ':' + set.finishedAt).join('|');
const lastFiles = useRef({ scope, signature: filesSignature });
useEffect(() => {
scopeRef.current = scope;
setStage(null); setSetId(''); setFileId(''); setChoices([]); setConfirmation(null); setWorking(false);
return () => { if (scopeRef.current === scope) scopeRef.current = ''; };
}, [scope]);
useEffect(() => {
const previous = lastFiles.current; lastFiles.current = { scope, signature: filesSignature };
if (previous.scope === scope && previous.signature !== filesSignature) void onFilesChanged().catch(error => { if (scopeRef.current === scope) onError(error); });
}, [scope, filesSignature, onFilesChanged, onError]);
const selected = sets.find(set => set.id === setId) ?? current;
const file = selected?.files.find(value => value.changeId === fileId) ?? selected?.files[0];
const proposal = session.changes.find(change => change.id === file?.changeId);
const active = !!selected && ['applying', 'rolling_back'].includes(selected.status);
const disabled = busy || working || active;
const close = () => { setStage(null); setConfirmation(null); };
async function prepare() {
if (!choices.length || choices.length > 32 || disabled) return;
const target = scope; setWorking(true);
try {
const result = await api<Session>('/sessions/' + session.id + '/change-sets', { changeIds: choices });
if (scopeRef.current !== target) return;
onSession(result);
const next = result.execution?.changeSets?.slice().reverse().find(set => set.status === 'prepared');
if (next) { setSetId(next.id); setFileId(next.files[0]?.changeId ?? ''); setStage('review'); }
} catch (error) { if (scopeRef.current === target) onError(error); }
finally { if (scopeRef.current === target) setWorking(false); }
}
async function act(set: ChangeSet, action: 'apply' | 'reconcile' | 'rollback' | 'discard' | 'acknowledge') {
if (disabled) return;
const target = scope; setWorking(true);
try {
const result = await api<Session>('/sessions/' + session.id + '/change-sets/' + set.id + '/' + action,
{ fingerprint: set.fingerprint, ...(action === 'acknowledge' ? { observationFingerprint: set.observationFingerprint } : {}) });
if (scopeRef.current === target) { onSession(result); setConfirmation(null); }
} catch (error) { if (scopeRef.current === target) onError(error); }
finally { if (scopeRef.current === target) setWorking(false); }
}
const canAcknowledge = selected?.status === 'partial' && !!selected.observationFingerprint
&& !!selected.observations?.length && selected.observations.every(value => ['before', 'external'].includes(value.state));
return <>
<div className={'change-set-bar' + (current?.requiresVerification ? ' batch-attention' : '')}>
<Files size={17} /><div><strong>{current ? `多文件变更集 · ${current.files.length} 个文件` : '组合审查文件改动'}</strong>
<small>{current ? current.requiresVerification ? '实际文件需要核对,恢复入口保留在这个任务。' : current.summary : pending.length ? `${pending.length} 份提案可组合为一个审查批次。` : '本任务有提案后,可一起审查与应用。'}</small></div>
{current && <button type="button" className="button secondary" disabled={working} onClick={() => { setSetId(current.id); setFileId(current.files[0]?.changeId ?? ''); setStage('review'); }}>审查变更集</button>}
{!current || !openStates.includes(current.status) ? <button type="button" className="button secondary" disabled={!taskId || !pending.length || busy || working}
onClick={() => { setChoices(pending.slice(0, 32).map(change => change.id)); setStage('select'); }}>组合审查</button> : null}
</div>
{stage === 'select' && <Modal title="选择要一起审查的提案" description="选择1到32份同任务提案,封存后查看整批差异。" wide onClose={close}>
<div className="batch-select-list">{pending.map(change => <label key={change.id}><input type="checkbox" aria-label={'选择提案 ' + change.path} checked={choices.includes(change.id)}
onChange={event => setChoices(previous => event.target.checked ? [...previous, change.id] : previous.filter(id => id !== change.id))} />
<span><strong>{change.path}</strong><small>{change.reason}</small></span><span className="change-stats"><b>+{change.additions}</b><i>−{change.deletions}</i></span></label>)}</div>
<div className="batch-actions"><span>已选择 {choices.length} / 32 项</span><button type="button" className="button primary" disabled={disabled || !choices.length || choices.length > 32} onClick={prepare}>
{working ? <LoaderCircle size={14} className="spin" /> : <ShieldCheck size={14} />}封存审查范围</button></div>
</Modal>}
{stage === 'review' && selected && <Modal title="多文件变更集审查" description={`本任务 ${selected.taskId.slice(0, 8)} · ${selected.files.length} 个文件`} wide onClose={close}>
<div className="batch-heading"><Status value={selected.status} /><span>{selected.summary}</span>
{sets.length > 1 && <select aria-label="选择变更批次" value={selected.id} onChange={event => { setSetId(event.target.value); setFileId(''); setConfirmation(null); }}>
{sets.slice().reverse().map(set => <option key={set.id} value={set.id}>{set.id.slice(0, 8)} · {set.files.length} 个文件 · {set.status}</option>)}</select>}
</div>
<div className="batch-review-grid"><div className="batch-file-list" aria-label="批次文件范围">{selected.files.map(item => {
const observation = selected.observations?.find(value => value.path === item.path);
return <button type="button" key={item.changeId} aria-label={'查看批次差异 ' + item.path} className={file?.changeId === item.changeId ? 'selected' : ''}
onClick={() => setFileId(item.changeId)}><strong>{item.path}</strong><small>{labels[observation?.state ?? item.state] ?? item.state}</small>
<code title={observation?.actualSha256 ?? item.baseSha256 ?? '新文件'}>{(observation?.actualSha256 ?? item.baseSha256)?.slice(0, 12) ?? '新文件'}</code>
{observation?.problem && <small className="batch-problem">{observation.problem}</small>}{item.restoreError && <small className="batch-problem">{item.restoreError}</small>}</button>;
})}</div><div className="batch-diff"><div className="batch-diff-heading"><strong>{file?.path}</strong><span>提案差异</span></div>{proposal && <DiffView change={proposal} />}</div></div>
<div className="batch-fingerprint"><span>审查指纹</span><code>{selected.fingerprint}</code><span>Git基线</span><code>{selected.baseline.available ? `${selected.baseline.branch ?? '未命名'} · ${selected.baseline.head?.slice(0, 12) ?? '尚无提交'}` : '项目尚未启用Git'}</code></div>
{confirmation && <div className="batch-confirmation" role="alert"><strong>{confirmation === 'rollback' ? '回退本批次已写入的文件' : '保留外部改动并结束恢复'}</strong>
<p>{confirmation === 'rollback' ? '只有当前字节仍等于本批次建议时才恢复原文,外部修改会保留。已新建的文件会按同样规则移除。' : '将保留目前已核对的外部内容,并结束这个未成功应用的批次。当前文件再次变化时会拒绝确认。'}</p>
<button type="button" className="button secondary" disabled={disabled} onClick={() => setConfirmation(null)}>返回审查</button>
<button type="button" className="button primary" disabled={disabled} onClick={() => act(selected, confirmation)}>{confirmation === 'rollback' ? '确认回退本批次' : '确认保留外部改动'}</button></div>}
<div className="batch-actions"><span>{active ? '文件批次正在执行,结果会持续更新。' : selected.requiresVerification ? '先核对实际文件,恢复不会自动续写。' : '应用前会核对所有文件及原审查指纹。'}</span>
{working && <LoaderCircle size={14} className="spin" />}
{['prepared', 'stale'].includes(selected.status) && <button type="button" className="button secondary" disabled={disabled} onClick={() => act(selected, 'discard')}>撤销未执行批次</button>}
{selected.status === 'prepared' && <button type="button" className="button primary" disabled={disabled} onClick={() => act(selected, 'apply')}><Check size={14} />确认应用全部 {selected.files.length} 项</button>}
{selected.requiresVerification && <button type="button" className="button secondary" disabled={disabled} onClick={() => act(selected, 'reconcile')}><ScanLine size={14} />核对实际文件</button>}
{['completed', 'partial', 'unknown'].includes(selected.status) && <button type="button" className="button secondary" disabled={disabled || !!confirmation} onClick={() => setConfirmation('rollback')}><RotateCcw size={14} />回退本批已写入文件</button>}
{canAcknowledge && <button type="button" className="button secondary" disabled={disabled || !!confirmation} onClick={() => setConfirmation('acknowledge')}>保留外部改动,结束恢复</button>}
</div>
</Modal>}
</>;
}
+30
View File
@@ -0,0 +1,30 @@
import { ArrowDownToLine, Check, FileCode2 } from 'lucide-react';
import type { Change, Session } from './types';
import { downloadBlob } from './api';
import { DiffView, EmptyInspector, IconButton, Status } from './components';
import { ChangeSetPanel } from './ChangeSetPanel';
export function ChangesInspector({ session, selectedChange, busy, isRunning, onSelect, onAction, onSession, onError, onFilesChanged }: {
session: Session; selectedChange?: Change; busy: boolean; isRunning: boolean; onSelect: (id: string) => void;
onAction: (change: Change, action: 'apply' | 'reject') => Promise<void>; onSession: (session: Session) => void;
onError: (error: unknown) => void; onFilesChanged: () => Promise<void>;
}) {
const sealed = !!selectedChange?.changeSetId && !!session.execution?.changeSets?.some(set => set.id === selectedChange.changeSetId
&& ['prepared', 'applying', 'rolling_back', 'unknown', 'partial'].includes(set.status));
return <div className="changes-inspector"><ChangeSetPanel session={session} busy={busy || isRunning} onSession={onSession} onError={onError} onFilesChanged={onFilesChanged} />
{selectedChange ? <>
<div className="change-list">{session.changes.map(change => <button key={change.id} className={selectedChange.id === change.id ? 'selected' : ''} onClick={() => onSelect(change.id)}>
<FileCode2 size={14} /><span>{change.path}</span><span className="change-stats"><b>+{change.additions}</b><i>−{change.deletions}</i></span></button>)}</div>
<div className="change-summary"><div><strong>{selectedChange.path}</strong><Status value={selectedChange.status} /></div><p>{selectedChange.reason}</p>
{selectedChange.patch && <p className="patch-detail">精确补丁 · {selectedChange.patch.edits} 处替换 · {selectedChange.patch.lineEnding === 'mixed' ? '按原文核对混合换行' : '保留 ' + selectedChange.patch.lineEnding.toUpperCase() + ' 换行'}{selectedChange.patch.preservedBom ? ' · 保留 BOM' : ''}</p>}
{sealed && <p className="batch-sealed-note">已封存到变更集,请在上方审查整个批次。</p>}</div>
<DiffView change={selectedChange} />
<div className="change-actions">{['pending', 'conflict'].includes(selectedChange.status) ? <>
<button type="button" className="button secondary" onClick={() => onAction(selectedChange, 'reject')} disabled={busy || isRunning || sealed}>撤回提案</button>
<button type="button" className="button primary" disabled={selectedChange.status !== 'pending' || busy || isRunning || sealed} onClick={() => onAction(selectedChange, 'apply')}><Check size={14} />应用这项改动</button>
</> : <span className="subtle">{selectedChange.status === 'applied' ? '这项改动已写入项目。' : selectedChange.status === 'external_preserved' ? '已保留外部内容,批次未记为成功应用。' : selectedChange.status === 'rolled_back' ? '这项改动已恢复为原文件。' : '这项提案已结束。'}</span>}
<IconButton label="下载建议内容" onClick={() => downloadBlob(new Blob([selectedChange.content], { type: 'text/plain;charset=utf-8' }), selectedChange.path.split('/').at(-1) || 'proposal.txt')}><ArrowDownToLine size={15} /></IconButton>
</div>
</> : <EmptyInspector kind="changes" />}
</div>;
}
+2
View File
@@ -13,6 +13,8 @@ const statusNames: Record<string, string> = {
not_configured: '尚未检查', passed: '检查通过', cancelled: '已取消', stale: '需重新检查',
planned: '待确认', preparing: '准备提交', prepared: '准备完成', publishing: '发布本地提交', committed: '已生成提交',
reporting: '生成报告',
applying: '应用中', rolling_back: '回退中', rolled_back: '已回退', partial: '部分结果待核对',
resolved_external: '已保留外部修改', external_preserved: '外部内容已保留',
};
export function Status({ value }: { value: string }) {
return <span className={'status status-' + value}><span className="status-dot" />{statusNames[value] || value}</span>;
+11 -1
View File
@@ -15,6 +15,7 @@ export interface ToolEvent {
export interface DiffPart { value: string; count: number; added?: boolean; removed?: boolean }
export interface Change {
taskId?: string | null; runId?: string | null;
changeSetId?: string; rolledBackAt?: string;
id: string; path: string; reason: string; status: string; baseExists: boolean; baseSha256: string | null;
baseContent: string; content: string; sha256: string; diff: DiffPart[]; additions: number; deletions: number;
createdAt: string; appliedAt?: string;
@@ -88,4 +89,13 @@ export interface DeliveryJob {
commit: string | null; expectedCommit?: string | null; summary?: string; requiresVerification: boolean; startedAt: string; finishedAt: string | null;
reportArtifactId?: string; reportMarkdownArtifactId?: string; reportError?: string; indexPreserved?: boolean; workspacePreserved?: boolean;
}
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[]; plans?: CheckPlan[]; deliveries?: DeliveryJob[]; deliveryPlans?: DeliveryPlan[]; accountedTaskTokens: number }
export interface ChangeSet {
id: string; taskId: string; runId: string; sessionId: string; projectId: string; fingerprint: string;
status: string; requiresVerification: boolean; summary: string; createdAt: string; finishedAt?: string;
baseline: { available: boolean; head: string | null; branch: string | null }; observationFingerprint?: string;
files: { changeId: string; path: string; baseExists: boolean; baseSha256: string | null; sha256: string; bytes: number;
baseBytes: number; mode: number; reason: string; state: string; writeAttempted: boolean; restoreAttempted: boolean;
snapshotArtifactId: string; sourceRunId: string; restoreError?: string }[];
observations?: { path: string; state: string; exists: boolean | null; actualSha256: string | null; problem?: 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[]; plans?: CheckPlan[]; deliveries?: DeliveryJob[]; deliveryPlans?: DeliveryPlan[]; changeSets?: ChangeSet[]; accountedTaskTokens: number }