feat(orchestrator): overlay the queue order on the Tasks board
queue_order.py parses queue.py list --json into positions and reasons; the Tasks board overlays each card with its queue position, wait and reason, and falls back to Order only when the queue cannot be read. Tests run once on unify/skills-20261114 after the merge (operator order 2026-11-14). 🎯 Fix: 80 % 💥 Break: 10 % 💸 Tokens: 20 % ⏱️ Velocity: 20 % 🛡️ Security: 100 % 🏆 Score: 100 🚦 Gate: ⛔ fix 80 % < 90, break 10 % > 5 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
48f26b678a
commit
e1de1ee0e6
15 files changed
+975
-20
No files matched your search
@@ -6,7 +6,13 @@ const Kanban = (() => {
|
||||
const FREE_FROM = 4;
|
||||
const OFF = ["command"];
|
||||
const DAY = 86400;
|
||||
const HOUR = 3600;
|
||||
const MINUTE = 60;
|
||||
const REFUSED = ["failed", "refused"];
|
||||
const QUEUE = "queue/";
|
||||
const RUNNING = "run";
|
||||
const QUEUE_LAYERS = [["line", "Queue line", "k-queue-line"], ["jobs", "Queue jobs", "k-queue-jobs"]];
|
||||
const CLASS_TONES = {hotfix: "bad", fix: "warn", feature: "info", main: "violet"};
|
||||
|
||||
const onBoard = (row) => !OFF.includes(row.kind);
|
||||
const laneOf = (prio) => (prio === null ? "unpinned" : prio >= FREE_FROM ? "p4" : `p${Math.max(prio, 1)}`);
|
||||
@@ -164,7 +170,102 @@ const Kanban = (() => {
|
||||
return failed.length ? {failed, applied: batch.filter((job) => job.status === "done").length, total: batch.length} : null;
|
||||
}
|
||||
|
||||
return {COLUMNS, LANES, FREE_FROM, onBoard, columnOf, laneOf, labelOf, board, freePin, move, stage, pending, lines, why};
|
||||
/**
|
||||
* @param seconds - a span in seconds.
|
||||
* @returns the span in words, cut to its two largest units: "45 s", "12 min", "2 h 5 min", "3 d 4 h".
|
||||
*/
|
||||
function span(seconds) {
|
||||
const whole = Math.max(0, Math.floor(seconds));
|
||||
if (whole < MINUTE) {
|
||||
return `${whole} s`;
|
||||
}
|
||||
if (whole < HOUR) {
|
||||
return `${Math.floor(whole / MINUTE)} min`;
|
||||
}
|
||||
const [big, unit, small, rest] = whole < DAY ? [HOUR, "h", MINUTE, "min"] : [DAY, "d", HOUR, "h"];
|
||||
const part = Math.floor((whole % big) / small);
|
||||
return part ? `${Math.floor(whole / big)} ${unit} ${part} ${rest}` : `${Math.floor(whole / big)} ${unit}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param rows - the shown cards' rows.
|
||||
* @param line - the hub's queue_line: tasks holding a live queue entry, in grant order.
|
||||
* @param jobs - the hub's queue_jobs: the rows of `queue.py list --json` in grant order, null where the installed
|
||||
* queue.py lists no JSON.
|
||||
* @returns {task: {place, of, jobs}} for each shown card the queue concerns: place its 1-based stop on the queue
|
||||
* line (null for a card off the line), of the line's length, and jobs its queue jobs in grant order, a queue card's
|
||||
* own job and a task card's jobs by task; jobs stays empty without queue_jobs.
|
||||
*/
|
||||
function queued(rows, line, jobs) {
|
||||
const found = {};
|
||||
for (const row of rows) {
|
||||
const place = line.indexOf(row.task);
|
||||
const own = (jobs || []).filter((job) => (row.kind === "queue" ? `${QUEUE}${job.id}` === row.task : job.task === row.task));
|
||||
if (place >= 0 || own.length) {
|
||||
found[row.task] = {place: place >= 0 ? place + 1 : null, of: line.length, jobs: own};
|
||||
}
|
||||
}
|
||||
return found;
|
||||
}
|
||||
|
||||
const placeOf = (job) => (typeof job.position === "number" ? `#${job.position}` : job.position === RUNNING ? "running" : job.position || "?");
|
||||
|
||||
/**
|
||||
* @param job - one queue_jobs row.
|
||||
* @returns the chips of its card overlay in display order, each {key, text, hint, tone}: its grant position, class,
|
||||
* pin, WSJF, the gate it runs (its kind), how long it waits and its ETA; a class, pin, WSJF or wait the row lacks
|
||||
* leaves its chip out, an unknown ETA reads "ETA ?".
|
||||
*/
|
||||
function jobChips(job) {
|
||||
const running = job.position === RUNNING;
|
||||
const chips = [{key: "position", text: placeOf(job), hint: `${job.id}: ${running ? "granted, running now" : `grant position ${placeOf(job)}`}`, tone: "neutral"}];
|
||||
if (job.class) {
|
||||
chips.push({key: "class", text: job.class, hint: `${job.id}: class ${job.class}`, tone: CLASS_TONES[job.class]});
|
||||
}
|
||||
if (job.prio !== null) {
|
||||
chips.push({key: "prio", text: `P${job.prio}`, hint: `${job.id}: its task is pinned P${job.prio}`, tone: "neutral"});
|
||||
}
|
||||
if (job.wsjf !== null) {
|
||||
chips.push({key: "wsjf", text: `WSJF ${Number(job.wsjf.toFixed(2))}`, hint: `${job.id}: WSJF ${job.wsjf} of its task`, tone: "neutral"});
|
||||
}
|
||||
chips.push({key: "gate", text: job.kind || "?", hint: `${job.id}: runs the gate ${job.kind || "of an unknown kind"}`, tone: "teal"});
|
||||
if (job.waited_s !== null) {
|
||||
chips.push({key: "waited", text: `${running ? "waited" : "waits"} ${span(job.waited_s)}`, hint: `${job.id}: ${running ? "waited" : "waits"} ${span(job.waited_s)} in the queue`, tone: "neutral"});
|
||||
}
|
||||
const eta = job.eta_s === null ? "no ETA learned yet" : `${running ? "ends" : "starts"} in about ${span(job.eta_s)}`;
|
||||
chips.push({key: "eta", text: job.eta_s === null ? "ETA ?" : `ETA ${span(job.eta_s)}`, hint: `${job.id}: ${eta}`, tone: "neutral"});
|
||||
return chips;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param job - one queue_jobs row.
|
||||
* @returns {label, place, steps}: the popover's name, where the job stands (#n, running or the word queue.py gave)
|
||||
* and the rule trace that put it there, in the order queue.py applied it; a row without a trace shows its reason
|
||||
* as the only step, one without either says so.
|
||||
*/
|
||||
function whyHere(job) {
|
||||
const steps = job.trace.length ? job.trace : [job.reason || "queue.py gave no trace and no reason for this job"];
|
||||
return {label: `Why here: ${job.id} at ${placeOf(job)}`, place: placeOf(job), steps};
|
||||
}
|
||||
|
||||
/**
|
||||
* @param hidden - the kanban.hidden view-store list: the queue layers switched off.
|
||||
* @returns {line, jobs}: whether the numbered queue line and the job overlay of the cards show.
|
||||
*/
|
||||
function layers(hidden) {
|
||||
return Object.fromEntries(QUEUE_LAYERS.map(([id]) => [id, !hidden.includes(id)]));
|
||||
}
|
||||
|
||||
/**
|
||||
* @param jobs - the hub's queue_jobs.
|
||||
* @returns them with waited_s and eta_s in whole minutes.
|
||||
*/
|
||||
function queueSig(jobs) {
|
||||
const minutes = (value) => (value === null ? null : Math.floor(value / MINUTE));
|
||||
return jobs === null ? null : jobs.map((job) => ({...job, waited_s: minutes(job.waited_s), eta_s: minutes(job.eta_s)}));
|
||||
}
|
||||
|
||||
return {COLUMNS, LANES, FREE_FROM, QUEUE_LAYERS, onBoard, columnOf, laneOf, labelOf, board, freePin, move, stage, pending, lines, why, span, queued, jobChips, whyHere, layers, queueSig};
|
||||
})();
|
||||
if (typeof module === "object" && module.exports) {
|
||||
module.exports = Kanban;
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
const KANBAN_LABELS = {blocked: ["Blocked", "bad"], stopped: ["Stopped", "neutral"]};
|
||||
const KANBAN_COLUMN_ICONS = {queued: "bi-hourglass", running: "bi-play-circle", done: "bi-check2-circle"};
|
||||
const KANBAN_DRAG = "application/x-kvb-task";
|
||||
const kanban = {staged: [], collapsed: new Set(), old: false, dragging: null};
|
||||
const KANBAN_LAYERS = "kanban.hidden";
|
||||
const KANBAN_JOBS_SHOWN = 3;
|
||||
const kanban = {staged: [], collapsed: new Set(), old: false, dragging: null, queue: {marks: {}, line: true, jobs: true}, bound: false};
|
||||
|
||||
function restage(next) {
|
||||
kanban.staged = next;
|
||||
@@ -81,6 +83,65 @@
|
||||
|
||||
const cardOf = (task) => () => [...document.querySelectorAll("#main .kanban-card")].find((node) => node.dataset.task === task) || null;
|
||||
|
||||
function whyButton(task, id) {
|
||||
const card = cardOf(task)();
|
||||
return card ? [...card.querySelectorAll(".queue-why")].find((node) => node.dataset.job === id) || null : null;
|
||||
}
|
||||
|
||||
function openWhy(task, job) {
|
||||
const found = Kanban.whyHere(job);
|
||||
const anchor = () => whyButton(task, job.id);
|
||||
const body = h("div", {class: "popup-body"}, h("ol", {class: "queue-trace", "aria-label": `Rule trace of ${job.id}`}, found.steps.map((step) => h("li", {}, step))),
|
||||
job.reason && job.trace.length ? h("p", {class: "queue-reason"}, `Now: ${job.reason}`) : null);
|
||||
openPopup(found.label, [popupHead(icon("bi-signpost-split"), found.label, h("code", {class: "task-id"}, job.task || task)), body], anchor, () => {
|
||||
const button = anchor();
|
||||
if (button) {
|
||||
button.focus();
|
||||
}
|
||||
});
|
||||
const close = popupBox().querySelector(".popup-head button");
|
||||
if (close) {
|
||||
close.focus();
|
||||
}
|
||||
}
|
||||
|
||||
function queuePlace(row) {
|
||||
const mark = kanban.queue.marks[row.task];
|
||||
if (!kanban.queue.line || !mark || mark.place === null) {
|
||||
return null;
|
||||
}
|
||||
return h("span", {class: "queue-place", "data-place": mark.place, role: "img", ...named(`Queue stop ${mark.place} of ${mark.of}`, `${row.task}: stop ${mark.place} of ${mark.of} on the queue line, in grant order`)}, String(mark.place));
|
||||
}
|
||||
|
||||
function chipHint(job, chip) {
|
||||
if (chip.key === "waited") {
|
||||
return `${chip.hint}, since ${absolute.format(stampOf(state.now - job.waited_s))}`;
|
||||
}
|
||||
return chip.key === "eta" && job.eta_s !== null ? `${chip.hint}, about ${absolute.format(stampOf(state.now + job.eta_s))}` : chip.hint;
|
||||
}
|
||||
|
||||
function queueJob(row, job) {
|
||||
const chips = Kanban.jobChips(job).map((chip) => h("span", {class: "pill queue-chip", "data-chip": chip.key, "data-tone": chip.tone, title: chipHint(job, chip)}, chip.text));
|
||||
const open = (event) => {
|
||||
event.stopPropagation();
|
||||
openWhy(row.task, job);
|
||||
};
|
||||
const hint = `Why ${job.id} stands at ${Kanban.whyHere(job).place}: the rules queue.py applied, in order`;
|
||||
const why = h("button", {type: "button", class: "btn small ghost queue-why", "data-job": job.id, ...named(`Why here: ${job.id}`, hint), on: {click: open}}, icon("bi-question-circle"), h("span", {class: "queue-why-text"}, "Why here?"));
|
||||
return h("li", {class: "queue-job", "data-job": job.id, "data-class": job.class || "", "data-kind": job.kind},
|
||||
h("div", {class: "queue-chips"}, chips, why), job.reason ? h("p", {class: "queue-reason", title: job.reason}, job.reason) : null);
|
||||
}
|
||||
|
||||
function queueJobs(row) {
|
||||
const mark = kanban.queue.marks[row.task];
|
||||
if (!kanban.queue.jobs || !mark || !mark.jobs.length) {
|
||||
return null;
|
||||
}
|
||||
const more = mark.jobs.length - KANBAN_JOBS_SHOWN;
|
||||
return h("ul", {class: "queue-jobs", "aria-label": `Queue jobs of ${row.task}`}, mark.jobs.slice(0, KANBAN_JOBS_SHOWN).map((job) => queueJob(row, job)),
|
||||
more > 0 ? h("li", {class: "queue-more muted"}, `+${more} more queue jobs`) : null);
|
||||
}
|
||||
|
||||
function kanbanCard(row, lane, column, cards) {
|
||||
const open = () => taskSelect(row.task, cardOf(row.task));
|
||||
const own = (event) => !event.target.closest("button, summary, details, select, .kanban-handle");
|
||||
@@ -112,7 +173,7 @@
|
||||
},
|
||||
},
|
||||
},
|
||||
h("div", {class: "head-row", "data-star-slot": ""}, h("code", {class: "task-id"}, row.task), cardLabels(row), h("span", {class: "spacer"}),
|
||||
h("div", {class: "head-row", "data-star-slot": ""}, queuePlace(row), h("code", {class: "task-id"}, row.task), cardLabels(row), h("span", {class: "spacer"}),
|
||||
row.pending ? h("span", {class: "kanban-pending", role: "img", ...named("Staged", row.pending.map(shownArgv).join("\n"))}, icon("bi-pencil")) : null,
|
||||
openJobs(row.task).length ? h("span", {class: "kanban-wait", role: "img", ...named("At the runner", `${row.task}: a signed change waits for the runner`)}, icon("bi-hourglass-split")) : null,
|
||||
row.editable ? h("span", {class: "kanban-handle", role: "img", draggable: "true", ...named("Follows", `Drag onto the card that waits for ${row.task}`), on: {dragstart: dragFrom(row.task, "after"), dragend: () => {
|
||||
@@ -121,6 +182,7 @@
|
||||
row.movable ? kanbanMenu(row, cards) : null),
|
||||
h("span", {class: "kanban-title"}, titleOf(row)),
|
||||
row.worker !== "-" ? h("span", {class: "muted"}, row.worker) : null,
|
||||
queueJobs(row),
|
||||
cardWhy(row.task));
|
||||
}
|
||||
|
||||
@@ -168,17 +230,39 @@
|
||||
const stalled = h("span", {class: "pill", id: "kanban-stale", "data-tone": "warn", role: "img", ...named(`Stale: ${stale}`, `Stale: ${stale} tasks without a register change for ${Plan.STALE_DAYS} days, counted apart`)}, icon("bi-hourglass-bottom"), String(stale));
|
||||
const listed = count ? h("ol", {class: "kanban-staged", id: "kanban-staged", "aria-label": `${words}: the passkey signs exactly these`},
|
||||
kanban.staged.map(({task, argv}) => h("li", {"data-task": task}, h("code", {}, shownArgv(argv))))) : null;
|
||||
return [h("div", {class: "kanban-bar", role: "toolbar", "aria-label": "Board"}, apply, discard, older, stalled), listed];
|
||||
return [h("div", {class: "kanban-bar", role: "toolbar", "aria-label": "Board"}, apply, discard, older, stalled, queueLegend()), listed];
|
||||
}
|
||||
|
||||
function queueLegend() {
|
||||
const layers = LegendChips.render(Kanban.QUEUE_LAYERS.map(([id, label, tone]) => ({id, label, tone})), KANBAN_LAYERS, "hidden");
|
||||
const words = "The installed queue.py lists no JSON (queue.py list --json): the board numbers the grant order but shows no class, gate, ETA or rule trace";
|
||||
const only = state.queue_jobs === null && state.queue_line.length ? h("span", {class: "pill", id: "kanban-queue-order", "data-tone": "warn", role: "img", ...named("Queue order only", words)}, icon("bi-info-circle"), "Order only") : null;
|
||||
return [layers, only];
|
||||
}
|
||||
|
||||
function bindLayers() {
|
||||
if (!kanban.bound) {
|
||||
kanban.bound = true;
|
||||
ViewStore.on(KANBAN_LAYERS, () => {
|
||||
taskView.sig = "";
|
||||
drawTasks();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function kanbanLines(box, rows) {
|
||||
const svg = box.querySelector("svg.kanban-lines");
|
||||
const base = box.getBoundingClientRect();
|
||||
const rectOf = (task) => {
|
||||
const node = [...box.querySelectorAll(".kanban-card")].find((card) => card.dataset.task === task);
|
||||
const rectIn = (node) => {
|
||||
const found = node && node.getClientRects().length ? node.getBoundingClientRect() : null;
|
||||
return found && {x: found.left - base.left, y: found.top - base.top, w: found.width, h: found.height};
|
||||
};
|
||||
const cardNode = (task) => [...box.querySelectorAll(".kanban-card")].find((card) => card.dataset.task === task) || null;
|
||||
const rectOf = (task) => rectIn(cardNode(task));
|
||||
const stopOf = (task) => {
|
||||
const card = cardNode(task);
|
||||
return rectIn(card && card.querySelector(".queue-place")) || rectIn(card);
|
||||
};
|
||||
const centre = (r) => ({x: r.x + r.w / 2, y: r.y + r.h / 2});
|
||||
const rim = (r, toward) => {
|
||||
const c = centre(r);
|
||||
@@ -187,7 +271,7 @@
|
||||
return {x: c.x + dx * scale, y: c.y + dy * scale};
|
||||
};
|
||||
const hub = new Map(state.tasks.map((row) => [row.task, row]));
|
||||
const {arrows, queue} = Kanban.lines(rows, state.queue_line);
|
||||
const {arrows, queue} = Kanban.lines(rows, kanban.queue.line ? state.queue_line : []);
|
||||
const marks = [];
|
||||
for (const {from, to} of arrows) {
|
||||
const [a, b] = [rectOf(from), rectOf(to)];
|
||||
@@ -199,7 +283,7 @@
|
||||
s("title", {}, `${to} follows ${from}: click to remove`), s("path", {class: "kanban-hit", d}), s("path", {class: "kanban-link", d, "marker-end": "url(#kanban-tip)"})));
|
||||
}
|
||||
}
|
||||
const stops = queue.map(rectOf).filter(Boolean).map(centre);
|
||||
const stops = queue.map(stopOf).filter(Boolean).map(centre);
|
||||
if (stops.length > 1) {
|
||||
marks.push(s("polyline", {class: "kanban-queue", "data-tasks": queue.filter((task) => rectOf(task)).join(" "), points: stops.map((at) => `${fixed(at.x)},${fixed(at.y)}`).join(" ")}, s("title", {}, "Queue order")));
|
||||
}
|
||||
@@ -215,6 +299,8 @@
|
||||
}
|
||||
const ids = new Set(shown.map((row) => row.task));
|
||||
const rows = Kanban.pending(state.tasks, kanban.staged).filter((row) => ids.has(row.task) && Kanban.onBoard(row));
|
||||
bindLayers();
|
||||
kanban.queue = {marks: Kanban.queued(rows, state.queue_line, state.queue_jobs), ...Kanban.layers(ViewStore.get(KANBAN_LAYERS))};
|
||||
const {lanes} = Kanban.board(rows, {now: state.now, old: kanban.old});
|
||||
const cards = lanes.flatMap((lane) => Object.values(lane.cells).flat());
|
||||
const head = h("div", {class: "kanban-head"}, TASK_COLUMNS.map(([id, label]) => h("h3", {class: "task-column group-title", "data-column": id}, icon(KANBAN_COLUMN_ICONS[id]), label,
|
||||
|
||||
@@ -191,7 +191,7 @@
|
||||
stage3d("tasks", dom.stage);
|
||||
}
|
||||
const q = taskView.q.trim().toLowerCase();
|
||||
const sig = JSON.stringify([state.tasks, state.jobs, state.task_edges, settings.estimation, settings.trend, taskView.filter, taskView.sort, taskView.descending, taskView.forecast, taskView.scope, q, waitingCount(), Math.floor(nowSeconds() / 60)]);
|
||||
const sig = JSON.stringify([state.tasks, state.jobs, state.task_edges, state.queue_line, Kanban.queueSig(state.queue_jobs), settings.estimation, settings.trend, taskView.filter, taskView.sort, taskView.descending, taskView.forecast, taskView.scope, q, waitingCount(), Math.floor(nowSeconds() / 60)]);
|
||||
if (sig === taskView.sig) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -32,6 +32,20 @@ svg .kanban-hit { fill: none; stroke: transparent; stroke-width: 12; pointer-eve
|
||||
svg .kanban-arrow.pending .kanban-link { opacity: .55; }
|
||||
svg .kanban-tip { fill: var(--violet); }
|
||||
svg .kanban-queue { fill: none; stroke: var(--warn); stroke-width: 1.6; stroke-dasharray: 6 4; }
|
||||
.kanban-card .queue-place + .task-id { flex-basis: calc(100% - 2.4em); }
|
||||
.queue-place { display: inline-grid; flex: none; place-items: center; min-width: 1.7em; height: 1.7em; padding: 0 4px; border: 2px solid var(--warn); border-radius: 999px; background: var(--warn-soft); color: var(--warn); font-size: var(--fs-2xs); font-weight: 750; font-variant-numeric: tabular-nums; line-height: 1; }
|
||||
.queue-jobs { display: grid; gap: 4px; min-width: 0; margin: 0; padding: 0; list-style: none; }
|
||||
.queue-job { display: grid; gap: 2px; min-width: 0; padding-top: 4px; border-top: 1px dashed var(--line); }
|
||||
.queue-chips { display: flex; flex-wrap: wrap; align-items: center; gap: 3px; min-width: 0; }
|
||||
.queue-chips .pill { max-width: 100%; padding: 0 6px; line-height: 18px; white-space: normal; overflow-wrap: anywhere; }
|
||||
.queue-chips .queue-why { min-width: 0; padding: 0 6px; font-size: var(--fs-xs); }
|
||||
.queue-reason, .queue-more { margin: 0; color: var(--muted); font-size: var(--fs-2xs); overflow-wrap: anywhere; }
|
||||
.queue-trace { display: grid; gap: 4px; margin: 0; padding-left: 1.4em; overflow-wrap: anywhere; }
|
||||
.legend-chip.k-queue-line { --c: var(--warn); }
|
||||
.legend-chip.k-queue-jobs { --c: var(--teal); }
|
||||
@media (max-width: 640px) {
|
||||
.queue-why-text { display: none; }
|
||||
}
|
||||
svg .burn-finish-line { fill: none; stroke: var(--c); stroke-width: 2; stroke-dasharray: 8 3; }
|
||||
svg .burn-finish-end { fill: var(--c); }
|
||||
svg.burn .k-fixed, .burn-key.k-fixed { --c: var(--violet); }
|
||||
|
||||
Reference in new issue
Block a user