diff --git a/web/app/run-file-preview.js b/web/app/run-file-preview.js new file mode 100644 index 000000000..99413440b --- /dev/null +++ b/web/app/run-file-preview.js @@ -0,0 +1,58 @@ +// Read-only browsing of live workspace files, separate from immutable artifacts. +async function previewRunFiles(run){ + const host=$('#artifactPreview'),modal=$('#artifactModal'); + if(!run||!host||!modal)return; + host.innerHTML=`

工作区文件

只读预览 · 当前工作区内容
选择文件查看

Markdown 默认渲染,可切换源码;文件不会被修改。

`; + const root=host.firstElementChild,list=root.querySelector('[data-run-file-list]'),documentPane=root.querySelector('[data-run-file-document]'); + const search=root.querySelector('[data-run-file-search]'),up=root.querySelector('[data-run-file-up]'); + const isOpen=()=>host.contains(root)&&modal.classList.contains('open'); + let entries=[],directory='',selected='',fileRequest=0,truncated=false; + modal.classList.add('open'); + search.focus(); + function renderFiles(){ + const query=search.value.trim().toLowerCase(); + const matches=entries.filter(entry=>query?entry.type==='file'&&entry.path.toLowerCase().includes(query):entry.path.slice(0,entry.path.lastIndexOf('/')+1)===directory); + matches.sort((a,b)=>(a.type==='directory'?0:1)-(b.type==='directory'?0:1)||a.path.localeCompare(b.path)); + up.disabled=!directory; + root.querySelector('[data-run-file-directory]').textContent=directory||'工作区'; + list.innerHTML=matches.slice(0,200).map(entry=>``).join('')||'

没有匹配的文件

'; + if(matches.length>200||truncated)list.insertAdjacentHTML('beforeend',`

${matches.length>200?'仅显示前 200 项,请搜索缩小范围。':''}${truncated?'文件列表已达到服务端上限;可在 IDE 中查看其余文件。':''}

`); + list.querySelectorAll('[data-run-file-path]').forEach(button=>button.onclick=()=>{ + if(button.dataset.runFileType==='directory'){directory=button.dataset.runFilePath+'/';search.value='';renderFiles()} + else openFile(button.dataset.runFilePath); + }); + } + async function openFile(path){ + selected=path; + const request=++fileRequest; + renderFiles(); + documentPane.innerHTML='
正在读取文件…
'; + try{ + const data=await api(`/api/runs/${encodeURIComponent(run.id)}/workspace/file?path=${encodeURIComponent(path)}`,{silent:true}); + if(!isOpen()||request!==fileRequest)return; + const content=String(data.content??''),markdown=/\.(md|markdown|mdown|mkd)$/i.test(path); + let mode=markdown?'preview':'source'; + function renderDocument(){ + documentPane.innerHTML=`
${escapeHTML(path)}${markdown?`
`:''}
${mode==='preview'?`
${renderMarkdown(content)}
`:`
${escapeHTML(content)}
`}
`; + documentPane.querySelectorAll('[data-run-file-mode]').forEach(button=>button.onclick=()=>{mode=button.dataset.runFileMode;renderDocument();documentPane.querySelector(`[data-run-file-mode="${mode}"]`)?.focus()}); + documentPane.querySelectorAll('.md-code-copy').forEach(button=>button.onclick=()=>copyText(button.closest('.md-code-block')?.querySelector('pre code')?.textContent||'','代码片段已复制')); + } + renderDocument(); + }catch(error){ + if(isOpen()&&request===fileRequest)documentPane.innerHTML=`
文件无法预览

${escapeHTML(error.message)}

支持服务端允许的文本文件;二进制文件或超出大小限制的文件请在 IDE 中查看。
`; + } + } + search.oninput=renderFiles; + up.onclick=()=>{directory=directory.replace(/[^/]+\/$/,'');search.value='';renderFiles()}; + try{ + const data=await api(`/api/runs/${encodeURIComponent(run.id)}/workspace/tree`,{silent:true}); + if(!isOpen())return; + entries=(data.entries||[]).filter(entry=>entry&&typeof entry.path==='string'&&['file','directory'].includes(entry.type)); + truncated=!!data.truncated; + renderFiles(); + }catch(error){ + if(!isOpen())return; + list.textContent='文件列表不可用'; + documentPane.innerHTML=`
工作区暂不可浏览

