cloving 1.3.0 → 1.5.0

package/dist/src/cli/watch-board-view.js

@@ -1,3 +1,5 @@
+import { scheduleStatusLine, scheduledText } from "./schedule-render.js";
+import { CommandWaits, effectBudgetText } from "./command-waits.js";
 import { AddCard } from "./watch-card-view.js";
 import { priceText } from "./usage-render.js";
 import { component, element } from "./watch-element.js";
@@ -40,8 +42,6 @@ export function cardReview(card) {
         .join(" · ");
 }
 export function CardReview(props) {
-    if (props.workflowId !== "develop-issue")
-        return null;
     const review = cardReview(props.card);
     if (review === "")
         return null;
@@ -117,6 +117,12 @@ export function Card(props) {
                         children: cardStep(card, now),
                     }),
                     component(CardReview, { card, workflowId }),
+                    card.scheduled === undefined
+                        ? null
+                        : element("span", {
+                            class: "meta",
+                            children: scheduledText(card.scheduled),
+                        }),
                     element("span", {
                         class: "card-cost",
                         children: `${card.currentStep === null ? "Totals" : "Totals so far"} · ${priceText(card.claudeCostUsd, card.estimatedCostUsd)}`,
@@ -131,6 +137,11 @@ export function Card(props) {
                 ],
             }),
             completionMark(card, { workflowId, now: props.observationNow ?? now }),
+            element("span", {
+                class: "meta",
+                children: effectBudgetText(card.spent, card.limit),
+            }),
+            component(CommandWaits, { waits: card.commandWaits ?? [] }),
             component(HandoffLinks, { run: card }),
         ],
     });
@@ -231,6 +242,12 @@ export function Board(props) {
                 class: "visually-hidden",
                 children: workflow.workflowId,
             }),
