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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/decompnet/app/static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ <h3 id="repositorySyncTitle">Version history and sharing</h3>
<div class="row"><label class="field"><span>Default threads per background task</span><input id="backgroundLimit" type="number" min="0" step="1" placeholder="Automatic"></label><button class="ghost small-btn" id="backgroundLimitSave" type="button">Apply limit</button></div>
<p class="small muted">0 = automatic. Limits machine drafts and the background permuter across projects. Already queued work finishes at the old limit; new work uses the new limit. Agents, deep passes and imports have separate concurrency. Stopped automatic workers can start again when you open their project.</p>
<p class="small muted">Lists Python-managed threads. CPU measures the listed threads only, not a whole job’s subprocesses. Purpose-owned tasks list their active threads and offer Stop. Essential server and library threads remain read only. “Measuring…” needs a second sample; “Unavailable” means no supported counter. Thread purposes describe roles, not current call stacks.</p>
<label class="field background-thread-sort"><span>Sort activity</span><select id="backgroundThreadSort"><option value="cpu">Highest CPU first</option><option value="name">Name</option><option value="role">Purpose</option></select></label>
<div class="row"><label class="field background-thread-sort"><span>Sort activity</span><select id="backgroundThreadSort"><option value="cpu">Highest CPU first</option><option value="name">Name</option><option value="role">Purpose</option></select></label><label class="field background-thread-sort"><span>Group by</span><select id="backgroundGroupBy"><option value="none">None</option><option value="project">Project</option></select></label></div>
<details><summary>Recent UI delays</summary><p class="small muted">Requests and event-loop stalls over half a second, from this app session.</p><div class="small mono" id="backgroundLatency"></div></details><div class="background-feedback"><div id="backgroundWorkStatus" role="status" hidden></div></div><div id="backgroundRows"></div>