${escapeHTML(error.message)}

工作区已回收时,请关闭预览并在运行详情的「工作区」中按需恢复。已保存的交付物仍可单独查看。
`; + } +} diff --git a/web/app/runs.js b/web/app/runs.js index 4838622d9..852108817 100644 --- a/web/app/runs.js +++ b/web/app/runs.js @@ -1172,6 +1172,7 @@ function bindRunDetailTabs(run,host){ if(tab==='eval')return loadRunEval(run.id); } host.querySelectorAll('[data-run-tab]').forEach(button=>button.onclick=()=>selectTab(button.dataset.runTab)); + host.querySelector('[data-run-files]')?.addEventListener('click',()=>previewRunFiles(run)); const restoreButton=host.querySelector('[data-workspace-restore]'); if(restoreButton)restoreButton.onclick=()=>selectTab('workspace'); syncRunWorkspaceRestoreButton(run,host); @@ -1201,7 +1202,7 @@ function renderRunDetail(r){ const runTabs=['overview:概览','trace:实时轨迹','logs:Worker日志','workspace:工作区']; if(previewEnabled)runTabs.push('preview:前端预览'); runTabs.push('eval:智能评测'); - host.innerHTML=`
${issueRef}›${escapeHTML(wf.name)}
${r.executionContext?.parentRunId?``:''}
${issueId?``:''}${!r.pauseRequested?refreshRunSOPButtonHTML(r):''}${['queued','running','waiting'].includes(r.status)?'':''}

${escapeHTML(ctx.issue?.title||wf.name)}

${escapeHTML(r.input||'无运行输入')}

${workspaceRestoreButtonHTML()}${runDisplayStatus(r)}${r.status==='failed'&&!gongfengIssueClosed(ctx.issue)?'':''}${canManuallyPassFailedNode(r)&&!gongfengIssueClosed(ctx.issue)?``:''}
Run ${escapeHTML(r.id.slice(-12))}${runModeChipHTML(r,wf)}${runExecutionChipHTML(r)}启动于 ${new Date(r.createdAt).toLocaleString()}执行 ${runElapsed(r)}${runWallNote(r)}
执行详情
${runProgressCellHTML(r,wf,progress,graphNodes)}
${liveUsageHTML(r)}
交付物${(r.artifacts||[]).length} 个不可变快照按节点和尝试次数保留版本
${alignPanelHTML}${runIsGroupMode(r)?`
已冷冻 SOP 快照历史协作 · ${graphNodes.length} 个节点可展开审计
`:''}

节点执行拓扑

点击节点查看该节点的输出、产物和执行事件
完成运行中待审批未开始
${graphNodes.map((n,index)=>{const gv=graphNodeView(r,n.id),meta=nodeMeta(n),arts=(r.artifacts||[]).filter(a=>a.nodeId===n.id).length;return `${index?'→':''}`}).join('')}

${escapeHTML(selected?.name||'节点详情')}