+            workflow.schedule === undefined
+                ? null
+                : element("p", {
+                    class: "meta",
+                    children: scheduleStatusLine(workflow.schedule, "watch"),
+                }),
             element("div", {
                 class: "columns",
                 children: workflow.columns.map((column, index) => component(Column, {

package/dist/src/cli/watch-board.d.ts

@@ -1,15 +1,17 @@
+import type { ShownSchedules } from "./schedule-render.ts";
 import type { WorkflowStage, WorkflowStages } from "../workflow-declaration.ts";
-import type { WatchCompletionMark, WatchRun, WatchStep, WatchWorkflow } from "./watch-render.ts";
+import type { WatchCompletionMark, WatchPullRequest, WatchRun, WatchStep, WatchWorkflow } from "./watch-render.ts";
 export declare function completionMarkOf(run: WatchRun, candidates: readonly WatchRun[]): WatchCompletionMark | null;
 export declare function activeRun(state: string): boolean;
 export declare function recentRun(latestAt: string | null, now: string): boolean;
 export declare function stagesFor(metadata: WorkflowStages | undefined, workflowId: string): readonly WorkflowStage[] | undefined;
 export declare function currentStepOf(events: readonly unknown[], workflow: {
-    readonly workflowId: string;
+    readonly pullRequest?: WatchPullRequest | null;
     readonly stages: readonly WorkflowStage[] | undefined;
 }): WatchStep;
 export declare function roundOf(events: readonly unknown[]): number;
 interface BoardInputs {
+    readonly schedules?: ShownSchedules;
     readonly workflows: readonly string[];
     readonly workflowStages?: WorkflowStages;
     readonly updatedAt: string;

package/dist/src/cli/watch-board.js

@@ -1,7 +1,8 @@
+import { activeCommandWait, shownCommandWaits } from "./command-waits.js";
 import { linksOf } from "../authority/handoff-chain.js";
 import { record } from "../protocol.js";
 import { isInstant } from "../authority/instants.js";
-import { issueSteps } from "./watch-phases.js";
+import { pullRequestSteps, pullRequestStepOf, stageOf, } from "./watch-phases.js";
 import { sameIssue } from "./watch-pr-identity.js";
 const weekMilliseconds = 7 * 24 * 60 * 60 * 1000;
 const terminalStates = ["completed", "failed", "cancelled"];
@@ -10,21 +11,20 @@ function eventTime(run, type) {
     return isInstant(recordedAt) ? Date.parse(recordedAt) : NaN;
 }
 export function completionMarkOf(run, candidates) {
-    if (run.workflowId !== "develop-issue" ||
-        run.state !== "completed" ||
-        run.outcome !== "blocked")
+    if (run.state !== "completed")
         return null;
     if (run.mergeProof != null)
         return {
             text: `PR merged · #${String(run.mergeProof.number)}`,
             laterRunId: null,
         };
+    if (run.outcome !== "blocked")
+        return null;
     const completedAt = eventTime(run, "run.completed");
     const later = candidates
         .filter((candidate) => sameIssue(run.issueIdentity, candidate.issueIdentity) &&
         candidate.mergeProof != null &&
         candidate.runId !== run.runId &&
-        candidate.workflowId === "develop-issue" &&
         candidate.state === "completed" &&
         candidate.outcome === "handoff_requested" &&
         candidate.ticketStatus !== "partial" &&
@@ -52,11 +52,11 @@ export function stagesFor(metadata, workflowId) {
         ? metadata[workflowId]
         : undefined;
 }
-function stepNames(workflowId, stages) {
-    if (workflowId !== "develop-issue" && stages !== undefined)
+function stepNames(workflow, stages) {
+    if (stages !== undefined)
         return [...stages.map((stage) => stage.label), "Other"];
-    return workflowId === "develop-issue"
-        ? issueSteps.map((step) => step.name)
+    return workflow.pullRequest != null
+        ? pullRequestSteps.map((step) => step.name)
         : ["Agent turn", "Your review"];
 }
 function operationOf(event) {
@@ -69,16 +69,15 @@ function operationOf(event) {
         return [];
     }
 }
-function stepName(event, workflowId) {
+function stepName(event, workflow) {
     const type = record(event)?.["type"];
-    if (workflowId !== "develop-issue" && type === "gate.opened")
+    if (workflow.pullRequest == null && type === "gate.opened")
         return "Your review";
     if (type !== "effect.requested")
         return undefined;
-    if (workflowId !== "develop-issue")
+    if (workflow.pullRequest == null)
         return "Agent turn";
-    return issueSteps.find((step) => step.operation === operationOf(event)[4])
-        ?.name;
+    return pullRequestStepOf(event)?.name;
 }
 function startedAt(event) {
     const value = record(event)?.["recordedAt"];
@@ -87,30 +86,21 @@ function startedAt(event) {
 function chronological(events) {
     return events.toSorted((first, second) => Date.parse(startedAt(first) ?? "") - Date.parse(startedAt(second) ?? ""));
 }
-function declaredStage(event, stages) {
-    if (record(event)?.["type"] === "effect.requested") {
-        const operation = operationOf(event)[4];
-        return stages.find((stage) => stage.operations?.some((name) => name === operation));
-    }
-    const payload = record(record(event)?.["payload"]);
-    return (stages.find((stage) => stage.gateIds?.some((name) => name === payload?.["gateId"])) ??
-        stages.find((stage) => stage.gateKinds?.some((name) => name === payload?.["gateKind"])));
-}
 function declaredStep(events, stages) {
     const event = events
         .filter((item) => ["effect.requested", "gate.opened"].includes(String(record(item)?.["type"])))
         .toSorted((first, second) => Number(record(second)?.["sequence"]) -
         Number(record(first)?.["sequence"]))[0];
-    const stage = declaredStage(event, stages);
+    const stage = stageOf(event, stages);
     return { name: stage?.label ?? "Other", startedAt: startedAt(event) };
 }
 export function currentStepOf(events, workflow) {
-    const { workflowId, stages } = workflow;
-    if (workflowId !== "develop-issue" && stages !== undefined)
+    const { stages } = workflow;
+    if (stages !== undefined)
         return declaredStep(events, stages);
-    const event = chronological(events).findLast((item) => stepName(item, workflowId) !== undefined);
+    const event = chronological(events).findLast((item) => stepName(item, workflow) !== undefined);
     return {
-        name: stepName(event, workflowId) ?? stepNames(workflowId)[0] ?? "Agent turn",
+        name: stepName(event, workflow) ?? stepNames(workflow)[0] ?? "Agent turn",
         startedAt: startedAt(event),
     };
 }
@@ -129,17 +119,20 @@ function columnOf(run, now) {
         return "Stopped";
     return run.outcome === "handoff_requested" ? "Done" : null;
 }
-function issueCardDetails(run) {
-    const issue = run.workflowId === "develop-issue";
+function pullRequestCardDetails(run) {
     return {
-        round: issue ? run.round : null,
-        greptileScore: issue ? (run.reviews.at(-1)?.score ?? null) : null,
-        pullRequestNumber: issue ? (run.pullRequest?.number ?? null) : null,
+        round: run.pullRequest !== null ? run.round : null,
+        greptileScore: run.reviews.at(-1)?.score ?? null,
+        pullRequestNumber: run.pullRequest?.number ?? null,
     };
 }
 function cardOf(run, runs) {
     return {
         runId: run.runId,
+        ...(run.scheduled === undefined ? {} : { scheduled: run.scheduled }),
+        commandWaits: run.commandWaits ?? [],
+        spent: run.spent,
+        limit: run.limit,
         title: run.title,
         ...linksOf(run),
         ...(run.awaitedRunId == null ? {} : { awaitedRunId: run.awaitedRunId }),
@@ -151,7 +144,7 @@ function cardOf(run, runs) {
         currentStep: activeRun(run.state) ? run.currentStep : null,
         endedAt: activeRun(run.state) ? null : run.latestAt,
         decisionWaiting: run.decisions.length > 0,
-        ...issueCardDetails(run),
+        ...pullRequestCardDetails(run),
     };
 }
 function stepOrder(first, second) {
@@ -174,27 +167,43 @@ function summaryOf(value) {
     return {
         state: String(fields?.["state"]),
         waiting: (Array.isArray(pending) && pending.length > 0) ||
-            typeof fields?.["awaitedRunId"] === "string",
+            typeof fields?.["awaitedRunId"] === "string" ||
+            activeCommandWait(shownCommandWaits(fields?.["commandWaits"])),
         latestAt: typeof latest === "string" ? latest : null,
     };
 }
+function runSummaryOf(run) {
+    return {
+        state: run.state,
+        waiting: run.decisions.length > 0 ||
+            run.awaitedRunId != null ||
+            activeCommandWait(run.commandWaits ?? []),
+        latestAt: run.latestAt,
+    };
+}
 export function boardsOf(inputs, runs) {
+    const schedules = inputs.schedules ?? [];
     return inputs.workflows.map((workflowId) => {
         const own = runs.filter((run) => run.workflowId === workflowId);
+        const schedule = "status" in schedules
+            ? undefined
+            : schedules.find((entry) => entry.workflowId === workflowId);
         const summaries = inputs.summaries === undefined
-            ? own.map((run) => ({
-                state: run.state,
-                waiting: run.decisions.length > 0 || run.awaitedRunId != null,
-                latestAt: run.latestAt,
-            }))
+            ? own.map(runSummaryOf)
             : inputs.summaries
                 .filter((value) => record(value)?.["workflowId"] === workflowId)
                 .map(summaryOf);
-        const columns = [
-            ...stepNames(workflowId, stagesFor(inputs.workflowStages, workflowId)),
+        const names = [
+            ...stepNames({
+                pullRequest: own.find((run) => run.pullRequest !== null)?.pullRequest ?? null,
+            }, stagesFor(inputs.workflowStages, workflowId)),
+            ...own
+                .filter((run) => activeRun(run.state))
+                .map((run) => run.currentStep.name),
             "Done",
             "Stopped",
-        ].map((name) => {
+        ];
+        const columns = [...new Set(names)].map((name) => {
             const cards = own
                 .filter((run) => columnOf(run, inputs.updatedAt) === name)
                 .map((run) => cardOf(run, inputs.completionCandidates ?? runs));
@@ -210,6 +219,7 @@ export function boardsOf(inputs, runs) {
         });
         return {
             workflowId,
+            ...(schedule === undefined ? {} : { schedule }),
             activeCount: summaries.filter((run) => activeRun(run.state)).length,
             waitingCount: summaries.filter((run) => run.waiting).length,
             latestAt: latestTime(summaries.map((run) => run.latestAt)),

package/dist/src/cli/watch-card-forms.d.ts

@@ -1,2 +1,2 @@
-import { type CardForm } from "./watch-run-input.ts";
+import type { CardForm } from "./watch-run-input.ts";
 export declare function watchCardForms(directory: string): Promise<readonly CardForm[]>;

package/dist/src/cli/watch-card-forms.js

@@ -1,16 +1,17 @@
-import { readdir, readFile } from "node:fs/promises";
+import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { isWorkflowDeclaration } from "../workflow-declaration.js";
-import { builtinCardForms } from "./watch-run-input.js";
+import { record } from "../protocol.js";
 export async function watchCardForms(directory) {
-    const forms = [...builtinCardForms()];
-    const files = await readdir(directory).catch(() => []);
-    for (const file of files
-        .filter((name) => name.endsWith(".declaration.json"))
-        .sort()) {
-        const value = await readFile(join(directory, file), "utf8")
-            .then((text) => JSON.parse(text))
-            .catch(() => null);
+    const forms = [];
+    const declarations = await readFile(join(directory, "declarations.json"), "utf8")
+        .then((text) => JSON.parse(text))
+        .catch(() => null);
+    if (!Array.isArray(declarations))
+        return [];
+    for (const declaration of declarations) {
+        const value = { ...record(declaration) };
+        delete value["functionName"];
         if (!isWorkflowDeclaration(value))
             continue;
         const entries = Object.entries(value.input.fields);

package/dist/src/cli/watch-client.d.ts

@@ -1 +1 @@
-export declare const watchClient = "\nconst state = { model: null, receivedAt: 0, stale: false, copied: \"\", label: \"\", run: \"\", loading: false, again: false, columns: {}, cards: {}, start: null, hovered: null, focused: null, phonePairing: null, phoneBusy: false, phoneMessage: \"\", phone: null, phoneLoadedAt: 0, phoneAccepted: null, phoneSequence: 0, phoneApplied: 0 };\nfunction readPreference(key) {\n  try { return JSON.parse(localStorage.getItem(key)); }\n  catch { return null; }\n}\nfunction readColumnChoices(key) {\n  const value = readPreference(key);\n  if (typeof value !== \"object\" || value === null || Array.isArray(value)) return null;\n  return Object.fromEntries(Object.entries(value).filter(([, choice]) => typeof choice === \"boolean\"));\n}\nfunction savePreference(key, value) {\n  try { localStorage.setItem(key, JSON.stringify(value)); }\n  catch {}\n}\nfunction startControls() {\n  if (state.start === null) state.start = readPreference(\"cloving.watch.start\") === true;\n  return { shown: state.start, onToggle() {\n    state.start = !state.start;\n    savePreference(\"cloving.watch.start\", state.start);\n    draw();\n  } };\n}\nfunction columnControls(model, selected) {\n  const workflowId = model === null ? null : boardWorkflow(model, watchLocation(selected).workflowId);\n  if (workflowId === null) return undefined;\n  const key = \"cloving.watch.columns:\" + workflowId;\n  if (!Object.hasOwn(state.columns, workflowId))\n    state.columns = { ...state.columns, [workflowId]: readColumnChoices(key) };\n  const choices = state.columns[workflowId];\n  return { choices, onHover(name) { state.hovered = name; }, onFocus(name) { state.focused = name; }, onToggle(name) {\n    const changed = { ...choices, [name]: !columnCollapsed(choices, name) };\n    state.columns = { ...state.columns, [workflowId]: changed };\n    savePreference(key, changed);\n    draw();\n  } };\n}\nfunction moved(next, followed) {\n  const arrived = next === \"waiting_gate\" && next !== state.run;\n  state.run = next;\n  if (arrived) scrollTo(0, 0);\n  else if (followed && next === \"running\") scrollTo(0, document.body.scrollHeight);\n}\nfunction copy(command) {\n  const shown = (label) => {\n    state.copied = command;\n    state.label = label;\n    draw();\n  };\n  navigator.clipboard.writeText(command).then(\n    () => { shown(\"Copied\"); },\n    () => { shown(\"Copy failed\"); },\n  );\n}\nfunction draw() {\n  const { model, stale } = state;\n  const selected = location.hash.slice(1);\n  const followed = innerHeight + scrollY >= document.body.scrollHeight - 80;\n  const copying = { command: state.copied, label: state.label, onCopy: copy };\n  const now = new Date().toISOString();\n  const observationNow = model === null ? now : new Date(Date.parse(model.updatedAt) + performance.now() - state.receivedAt).toISOString();\n  const columns = columnControls(model, selected);\n  const start = model === null ? undefined : startControls();\n  const cards = cardControls(model, model === null ? null : boardWorkflow(model, watchLocation(selected).workflowId));\n  const phone = model === null ? undefined : phoneControls(now);\n  const page = component(Page, { model, selected, now, observationNow, stale, copying, columns, start, cards, phone });\n  render(page, document.getElementById(\"app\"));\n  if (model === null) return;\n  document.title = watchTitle(model, selected);\n  const { runId } = watchLocation(selected);\n  moved(model.runs.find((run) => run.runId === runId)?.state ?? \"\", followed);\n}\nasync function withSelectedRun(model) {\n  const { runId } = watchLocation(location.hash);\n  if (runId === null || model.runs.some((run) => run.runId === runId)) return model;\n  const detail = await fetch(\"data.json?runId=\" + encodeURIComponent(runId), { cache: \"no-store\" });\n  if (detail.status === 404) return model;\n  if (!detail.ok) throw new Error(\"watch-run-not-available\");\n  const { run } = await detail.json();\n  if (run?.runId !== runId) throw new Error(\"watch-run-mismatch\");\n  return { ...model, runs: [...model.runs, run] };\n}\nasync function load() {\n  state.again = state.loading;\n  if (state.loading) return;\n  state.loading = true;\n  try {\n    const reply = await fetch(\"data.json\", { cache: \"no-store\" });\n    if (!reply.ok) throw new Error(\"watch-not-available\");\n    const model = await reply.json();\n    const receivedAt = performance.now();\n    state.model = await withSelectedRun(model);\n    state.receivedAt = receivedAt;\n    state.stale = false;\n  } catch {\n    state.stale = true;\n  }\n  state.loading = false;\n  draw();\n  if (state.again) load();\n}\nfunction listen() {\n  const source = new EventSource(\"events\");\n  source.onmessage = () => { load(); };\n  source.onerror = () => { state.stale = true; draw(); };\n}\naddEventListener(\"keydown\", (event) => {\n  if (event.key !== String.fromCharCode(92) || event.defaultPrevented || event.repeat || event.isComposing) return;\n  if (event.ctrlKey || event.altKey || event.metaKey || event.shiftKey) return;\n  if (event.target?.closest?.(\"input, textarea, select, [contenteditable]\")) return;\n  const target = state.hovered ?? state.focused;\n  if (target === null || watchLocation(location.hash).runId !== null) return;\n  const controls = columnControls(state.model, location.hash);\n  if (controls === undefined) return;\n  event.preventDefault();\n  controls.onToggle(target);\n});\naddEventListener(\"hashchange\", () => { state.run = \"\"; state.hovered = null; state.focused = null; draw(); load(); });\ndraw();\nlisten();\nsetInterval(draw, 1000);\nsetInterval(load, 15000);\nif (actionToken !== null) {\n  phoneLoad();\n  setInterval(phoneLoad, 2000);\n}\n";
+export declare const watchClient = "\nconst state = { model: null, receivedAt: 0, stale: false, copied: \"\", label: \"\", run: \"\", loading: false, again: false, columns: {}, cards: {}, hovered: null, focused: null, phonePairing: null, phoneBusy: false, phoneMessage: \"\", phone: null, phoneLoadedAt: 0, phoneAccepted: null, phoneSequence: 0, phoneApplied: 0 };\nfunction readPreference(key) {\n  try { return JSON.parse(localStorage.getItem(key)); }\n  catch { return null; }\n}\nfunction readColumnChoices(key) {\n  const value = readPreference(key);\n  if (typeof value !== \"object\" || value === null || Array.isArray(value)) return null;\n  return Object.fromEntries(Object.entries(value).filter(([, choice]) => typeof choice === \"boolean\"));\n}\nfunction savePreference(key, value) {\n  try { localStorage.setItem(key, JSON.stringify(value)); }\n  catch {}\n}\nfunction columnControls(model, selected) {\n  const workflowId = model === null ? null : boardWorkflow(model, watchLocation(selected).workflowId);\n  if (workflowId === null) return undefined;\n  const key = \"cloving.watch.columns:\" + workflowId;\n  if (!Object.hasOwn(state.columns, workflowId))\n    state.columns = { ...state.columns, [workflowId]: readColumnChoices(key) };\n  const choices = state.columns[workflowId];\n  return { choices, onHover(name) { state.hovered = name; }, onFocus(name) { state.focused = name; }, onToggle(name) {\n    const changed = { ...choices, [name]: !columnCollapsed(choices, name) };\n    state.columns = { ...state.columns, [workflowId]: changed };\n    savePreference(key, changed);\n    draw();\n  } };\n}\nfunction moved(next, followed) {\n  const arrived = next === \"waiting_gate\" && next !== state.run;\n  state.run = next;\n  if (arrived) scrollTo(0, 0);\n  else if (followed && next === \"running\") scrollTo(0, document.body.scrollHeight);\n}\nfunction copy(command) {\n  const shown = (label) => {\n    state.copied = command;\n    state.label = label;\n    draw();\n  };\n  navigator.clipboard.writeText(command).then(\n    () => { shown(\"Copied\"); },\n    () => { shown(\"Copy failed\"); },\n  );\n}\nfunction draw() {\n  const { model, stale } = state;\n  const selected = location.hash.slice(1);\n  const followed = innerHeight + scrollY >= document.body.scrollHeight - 80;\n  const copying = { command: state.copied, label: state.label, onCopy: copy };\n  const now = new Date().toISOString();\n  const observationNow = model === null ? now : new Date(Date.parse(model.updatedAt) + performance.now() - state.receivedAt).toISOString();\n  const columns = columnControls(model, selected);\n  const cards = cardControls(model, model === null ? null : boardWorkflow(model, watchLocation(selected).workflowId));\n  const phone = model === null ? undefined : phoneControls(now);\n  const page = component(Page, { model, selected, now, observationNow, stale, copying, columns, cards, phone });\n  render(page, document.getElementById(\"app\"));\n  if (model === null) return;\n  document.title = watchTitle(model, selected);\n  const { runId } = watchLocation(selected);\n  moved(model.runs.find((run) => run.runId === runId)?.state ?? \"\", followed);\n}\nasync function withSelectedRun(model) {\n  const { runId } = watchLocation(location.hash);\n  if (runId === null || model.runs.some((run) => run.runId === runId)) return model;\n  const detail = await fetch(\"data.json?runId=\" + encodeURIComponent(runId), { cache: \"no-store\" });\n  if (detail.status === 404) return model;\n  if (!detail.ok) throw new Error(\"watch-run-not-available\");\n  const { run } = await detail.json();\n  if (run?.runId !== runId) throw new Error(\"watch-run-mismatch\");\n  return { ...model, runs: [...model.runs, run] };\n}\nasync function load() {\n  state.again = state.loading;\n  if (state.loading) return;\n  state.loading = true;\n  try {\n    const reply = await fetch(\"data.json\", { cache: \"no-store\" });\n    if (!reply.ok) throw new Error(\"watch-not-available\");\n    const model = await reply.json();\n    const receivedAt = performance.now();\n    state.model = await withSelectedRun(model);\n    state.receivedAt = receivedAt;\n    state.stale = false;\n  } catch {\n    state.stale = true;\n  }\n  state.loading = false;\n  draw();\n  if (state.again) load();\n}\nfunction listen() {\n  const source = new EventSource(\"events\");\n  source.onmessage = () => { load(); };\n  source.onerror = () => { state.stale = true; draw(); };\n}\naddEventListener(\"keydown\", (event) => {\n  if (event.key !== String.fromCharCode(92) || event.defaultPrevented || event.repeat || event.isComposing) return;\n  if (event.ctrlKey || event.altKey || event.metaKey || event.shiftKey) return;\n  if (event.target?.closest?.(\"input, textarea, select, [contenteditable]\")) return;\n  const target = state.hovered ?? state.focused;\n  if (target === null || watchLocation(location.hash).runId !== null) return;\n  const controls = columnControls(state.model, location.hash);\n  if (controls === undefined) return;\n  event.preventDefault();\n  controls.onToggle(target);\n});\naddEventListener(\"hashchange\", () => { state.run = \"\"; state.hovered = null; state.focused = null; draw(); load(); });\ndraw();\nlisten();\nsetInterval(draw, 1000);\nsetInterval(load, 15000);\nif (actionToken !== null) {\n  phoneLoad();\n  setInterval(phoneLoad, 2000);\n}\n";

package/dist/src/cli/watch-client.js

@@ -1,5 +1,5 @@
 export const watchClient = `
-const state = { model: null, receivedAt: 0, stale: false, copied: "", label: "", run: "", loading: false, again: false, columns: {}, cards: {}, start: null, hovered: null, focused: null, phonePairing: null, phoneBusy: false, phoneMessage: "", phone: null, phoneLoadedAt: 0, phoneAccepted: null, phoneSequence: 0, phoneApplied: 0 };
+const state = { model: null, receivedAt: 0, stale: false, copied: "", label: "", run: "", loading: false, again: false, columns: {}, cards: {}, hovered: null, focused: null, phonePairing: null, phoneBusy: false, phoneMessage: "", phone: null, phoneLoadedAt: 0, phoneAccepted: null, phoneSequence: 0, phoneApplied: 0 };
 function readPreference(key) {
   try { return JSON.parse(localStorage.getItem(key)); }
   catch { return null; }
@@ -13,14 +13,6 @@ function savePreference(key, value) {
   try { localStorage.setItem(key, JSON.stringify(value)); }
   catch {}
 }
-function startControls() {
-  if (state.start === null) state.start = readPreference("cloving.watch.start") === true;
-  return { shown: state.start, onToggle() {
-    state.start = !state.start;
-    savePreference("cloving.watch.start", state.start);
-    draw();
-  } };
-}
 function columnControls(model, selected) {
   const workflowId = model === null ? null : boardWorkflow(model, watchLocation(selected).workflowId);
   if (workflowId === null) return undefined;
@@ -60,10 +52,9 @@ function draw() {
   const now = new Date().toISOString();
   const observationNow = model === null ? now : new Date(Date.parse(model.updatedAt) + performance.now() - state.receivedAt).toISOString();
   const columns = columnControls(model, selected);
-  const start = model === null ? undefined : startControls();
   const cards = cardControls(model, model === null ? null : boardWorkflow(model, watchLocation(selected).workflowId));
   const phone = model === null ? undefined : phoneControls(now);
-  const page = component(Page, { model, selected, now, observationNow, stale, copying, columns, start, cards, phone });
+  const page = component(Page, { model, selected, now, observationNow, stale, copying, columns, cards, phone });
   render(page, document.getElementById("app"));
   if (model === null) return;
   document.title = watchTitle(model, selected);

package/dist/src/cli/watch-header-view.d.ts

@@ -1,14 +1,9 @@
 import { type PhoneControls } from "./watch-phone-view.ts";
 import { type Shown } from "./watch-element.ts";
 import { type WatchModel } from "./watch-render.ts";
-export interface StartControls {
-    readonly shown: boolean;
-    readonly onToggle: () => void;
-}
 export interface HeaderProps {
     readonly model: WatchModel | null;
     readonly stale: boolean;
-    readonly start?: StartControls;
     readonly phone?: PhoneControls | undefined;
     readonly now?: string;
 }
@@ -24,4 +19,5 @@ export declare function Queue(props: {
 export declare function Brand(): Shown;
 export declare function HeaderStatus(props: HeaderProps): Shown;
 export declare function HeaderActions(props: HeaderProps): Shown;
+export declare function Version(props: HeaderProps): Shown;
 export declare function Header(props: HeaderProps): Shown;

package/dist/src/cli/watch-header-view.js

@@ -1,3 +1,4 @@
+import { queueSpendLines } from "./usage-render.js";
 import { record } from "../protocol.js";
 import { PhonePanel } from "./watch-phone-view.js";
 import { component, element } from "./watch-element.js";
@@ -15,7 +16,8 @@ export function queueLanes(model) {
     const queue = model.queue;
     if (queue === undefined)
         return null;
-    return `Queue: ${String(queue["busy"])} of ${String(queue["lanes"])} lanes busy`;
+    const state = typeof queue["state"] === "string" ? `${queue["state"]}, ` : "";
+    return `Queue: ${state}${String(queue["busy"])} of ${String(queue["lanes"])} lanes busy`;
 }
 export function skippedText(value) {
     const ticket = record(value) ?? {};
@@ -73,6 +75,7 @@ export function HeaderStatus(props) {
         class: "header-status",
         children: [
             stamp,
+            ...queueSpendLines(model?.queue?.["spend"]).map((line) => element("span", { class: "queue-spend", children: line })),
             lanes === null
                 ? null
                 : element("span", { class: "queue-lanes", children: lanes }),
@@ -80,37 +83,30 @@ export function HeaderStatus(props) {
     });
 }
 export function HeaderActions(props) {
-    const { start, phone } = props;
-    if (start === undefined && phone === undefined)
+    const { phone } = props;
+    if (phone === undefined)
         return null;
     return element("div", {
         class: "header-actions",
-        children: [
-            start === undefined
-                ? null
-                : element("button", {
-                    type: "button",
-                    class: "start-toggle",
-                    "aria-controls": "start-run",
-                    "aria-expanded": String(start.shown),
-                    onClick: start.onToggle,
-                    children: "Start a run",
-                }),
-            phone === undefined
-                ? null
-                : component(PhonePanel, {
-                    phone,
-                    now: props.now ?? props.model?.updatedAt ?? "",
-                }),
-        ],
+        children: component(PhonePanel, {
+            phone,
+            now: props.now ?? props.model?.updatedAt ?? "",
+        }),
     });
 }
+export function Version(props) {
+    const version = props.model?.serviceVersion;
+    if (version === undefined)
+        return null;
+    return element("div", { class: "version", children: `cloving ${version}` });
+}
 export function Header(props) {
     return element("header", {
         children: [
             component(Brand, {}),
             component(HeaderStatus, props),
             component(HeaderActions, props),
+            component(Version, props),
         ],
     });
 }

package/dist/src/cli/watch-model.d.ts

@@ -1,3 +1,4 @@
+import { type ShownSchedules } from "./schedule-render.ts";
 import type { WorkflowStages } from "../workflow-declaration.ts";
 import { type WorkflowRefusal } from "../workflow-refusals.ts";
 import type { WatchDecision, WatchItem, WatchModel, WatchTurn } from "./watch-render.ts";
@@ -6,16 +7,18 @@ export type { GithubRecords } from "./watch-pull-request.ts";
 import { type PrRepository } from "./watch-pr-identity.ts";
 type Fields = Readonly<Record<string, unknown>>;
 export declare function activityOf(line: string): WatchItem[];
+export declare function turnActivity(lines: readonly string[]): WatchItem[];
 export interface TurnRecords {
     readonly key: string;
     readonly started: unknown;
     readonly result: unknown;
-    readonly lines: readonly string[];
+    readonly activity: readonly WatchItem[];
     readonly activeAt?: string | null;
 }
 export declare function turnOf(records: TurnRecords): WatchTurn;
 export declare function decisionCommands(decision: unknown, client: string): WatchDecision;
 export interface WatchInputs {
+    readonly schedules?: ShownSchedules;
     readonly queue?: Fields;
     readonly repository?: PrRepository | null;
     readonly workflows: readonly string[];
@@ -26,6 +29,7 @@ export interface WatchInputs {
     readonly client: string;
     readonly updatedAt: string;
     readonly service: string;
+    readonly serviceVersion?: string;
     readonly runs: readonly unknown[];
     readonly completionCandidates?: readonly unknown[];
     readonly decisions: readonly unknown[];

package/dist/src/cli/watch-model.js

@@ -1,3 +1,5 @@
+import { shownScheduled } from "./schedule-render.js";
+import { shownCommandWaits } from "./command-waits.js";
 import { operationalDecision } from "../decision-visibility.js";
 import { workflowRefusals, } from "../workflow-refusals.js";
 import { isTicketStatus } from "../ticket-status.js";
@@ -89,6 +91,9 @@ export function activityOf(line) {
         return parts(value).flatMap(failed);
     return value["type"] === "result" ? ended(value) : [];
 }
+export function turnActivity(lines) {
+    return lines.flatMap(activityOf).slice(-activityLimit - 1);
+}
 function concise(items) {
     return items.map((item, index) => {
         const before = items[index - 1];
@@ -135,8 +140,7 @@ export function turnOf(records) {
         outcome: records.result === null ? "in work" : outcome,
         costUsd: priceOf(report["costUsd"]),
         estimatedCostUsd: priceOf(report["estimatedCostUsd"]),
-        activity: records.lines
-            .flatMap(activityOf)
+        activity: records.activity
             .map((item) => item.kind === "result"
             ? {
                 kind: item.kind,
@@ -203,14 +207,15 @@ function runOf(inputs, value) {
     const runId = text(status["runId"]);
     const workflowId = text(status["workflowId"]);
     const budget = record(status["budget"]);
+    const pull = pullOf({ records: inputs.githubRecords, repository: inputs.repository ?? null }, runId);
     const ticketId = text(status["ticketId"]);
-    const issue = workflowId === "develop-issue"
-        ? establishedIssue(inputs.repository ?? null, status["issueIdentity"])
-        : null;
+    const issue = establishedIssue(inputs.repository ?? null, status["issueIdentity"]);
     return {
         runId,
         workflowId,
+        ...shownScheduled(status["scheduled"]),
         ...runLinksOf(status),
+        commandWaits: shownCommandWaits(status["commandWaits"]),
         ticketId: ticketId === "" ? null : ticketId,
         ...(issue === null ? {} : { issueIdentity: issue }),
         title: stamp(status["title"]),
@@ -220,7 +225,7 @@ function runOf(inputs, value) {
         estimatedCostUsd: priceOf(status["estimatedCostUsd"]),
         usage: usageOf(status["usage"]),
         currentStep: currentStepOf(list(record(value)["events"]), {
-            workflowId,
+            pullRequest: pull.pullRequest,
             stages: stagesFor(inputs.workflowStages, workflowId),
         }),
         round: roundOf(list(record(value)["events"])),
@@ -237,13 +242,13 @@ function runOf(inputs, value) {
         ...(status["commandEffects"] === undefined
             ? {}
             : { commandEffects: shownCommands(status["commandEffects"]) }),
-        phases: phasesOf(list(record(value)["events"]), workflowId),
+        phases: phasesOf(list(record(value)["events"]), {
+            pullRequest: pull.pullRequest,
+            stages: stagesFor(inputs.workflowStages, workflowId),
+        }),
         decision: decisionOf(list(record(value)["events"])),
         feedback: list(status["feedback"]).map(feedbackOf),
-        ...pullOf({
-            records: inputs.githubRecords,
-            repository: workflowId === "develop-issue" ? (inputs.repository ?? null) : null,
-        }, runId),
+        ...pull,
     };
 }
 function began(run) {
@@ -258,11 +263,15 @@ export function watchModel(inputs) {
     const workflows = boardsOf({ ...inputs, completionCandidates: candidates }, runs);
     return {
         workflows,
+        ...(inputs.schedules === undefined ? {} : { schedules: inputs.schedules }),
         ...(inputs.queue === undefined ? {} : { queue: inputs.queue }),
         workflowRefusals: workflowRefusals(inputs.workflowRefusals),
         startWorkflowId: startWorkflowOf(workflows),
         updatedAt: inputs.updatedAt,
         service: inputs.service,
+        ...(inputs.serviceVersion === undefined
+            ? {}
+            : { serviceVersion: inputs.serviceVersion }),
         runs: runs.toSorted((first, second) => began(first) < began(second) ? 1 : -1),
     };
 }