diff --git a/frontend/batch-find-work.js b/frontend/batch-find-work.js
index a7e2422..db9eb06 100644
--- a/frontend/batch-find-work.js
+++ b/frontend/batch-find-work.js
@@ -1,4 +1,11 @@
-function createBatchFindWork({ capacity, claim, queue, onProgress = () => {} }) {
+function createBatchFindWork({
+ capacity,
+ claim,
+ queue,
+ timeBudget = () => ({ capacity_minutes: null, planned_minutes: 0 }),
+ persistEstimate = () => {},
+ onProgress = () => {},
+}) {
let request = null;
function result(status, selected, available, queued = [], failed = []) {
@@ -9,7 +16,7 @@ function createBatchFindWork({ capacity, claim, queue, onProgress = () => {} })
return String(item.repository || '') + '#' + String(item.number || '');
}
- function run(items) {
+ function run(items, estimates = {}) {
if (request) return request;
const selected = Array.isArray(items) ? items.slice() : [];
const available = Math.max(0, Number(capacity()) || 0);
@@ -18,6 +25,27 @@ function createBatchFindWork({ capacity, claim, queue, onProgress = () => {} })
onProgress(outcome);
return Promise.resolve(outcome);
}
+ const budget = timeBudget() || {};
+ if (Number.isInteger(budget.capacity_minutes) && budget.capacity_minutes > 0) {
+ const remaining = Math.max(0, budget.capacity_minutes - (Number(budget.planned_minutes) || 0));
+ const invalid = selected.map(key).filter(id =>
+ !Number.isInteger(estimates[id]) || estimates[id] <= 0
+ );
+ const requested = selected.reduce((sum, item) => sum +
+ (Number.isInteger(estimates[key(item)]) && estimates[key(item)] > 0 ? estimates[key(item)] : 0), 0);
+ if (invalid.length) {
+ const outcome = { ...result('estimates-required', selected.length, available),
+ remaining_minutes: remaining, requested_minutes: requested, invalid };
+ onProgress(outcome);
+ return Promise.resolve(outcome);
+ }
+ if (requested > remaining) {
+ const outcome = { ...result('over-budget', selected.length, available),
+ remaining_minutes: remaining, requested_minutes: requested, over_minutes: requested - remaining };
+ onProgress(outcome);
+ return Promise.resolve(outcome);
+ }
+ }
request = (async () => {
const queued = [];
const failed = [];
@@ -28,6 +56,9 @@ function createBatchFindWork({ capacity, claim, queue, onProgress = () => {} })
const queueResult = await queue(confirmed);
if (queueResult === 'queued' || queueResult === 'exists') {
queued.push(key(item));
+ if (Number.isInteger(estimates[key(item)]) && estimates[key(item)] > 0) {
+ persistEstimate(confirmed, estimates[key(item)]);
+ }
} else {
failed.push({
key: key(item),
diff --git a/frontend/dashboard.css b/frontend/dashboard.css
index e536d4e..8c468d9 100644
--- a/frontend/dashboard.css
+++ b/frontend/dashboard.css
@@ -467,6 +467,14 @@ textarea { resize: vertical; min-height: 120px; }
.find-work-batch-actions[hidden] { display:none; }
.find-work-batch-actions span { grid-column:1 / -1; }
.find-work-batch-actions button { min-height:44px; }
+.find-work-estimate-review { display:grid; gap:12px; padding:12px; border:1px solid #2a496e; border-radius:12px; background:#101f36; }
+.find-work-estimate-review[hidden] { display:none; }
+.find-work-estimate-review > div:first-child, #find-work-estimate-list { display:grid; gap:8px; }
+.find-work-estimate-row { display:grid; grid-template-columns:minmax(0,1fr) minmax(92px,auto); gap:10px; align-items:center; overflow-wrap:anywhere; }
+.find-work-estimate-row label { display:flex; align-items:center; gap:6px; }
+.find-work-estimate-review input { min-height:44px; width:76px; }
+.find-work-estimate-actions { position:sticky; bottom:0; display:grid; grid-template-columns:1fr 1fr; gap:8px; padding-bottom:env(safe-area-inset-bottom); background:#101f36; }
+.find-work-estimate-actions button { min-height:44px; }
.find-work-card button { width:100%; font-weight:700; }
.find-work-claim-actions { display:grid; grid-template-columns:repeat(2,minmax(0,1fr)); gap:8px; }
.find-work-claim-actions [data-claim-start-index] { grid-column:1 / -1; }
diff --git a/frontend/dashboard.js b/frontend/dashboard.js
index 6e17bdf..a85b124 100644
--- a/frontend/dashboard.js
+++ b/frontend/dashboard.js
@@ -1393,12 +1393,31 @@
const batchFindWork = createBatchFindWork({
capacity: () => Math.max(0, todayWork.limit - todayWork.read().length),
+ timeBudget: () => {
+ const plan = todayWork.planning();
+ return {
+ capacity_minutes: plan.capacity_minutes,
+ planned_minutes: Object.values(plan.estimates).reduce((sum, minutes) => sum + minutes, 0),
+ };
+ },
claim: item => findWorkController.claim(item),
queue: confirmed => queueToday(acceptClaimedIssue(confirmed)),
+ persistEstimate: (confirmed, minutes) => {
+ const plan = todayWork.planning();
+ plan.estimates[todayWork.identity(confirmed)] = minutes;
+ todayWork.replacePlanning(plan);
+ todaySync.enqueueConfiguration(plan.capacity_minutes, plan.estimates);
+ todaySync.flush();
+ },
onProgress: progress => {
if (progress.status === 'full') {
qs('#find-work-status').textContent = 'Today has ' + progress.available +
' open slot' + (progress.available === 1 ? '' : 's') + '. Reduce the selection before assigning.';
+ } else if (progress.status === 'estimates-required') {
+ qs('#find-work-estimate-summary').textContent = 'Add an estimate for every issue.';
+ } else if (progress.status === 'over-budget') {
+ qs('#find-work-estimate-summary').textContent = formatPlanMinutes(progress.over_minutes) +
+ ' over Today’s remaining time. Reduce an estimate or selection.';
} else if (progress.status === 'running') {
qs('#find-work-status').textContent = 'Assigning and queueing ' + progress.processed +
' of ' + progress.selected + '…';
@@ -1406,6 +1425,34 @@
},
});
+ function findWorkEstimateValues() {
+ return Object.fromEntries(Array.from(document.querySelectorAll('[data-find-work-estimate]')).map(input =>
+ [input.dataset.findWorkEstimate, Number(input.value)]
+ ));
+ }
+
+ function closeFindWorkEstimateReview() {
+ qs('#find-work-estimate-review').hidden = true;
+ qs('#batch-find-work-actions').hidden = !findWorkController.selection().active;
+ }
+
+ function openFindWorkEstimateReview(items) {
+ const plan = todayWork.planning();
+ const planned = Object.values(plan.estimates).reduce((sum, minutes) => sum + minutes, 0);
+ qs('#find-work-estimate-summary').textContent = formatPlanMinutes(Math.max(0, plan.capacity_minutes - planned)) +
+ ' remaining. Estimate selected work before assigning it.';
+ qs('#find-work-estimate-list').innerHTML = items.map(item => {
+ const id = String(item.repository || '') + '#' + String(item.number || '');
+ return '';
+ }).join('');
+ qs('#batch-find-work-actions').hidden = true;
+ qs('#find-work-estimate-review').hidden = false;
+ qs('[data-find-work-estimate]')?.focus();
+ }
+
let planTodayTrigger = null;
function formatPlanMinutes(minutes) {
if (!Number.isInteger(minutes)) return 'Not set';
@@ -4256,6 +4303,10 @@
});
qs('#cancel-find-work-selection').addEventListener('click', () => findWorkController.cancelSelection());
qs('#claim-selected-work').addEventListener('click', async event => {
+ if (todayWork.planning().capacity_minutes !== null) {
+ openFindWorkEstimateReview(findWorkController.selectedItems());
+ return;
+ }
event.currentTarget.disabled = true;
const outcome = await batchFindWork.run(findWorkController.selectedItems());
if (outcome.status === 'complete') {
@@ -4275,6 +4326,23 @@
event.currentTarget.disabled = false;
}
});
+ qs('#cancel-find-work-estimates').addEventListener('click', closeFindWorkEstimateReview);
+ qs('#confirm-find-work-estimates').addEventListener('click', async event => {
+ event.currentTarget.disabled = true;
+ const outcome = await batchFindWork.run(findWorkController.selectedItems(), findWorkEstimateValues());
+ event.currentTarget.disabled = false;
+ if (outcome.status === 'estimates-required') {
+ const first = outcome.invalid[0];
+ document.querySelector('[data-find-work-estimate="' + CSS.escape(first) + '"]')?.focus();
+ return;
+ }
+ if (outcome.status !== 'complete') return;
+ qs('#find-work-status').textContent = outcome.queued.length + ' queued' +
+ (outcome.failed.length ? ' · ' + outcome.failed.length + ' unavailable.' : '.');
+ closeFindWorkEstimateReview();
+ if (!outcome.failed.length) findWorkController.cancelSelection();
+ refreshMyWorkView();
+ });
qs('#load-more-available').addEventListener('click', async event => {
event.currentTarget.disabled = true;
qs('#find-work-status').textContent = 'Loading more available issues…';
diff --git a/frontend/index.html b/frontend/index.html
index 8393a41..d5fdcc8 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -544,6 +544,15 @@
Open Find Work to load available issues.
+
+ Fit this work into Today
+
+
+
+
+
+
+
No work selected.
diff --git a/tests/test_batch_find_work.py b/tests/test_batch_find_work.py
index aa14829..b44ca3a 100644
--- a/tests/test_batch_find_work.py
+++ b/tests/test_batch_find_work.py
@@ -109,6 +109,81 @@ flow.run([{{repository:'stackchain/dashboard',number:671}}])
}
+def test_time_budget_blocks_claims_until_every_estimate_fits():
+ script = f"""
+const createBatchFindWork=require({json.dumps(str(BATCH_FIND_WORK))});
+const calls=[];
+const flow=createBatchFindWork({{
+ capacity:()=>3,
+ timeBudget:()=>({{capacity_minutes:90,planned_minutes:30}}),
+ claim:item=>{{calls.push('claim:'+item.number);return Promise.resolve(item);}},
+ queue:item=>{{calls.push('queue:'+item.number);return 'queued';}},
+}});
+const items=[701,702].map(number=>({{repository:'stackchain/dashboard',number}}));
+Promise.all([
+ flow.run(items, {{'stackchain/dashboard#701':30}}),
+ flow.run(items, {{'stackchain/dashboard#701':30,'stackchain/dashboard#702':45}}),
+]).then(results=>process.stdout.write(JSON.stringify({{results,calls}})));
+"""
+ assert run_node(script) == {
+ "results": [
+ {
+ "status": "estimates-required", "selected": 2, "available": 3,
+ "queued": [], "failed": [], "remaining_minutes": 60,
+ "requested_minutes": 30,
+ "invalid": ["stackchain/dashboard#702"],
+ },
+ {
+ "status": "over-budget", "selected": 2, "available": 3,
+ "queued": [], "failed": [], "remaining_minutes": 60,
+ "requested_minutes": 75, "over_minutes": 15,
+ },
+ ],
+ "calls": [],
+ }
+
+
+def test_time_budget_persists_estimates_only_for_successfully_queued_claims():
+ script = f"""
+const createBatchFindWork=require({json.dumps(str(BATCH_FIND_WORK))});
+const calls=[];
+const flow=createBatchFindWork({{
+ capacity:()=>3,
+ timeBudget:()=>({{capacity_minutes:120,planned_minutes:30}}),
+ claim:item=>item.number===702 ? Promise.reject(new Error('already claimed')) : Promise.resolve(item),
+ queue:item=>'queued',
+ persistEstimate:(item,minutes)=>calls.push(item.number+':'+minutes),
+}});
+flow.run([701,702].map(number=>({{repository:'stackchain/dashboard',number}})),{{
+ 'stackchain/dashboard#701':30,
+ 'stackchain/dashboard#702':45,
+}}).then(result=>process.stdout.write(JSON.stringify({{result,calls}})));
+"""
+ assert run_node(script) == {
+ "result": {
+ "status": "complete", "selected": 2, "available": 3,
+ "queued": ["stackchain/dashboard#701"],
+ "failed": [{"key": "stackchain/dashboard#702", "reason": "already claimed"}],
+ },
+ "calls": ["701:30"],
+ }
+
+
+def test_mobile_find_work_has_preclaim_time_review_controls():
+ html = HTML.read_text()
+ dashboard = DASHBOARD.read_text()
+ css = CSS.read_text()
+
+ assert 'id="find-work-estimate-review"' in html
+ assert 'id="find-work-estimate-list"' in html
+ assert 'id="confirm-find-work-estimates"' in html
+ assert 'inputmode="numeric"' in dashboard
+ assert "timeBudget: () =>" in dashboard
+ assert "persistEstimate:" in dashboard
+ assert ".find-work-estimate-review" in css
+ assert ".find-work-estimate-review input" in css and "min-height:44px" in css
+
+
def test_find_work_selection_survives_loaded_pages_and_removes_confirmed_claims():
script = f"""
const createFindWork=require({json.dumps(str(PICK_WORK))});