当前活动:${escapeHTML(nr.activity||'')}${escapeHTML(nr.provider||'未分配')}${nr.model?` · ${escapeHTML(nr.model)}`:''}
${statusText(nr.status)||'待执行'}
执行次数${nr.attempt||0}
返工${nr.reworkCount||0}
Token${formatTokens(nr.usage?.totalTokens)}
工具调用${nr.toolCalls||0}
${childSOPPanelHTML(r,selected?.id)}${gateResultCardHTML(nr)}${canRerunFromHere(r,selected?.id)?`
保留上游结果,从本节点及下游重跑
`:''}${nr.output?`
节点输出
${escapeHTML(displayNodeOutput(nr.output))}
`:'
节点输出

节点完成后,结构化输出会显示在这里。

'}
Sandbox ${escapeHTML(nr.sandboxId||'—')}Session ${escapeHTML(nr.sessionId||'—')}

节点交付物

${nodeArtifacts.length} 个版本
${nodeArtifacts.map(a=>``).join('')||'
◇

此节点还没有登记交付物

'}
${runIsGroupMode(r)?'
':''}

${telemetrySectionTitle(telAdapter)}

${telPage?`${telemetry.length} 条已加载`:'加载最近 100 条'}
${telemetrySourceTabs(telAdapter,'data-tel-adapter')}${telPage?.hasMore?``:''}
${telPage?([...telemetry].reverse().map(telemetryItemHTML).join('')||`

${telemetryEmptyHint(telAdapter)}

`):'

正在加载轨迹…

'}

Worker 日志

${logPage?`${visibleWorkerLogs(logPage.items).length} 条调用`:(logBusy?'正在接收…':'实时加载最近调用')}
${logPage?.hasMore?``:''}
${logPage?(visibleWorkerLogs(logPage.items).map(logLineHTML).join('')||'

该节点没有日志

'):'

正在加载 Worker 实时日志…

'}
`; host.querySelector('.run-detail-main')?.insertAdjacentHTML('beforeend',`
${workspacePaneHTML(r)}
${previewEnabled?`
${previewPaneHTML(r)}
`:''}
${runEvalPaneHTML(r)}
`); + host.innerHTML=`
${issueRef}›${escapeHTML(wf.name)}
${r.executionContext?.parentRunId?``:''}
${issueId?``:''}${!r.pauseRequested?refreshRunSOPButtonHTML(r):''}${['queued','running','waiting'].includes(r.status)?'':''}

${escapeHTML(ctx.issue?.title||wf.name)}

${escapeHTML(r.input||'无运行输入')}

${workspaceRestoreButtonHTML()}${runDisplayStatus(r)}${r.status==='failed'&&!gongfengIssueClosed(ctx.issue)?'':''}${canManuallyPassFailedNode(r)&&!gongfengIssueClosed(ctx.issue)?``:''}
Run ${escapeHTML(r.id.slice(-12))}${runModeChipHTML(r,wf)}${runExecutionChipHTML(r)}启动于 ${new Date(r.createdAt).toLocaleString()}执行 ${runElapsed(r)}${runWallNote(r)}
执行详情
${runProgressCellHTML(r,wf,progress,graphNodes)}
${liveUsageHTML(r)}
交付物${(r.artifacts||[]).length} 个不可变快照按节点和尝试次数保留版本
${alignPanelHTML}${runIsGroupMode(r)?`
已冷冻 SOP 快照历史协作 · ${graphNodes.length} 个节点可展开审计
`:''}

节点执行拓扑

点击节点查看该节点的输出、产物和执行事件
完成运行中待审批未开始
${graphNodes.map((n,index)=>{const gv=graphNodeView(r,n.id),meta=nodeMeta(n),arts=(r.artifacts||[]).filter(a=>a.nodeId===n.id).length;return `${index?'→':''}`}).join('')}

${escapeHTML(selected?.name||'节点详情')}

当前活动:${escapeHTML(nr.activity||'')}${escapeHTML(nr.provider||'未分配')}${nr.model?` · ${escapeHTML(nr.model)}`:''}
${statusText(nr.status)||'待执行'}
执行次数${nr.attempt||0}
返工${nr.reworkCount||0}
Token${formatTokens(nr.usage?.totalTokens)}
工具调用${nr.toolCalls||0}
${childSOPPanelHTML(r,selected?.id)}${gateResultCardHTML(nr)}${canRerunFromHere(r,selected?.id)?`
保留上游结果,从本节点及下游重跑
`:''}${nr.output?`
节点输出
${escapeHTML(displayNodeOutput(nr.output))}
`:'
节点输出

节点完成后,结构化输出会显示在这里。

'}
Sandbox ${escapeHTML(nr.sandboxId||'—')}Session ${escapeHTML(nr.sessionId||'—')}

节点交付物

${nodeArtifacts.length} 个版本
${nodeArtifacts.map(a=>``).join('')||'
◇

此节点还没有登记交付物

'}
${runIsGroupMode(r)?'
':''}

${telemetrySectionTitle(telAdapter)}

${telPage?`${telemetry.length} 条已加载`:'加载最近 100 条'}
${telemetrySourceTabs(telAdapter,'data-tel-adapter')}${telPage?.hasMore?``:''}
${telPage?([...telemetry].reverse().map(telemetryItemHTML).join('')||`

${telemetryEmptyHint(telAdapter)}

`):'

正在加载轨迹…

'}

Worker 日志

${logPage?`${visibleWorkerLogs(logPage.items).length} 条调用`:(logBusy?'正在接收…':'实时加载最近调用')}
${logPage?.hasMore?``:''}
${logPage?(visibleWorkerLogs(logPage.items).map(logLineHTML).join('')||'

该节点没有日志

'):'

正在加载 Worker 实时日志…

'}
`; host.querySelector('.run-detail-main')?.insertAdjacentHTML('beforeend',`
${workspacePaneHTML(r)}
${previewEnabled?`
${previewPaneHTML(r)}
`:''}
${runEvalPaneHTML(r)}
`); if(keepFrame){const fresh=host.querySelector('iframe[data-vscode-frame]');if(fresh)fresh.replaceWith(existingFrame);} if(keepPreview){const fresh=host.querySelector('iframe[data-preview-frame]');if(fresh)fresh.replaceWith(existingPreviewFrame);} const headerActions=host.querySelector('.run-header-actions');if(r.status==='running'&&headerActions)headerActions.querySelector('[data-cancel-run]')?.insertAdjacentHTML('beforebegin',''); @@ -1441,14 +1442,18 @@ async function previewArtifact(run,artifactId){ const host=$('#artifactPreview'); host.innerHTML='
正在加载交付物…
'; $('#artifactModal').classList.add('open'); + let owner=host.firstElementChild; + const isCurrent=()=>host.firstElementChild===owner&&$('#artifactModal').classList.contains('open'); try{ const res=await fetch(`/api/runs/${encodeURIComponent(run.id)}/artifacts/${encodeURIComponent(artifactId)}`); if(!res.ok)throw new Error(`HTTP ${res.status}`); const content=await res.text(); + if(!isCurrent())return; const isMd=isMarkdownArtifact(artifact, content); let viewMode=isMd?'preview':'source'; function renderModal(){ + if(!isCurrent())return; host.innerHTML=`
@@ -1489,6 +1494,7 @@ async function previewArtifact(run,artifactId){
`; + owner=host.firstElementChild; host.querySelectorAll('.artifact-mode-btn').forEach(btn=>{ btn.onclick=()=>{ viewMode=btn.dataset.mode; @@ -1518,7 +1524,7 @@ async function previewArtifact(run,artifactId){ renderModal(); }catch(e){ - host.innerHTML=`
交付物加载失败

${escapeHTML(e.message)}

`; + if(isCurrent())host.innerHTML=`
交付物加载失败

${escapeHTML(e.message)}

`; } } async function runAction(id,action,body){ diff --git a/web/artifacts.css b/web/artifacts.css index bb7ee7c80..a17b5e535 100644 --- a/web/artifacts.css +++ b/web/artifacts.css @@ -32,6 +32,33 @@ .artifact-content{margin:0;padding:0;white-space:pre-wrap;word-break:break-word;font:12px/1.7 var(--mono);color:var(--text)} .artifact-loading{padding:60px 0;text-align:center;color:var(--muted-2);font-size:13px} +/* Read-only workspace file preview */ +.run-file-browser{display:flex;flex-direction:column;flex:1;min-height:0;overflow:hidden} +.run-file-browser>.artifact-preview-head{padding-right:60px} +.run-file-layout{display:grid;grid-template-columns:250px minmax(0,1fr);flex:1;min-height:0;overflow:hidden} +.run-file-sidebar{display:flex;flex-direction:column;min-height:0;min-width:0;border-right:1px solid var(--line);background:var(--bg-soft)} +.run-file-navigation{display:flex;align-items:center;gap:8px;padding:10px;min-width:0} +.run-file-navigation>span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:11px;color:var(--muted)} +.run-file-search{display:grid;gap:6px;padding:0 10px 10px;font-size:11px;color:var(--muted)} +.run-file-search input{width:100%;min-width:0} +.run-file-list{overflow:auto;min-height:0;padding:0 6px 8px;overscroll-behavior:contain} +.run-file-entry{display:flex;align-items:center;gap:8px;width:100%;min-width:0;padding:9px 7px;border:0;border-radius:6px;background:transparent;text-align:left;color:var(--text);cursor:pointer;font-size:12px} +.run-file-entry>span:last-child{overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.run-file-entry:hover,.run-file-entry[aria-current]{background:var(--hover)} +.run-file-entry:focus-visible{outline:2px solid var(--blue);outline-offset:-2px} +.run-file-kind{flex-shrink:0;color:var(--muted);font-size:10px} +.run-file-notice{padding:6px;font-size:11px;color:var(--muted)} +.run-file-document{display:flex;flex-direction:column;min-width:0;min-height:0;overflow:hidden} +.run-file-toolbar{display:flex;align-items:center;justify-content:space-between;gap:10px;padding:10px 16px;border-bottom:1px solid var(--line);font-size:12px} +.run-file-toolbar>b{min-width:0;overflow-wrap:anywhere} +.run-file-toolbar>.artifact-view-mode{flex-shrink:0} +.run-file-document .empty-properties{overflow:auto;padding:24px;overflow-wrap:anywhere} +@media(max-width:650px){ + .run-file-layout{grid-template-columns:minmax(0,1fr);grid-template-rows:minmax(140px,30%) minmax(0,1fr)} + .run-file-sidebar{border-right:0;border-bottom:1px solid var(--line)} + .run-file-document .artifact-body{padding:16px} +} + /* Markdown 渲染样式体系 */ .markdown-body{font-size:13px;line-height:1.75;color:var(--text);word-break:break-word} .markdown-body>*:first-child{margin-top:0!important} diff --git a/web/index.html b/web/index.html index 279e1a123..dca5ae20b 100644 --- a/web/index.html +++ b/web/index.html @@ -1332,6 +1332,7 @@

确认操作

+ diff --git a/webtest/tests/run-file-preview.test.mjs b/webtest/tests/run-file-preview.test.mjs new file mode 100644 index 000000000..1fc245e88 --- /dev/null +++ b/webtest/tests/run-file-preview.test.mjs @@ -0,0 +1,92 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import {loadApp,settle} from '../lib/load-app.mjs'; + +function files(app){ + app.router.get('/api/runs/run-1/workspace/tree',{entries:[ + {path:'reports',name:'reports',type:'directory'}, + {path:'reports/analysis.md',name:'analysis.md',type:'file'}, + {path:'notes.txt',name:'notes.txt',type:'file'}, + ]}); + app.router.get('/api/runs/run-1/workspace/file',call=>({content:call.url.searchParams.get('path')==='notes.txt'?'plain ':'# Analysis\n\n**Verified** report.\n',path:call.url.searchParams.get('path')})); +} + +test('run files are available without the IDE and Markdown can switch to source',async t=>{ + const app=await loadApp();t.after(app.close);files(app); + app.evaluate(`state.activeRun=state.data.runs[0];state.selectedRun=state.activeRun.id;renderRunDetail(state.activeRun)`); + const entry=app.document.querySelector('[data-run-files]');assert.ok(entry);entry.click();await settle(4); + app.document.querySelector('[data-run-file-path="reports"]').click(); + app.document.querySelector('[data-run-file-path="reports/analysis.md"]').click();await settle(4); + const host=app.document.querySelector('#artifactPreview'); + assert.equal(host.querySelector('.markdown-body h1').textContent,'Analysis'); + assert.equal(host.querySelector('.markdown-body strong').textContent,'Verified'); + assert.equal(host.querySelector('script'),null); + host.querySelector('[data-run-file-mode="source"]').click(); + assert.match(host.querySelector('pre').textContent,/# Analysis/); + host.querySelector('[data-run-file-up]').click(); + assert.ok(host.querySelector('[data-run-file-path="notes.txt"]')); + assert.equal(app.router.calls.filter(c=>c.path.includes('/workspace/')&&c.method!=='GET').length,0); + assert.equal(host.querySelector('iframe'),null); +}); + +test('large file lists stay bounded and search can find entries beyond the first page',async t=>{ + const app=await loadApp();t.after(app.close); + app.router.get('/api/runs/run-1/workspace/tree',{entries:Array.from({length:230},(_,i)=>({path:`report-${String(i).padStart(3,'0')}.md`,type:'file'})),truncated:true}); + app.evaluate(`previewRunFiles(state.data.runs[0])`);await settle(4); + const host=app.document.querySelector('#artifactPreview'); + assert.equal(host.querySelectorAll('[data-run-file-path]').length,200); + assert.match(host.textContent,/服务端上限/); + const search=host.querySelector('[data-run-file-search]');search.value='report-229';search.dispatchEvent(new app.window.Event('input',{bubbles:true})); + assert.equal(host.querySelectorAll('[data-run-file-path]').length,1); + assert.equal(host.querySelector('[data-run-file-path]').dataset.runFilePath,'report-229.md'); +}); + +test('a closed preview and a newer modal are not changed by a delayed file response',async t=>{ + const app=await loadApp();t.after(app.close);files(app); + let release;const wait=new Promise(resolve=>release=resolve); + app.router.get('/api/runs/run-1/workspace/file',async()=>{await wait;return {content:'# late'}}); + app.evaluate(`previewRunFiles(state.data.runs[0])`);await settle(4); + app.document.querySelector('[data-run-file-path="notes.txt"]').click();await settle(2); + app.document.querySelector('#artifactModal').classList.remove('open'); + app.document.querySelector('#artifactPreview').innerHTML='

new modal content

'; + release();await settle(4); + assert.equal(app.document.querySelector('#artifactPreview').textContent,'new modal content'); + assert.equal(app.document.querySelector('#artifactModal').classList.contains('open'),false); +}); + +test('file search finds nested reports and only the newest file response is shown',async t=>{ + const app=await loadApp();t.after(app.close);files(app); + let release;const wait=new Promise(resolve=>release=resolve); + app.router.get('/api/runs/run-1/workspace/file',async call=>{ + const path=call.url.searchParams.get('path');if(path==='reports/analysis.md')await wait; + return {path,content:path==='notes.txt'?'latest text':'# Old report'}; + }); + app.evaluate(`previewRunFiles(state.data.runs[0])`);await settle(4); + const search=app.document.querySelector('[data-run-file-search]');search.value='analysis';search.dispatchEvent(new app.window.Event('input',{bubbles:true})); + app.document.querySelector('[data-run-file-path="reports/analysis.md"]').click();await settle(2); + search.value='notes';search.dispatchEvent(new app.window.Event('input',{bubbles:true})); + app.document.querySelector('[data-run-file-path="notes.txt"]').click();await settle(4); + release();await settle(4); + assert.equal(app.document.querySelector('#artifactPreview pre').textContent,'latest text'); +}); + +test('an unavailable workspace explains how to use the existing restore entry',async t=>{ + const app=await loadApp();t.after(app.close); + app.router.get('/api/runs/run-1/workspace/tree',{status:410,body:{error:'工作区已回收;请先恢复'}}); + app.evaluate(`previewRunFiles(state.data.runs[0])`);await settle(4); + assert.match(app.document.querySelector('#artifactPreview').textContent,/工作区已回收/); + assert.match(app.document.querySelector('#artifactPreview').textContent,/工作区.*恢复/); +}); + +test('a previously opened artifact cannot replace a newer workspace preview',async t=>{ + const app=await loadApp();t.after(app.close);files(app); + let release;const wait=new Promise(resolve=>release=resolve); + app.router.get('/api/runs/run-1/artifacts/old-artifact',async()=>{await wait;return '# Old immutable artifact'}); + app.evaluate(`previewArtifact({...state.data.runs[0],artifacts:[{id:'old-artifact',name:'old.md',path:'old.md'}]},'old-artifact')`); + await settle(2); + app.document.querySelector('#artifactModal').classList.remove('open'); + app.evaluate(`previewRunFiles(state.data.runs[0])`);await settle(4); + release();await settle(4); + assert.ok(app.document.querySelector('.run-file-browser')); + assert.ok(app.document.querySelector('[data-run-file-search]')); +});