</div></section>
Expand Down
14 changes: 13 additions & 1 deletion src/decompnet/app/static/js/background-work.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,18 @@ function mergeBackgroundActivity(data){
function renderBackgroundActivity(){
const sort=$('backgroundThreadSort').value;
const rows=[...backgroundThreadDetails].sort((a,b)=>sort==='name' ? a.title.localeCompare(b.title) : sort==='role' ? a.role.localeCompare(b.role) || a.title.localeCompare(b.title) : (b.cpu_percent ?? -1)-(a.cpu_percent ?? -1) || a.title.localeCompare(b.title));
$('backgroundRows').innerHTML=rows.length ? `<div class="background-table"><table><thead><tr><th>Work / thread</th><th>Purpose &amp; threads</th><th>Project</th><th>Status</th><th>CPU</th><th>Action</th></tr></thead><tbody>${rows.map((item,index)=>`<tr><td><b>${esc(item.title)}</b></td><td>${item.threadOnly ? `<b>${esc(item.role)}</b>` : ''}<div class="small muted">${esc(item.detail)}</div>${item.kind === "startup" && ["running","stopping"].includes(item.state) ? '<div class="workbar" role="progressbar" aria-label="Startup task"><i></i></div>' : ""}${item.threads.map(t=>`<div class="small mono">${item.threadOnly ? '' : esc(t.name)+' · '}ID ${esc(String(t.native_id ?? 'unavailable'))}</div>${!item.threadOnly && t.purpose ? `<div class="small muted">${esc(t.purpose)}</div>` : ''}`).join('')}</td><td>${item.project ? `<a href="#/p/${encodeURIComponent(item.project)}/settings">${esc(item.project)}</a>` : 'App'}</td><td>${esc(item.state)}</td><td class="thread-cpu">${item.cpu_percent!=null ? `${item.cpu_percent.toFixed(1)}%` : item.cpu_state==='measuring' ? 'Measuring…' : 'Unavailable'}${!item.threadOnly && item.threads.length ? '<div class="small muted">Listed threads</div>' : ''}</td><td>${item.stoppable ? `<button class="ghost small-btn" type="button" data-stop-background="${index}"${['stopping','pausing'].includes(item.state) ? ' disabled' : ''}>${item.kind==='autosave' ? (item.state==='paused' ? 'Resume' : item.state==='pausing' ? 'Pausing…' : 'Pause') : item.state==='stopping' ? 'Stopping…' : 'Stop'}</button>` : item.threadOnly ? '<span class="small muted">Read only</span>' : (item.project ? `<a class="small" href="#/p/${encodeURIComponent(item.project)}/settings">Project controls</a>` : '<span class="small muted">Read only</span>')}</td></tr>`).join('')}</tbody></table></div>` : '<p class="muted">No background work or Python-managed threads are visible.</p>';
const grouped=$('backgroundGroupBy').value==='project';
if(grouped)rows.sort((a,b)=>a.project && b.project ? a.project.localeCompare(b.project) : a.project ? -1 : b.project ? 1 : 0);
const sections=[];
rows.forEach((item,index)=>{
const project=item.project || '';
let section=sections.at(-1);
if(!section || (grouped && section.project!==project)){section={project,items:[]};sections.push(section);}
section.items.push({item,index});
});
const renderRow=(item,index)=>`<tr><td><b>${esc(item.title)}</b></td><td>${item.threadOnly ? `<b>${esc(item.role)}</b>` : ''}<div class="small muted">${esc(item.detail)}</div>${item.kind === "startup" && ["running","stopping"].includes(item.state) ? '<div class="workbar" role="progressbar" aria-label="Startup task"><i></i></div>' : ""}${item.threads.map(t=>`<div class="small mono">${item.threadOnly ? '' : esc(t.name)+' · '}ID ${esc(String(t.native_id ?? 'unavailable'))}</div>${!item.threadOnly && t.purpose ? `<div class="small muted">${esc(t.purpose)}</div>` : ''}`).join('')}</td><td>${item.project ? `<a href="#/p/${encodeURIComponent(item.project)}/settings">${esc(item.project)}</a>` : 'App'}</td><td>${esc(item.state)}</td><td class="thread-cpu">${item.cpu_percent!=null ? `${item.cpu_percent.toFixed(1)}%` : item.cpu_state==='measuring' ? 'Measuring…' : 'Unavailable'}${!item.threadOnly && item.threads.length ? '<div class="small muted">Listed threads</div>' : ''}</td><td>${item.stoppable ? `<button class="ghost small-btn" type="button" data-stop-background="${index}"${['stopping','pausing'].includes(item.state) ? ' disabled' : ''}>${item.kind==='autosave' ? (item.state==='paused' ? 'Resume' : item.state==='pausing' ? 'Pausing…' : 'Pause') : item.state==='stopping' ? 'Stopping…' : 'Stop'}</button>` : item.threadOnly ? '<span class="small muted">Read only</span>' : (item.project ? `<a class="small" href="#/p/${encodeURIComponent(item.project)}/settings">Project controls</a>` : '<span class="small muted">Read only</span>')}</td></tr>`;
const body=sections.map(section=>`<tbody>${grouped ? `<tr><th scope="rowgroup" colspan="6">${section.project ? `<a href="#/p/${encodeURIComponent(section.project)}/settings">${esc(section.project)}</a>` : 'App'} <span class="small muted">· ${section.items.length} ${section.items.length===1 ? 'item' : 'items'}</span></th></tr>` : ''}${section.items.map(({item,index})=>renderRow(item,index)).join('')}</tbody>`).join('');
$('backgroundRows').innerHTML=rows.length ? `<div class="background-table"><table><thead><tr><th>Work / thread</th><th>Purpose &amp; threads</th><th>Project</th><th>Status</th><th>CPU</th><th>Action</th></tr></thead>${body}</table></div>` : '<p class="muted">No background work or Python-managed threads are visible.</p>';
$('backgroundRows').querySelectorAll('[data-stop-background]').forEach(button=>{
button.onclick=async()=>{
const item=rows[Number(button.dataset.stopBackground)], label=button.textContent;button.disabled=true;
Expand Down Expand Up @@ -100,6 +111,7 @@ $('backgroundLimitSave').onclick=async()=>{
setInterval(readBackgroundWork,3000);

$('backgroundThreadSort').onchange=renderBackgroundActivity;
$('backgroundGroupBy').onchange=renderBackgroundActivity;

$('maintenanceCpuSave').onclick=async()=>{
const value=Number($('maintenanceCpuLimit').value);
Expand Down
20 changes: 20 additions & 0 deletions tests/gui_background_work.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,25 @@ vm.runInContext(fs.readFileSync('src/decompnet/app/static/js/background-work.js'
assert.equal(bars,0);assert.equal($('backgroundWorkStatus')._workStatus.dataset.state,'error');
const retry=ctx.beginBackgroundWork('Retry');assert.equal(bars,1);assert.equal($('backgroundWorkStatus')._workStatus.dataset.state,'running');retry();
assert.equal(bars,0);assert.equal(maxBars,1);
$('backgroundGroupBy').value='project';$('backgroundThreadSort').value='cpu';
const groupedData={cpu_percent:0,threads:[],cpu_note:'',items:[
{title:'Z task',kind:'purpose',key:'z-high',project:'z-game',thread_ids:[1],stoppable:true},
{title:'A low',kind:'purpose',key:'a-low',project:'a-game',thread_ids:[2],stoppable:true},
{title:'A high',kind:'purpose',key:'a-high',project:'a-game',thread_ids:[3],stoppable:true},
{title:'App task',kind:'purpose',key:'app',thread_ids:[4],stoppable:true}],
thread_details:[{name:'z',native_id:1,cpu_percent:90},{name:'low',native_id:2,cpu_percent:1},{name:'high',native_id:3,cpu_percent:30},{name:'app',native_id:4,cpu_percent:99}]};
ctx.api=async(url,options)=>{stopped=options.body.key;};
ctx.renderBackgroundWork(groupedData);
let html=$('backgroundRows').innerHTML;
assert.equal((html.match(/scope="rowgroup"/g)||[]).length,3);
assert.ok(html.indexOf('a-game')<html.indexOf('z-game'));
assert.ok(html.indexOf('A high')<html.indexOf('A low'));
assert.ok(html.indexOf('Z task')<html.indexOf('App task'));
assert.match(html,/2 items/);
await stopButton.onclick();assert.equal(stopped,'a-high','Stop keeps the grouped row identity');
ctx.renderBackgroundWork(groupedData);assert.equal($('backgroundGroupBy').value,'project','Refresh preserves grouping');
$('backgroundGroupBy').value='none';$('backgroundGroupBy').onchange();
assert.doesNotMatch($('backgroundRows').innerHTML,/scope="rowgroup"/);
await stopButton.onclick();assert.equal(stopped,'app','Ungrouped view restores global CPU sorting');
console.log('background visibility, request deduplication and escaping passed');
})().catch(e=>{console.error(e);process.exitCode=1;});
Loading