mirror of
https://github.com/fabro-sh/fabro.git
synced 2026-10-07 03:00:29 +00:00
## Summary
Replaces the single `queued` pre-execution state with explicit `pending`
and `runnable` states, and wires approve/deny actions for
parent-generated child runs that require human approval before they can
execute. This diff covers the web UI and OpenAPI spec layers of that
change.
## What changed
**Run status model**
- `queued` is removed from all TypeScript types, display maps, column
routing, and tests.
- `pending` (awaiting approval) and `runnable` (eligible for the
scheduler) replace it as distinct board columns and `RunStatus` variants
with their own labels and colors (`runnable` gets cyan; `pending` stays
muted).
**Approval actions**
- New `approveRun` / `denyRun` API calls in `run-actions.ts` invoke the
new `POST /runs/{id}/approve` and `POST /runs/{id}/deny` endpoints.
- `canApprove` predicate requires both `status.kind === "pending"` and
`lifecycle.approval?.state === "pending"` — a run whose status is
pending but has no approval record does not expose the action.
- `useApproveRun` / `useDenyRun` mutations in `mutations.ts` follow the
same pattern as `useCancelRun`.
- `ActionsMenu` in `run-detail.tsx` gains Approve (lifecycle group) and
Deny (destructive group) menu items.
**Board and event plumbing**
- `columnForStatus` now routes `pending → pending column` and `runnable
→ runnable column`; `submitted` stays in the pending column.
- `BOARD_STATUS_EVENTS` and `RUN_SUMMARY_EVENTS` replace `run.queued`
with `run.start_requested`, `run.pending`, `run.approved`, `run.denied`,
and `run.runnable`.
- The `pending` column is hidden when empty (same behaviour the old
`queued` column had).
**Waterfall phases (`run-phases.ts`)**
- `queued` phase is removed; `pending` and `runnable` phases are added
in order.
- The submitted phase closes at `run.start_requested` rather than
`run.queued`.
- Each phase derives its timestamps from its own event rather than a
single `firstTs` lookup, making multi-phase pre-execution timelines
accurate.
**OpenAPI spec**
- `POST /api/v1/runs/{id}/approve` and `POST /api/v1/runs/{id}/deny`
endpoints added with 200/404/409 responses.
- `startRun` description updated to describe the pending/runnable
branching behaviour.
- `cancelRun` description updated to reference `pending`/`runnable`
instead of `queued`.
### Plan Summary
- **Task 3** (OpenAPI schema additions for approve/deny endpoints) —
complete in this diff.
- **Task 6** (Web UI surfaces: board columns, run-detail actions,
waterfall phases, event subscriptions) — complete in this diff.
- **Task 7** (doc cleanup: references to `queued` replaced in plans,
brainstorms, and QA docs) — complete in this diff.
### Fabro Details
<details>
<summary>Ran 9 stages in 127m 37s for $104.98</summary>
| Stage | Duration | Cost | Retries |
|---|---|---|---|
| start | 0s | – | 0 |
| toolchain | 2s | – | 0 |
| preflight_compile | 2m 15s | – | 0 |
| preflight_lint | 2m 29s | – | 0 |
| implement | 92m 10s | $91.53 | 0 |
| simplify_opus | 18m 35s | $10.65 | 0 |
| simplify_gpt | 7m 36s | $2.81 | 0 |
| verify | 3m 42s | – | 0 |
| fmt | 3s | – | 0 |
| **Total** | **127m 37s** | **$104.98** | **0** |
</details>
<details>
<summary>Ran <code>ImplementPlan.fabro</code> (12 nodes and 15
edges)</summary>
```dot
digraph ImplementPlan {
graph [
goal="Implement and simplify",
model_stylesheet="
* { model: claude-opus-4-7; }
"
]
rankdir=LR
start [shape=Mdiamond, label="Start"]
exit [shape=Msquare, label="Exit"]
toolchain [label="Toolchain", shape=parallelogram, script="command -v cargo >/dev/null || { curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && sudo ln -sf $HOME/.cargo/bin/* /usr/local/bin/; }; cargo --version 2>&1", max_retries=0]
preflight_compile [label="Preflight Compile", shape=parallelogram, script="cargo check -q --workspace 2>&1", max_retries=0]
preflight_lint [label="Preflight Lint", shape=parallelogram, script="cargo +nightly-2026-04-14 clippy -q --workspace --all-targets -- -D warnings 2>&1", max_retries=0]
fix_lints [label="Fix Lints", prompt="The preflight lint step failed. Read the build output from context and fix all clippy lint warnings.", max_visits=3]
implement [label="Implement", prompt="Read the plan file referenced in the goal and implement every step. Make all the code changes described in the plan. Use red/green TDD.", model="gpt-55", reasoning_effort="xhigh"]
simplify_opus [label="Simplify (Opus)", prompt="@prompts/simplify.md"]
simplify_gpt [label="Simplify (GPT-55)", prompt="@prompts/simplify.md", model="gpt-55"]
verify [label="Verify", shape=parallelogram, script="cargo +nightly-2026-04-14 clippy -q --workspace --all-targets -- -D warnings 2>&1 && cargo nextest run --cargo-quiet --workspace --status-level fail 2>&1 && cargo dev docs refresh 2>&1 && cargo dev docs check 2>&1", goal_gate=true, retry_target="fixup"]
fixup [label="Fixup", prompt="The verify step failed. Read the build output from context and fix all clippy lint warnings, test failures, and generated docs errors.", max_visits=3]
fmt [label="Format", shape=parallelogram, script="cargo +nightly-2026-04-14 fmt --all 2>&1", max_retries=0]
start -> toolchain
toolchain -> preflight_compile [condition="outcome=succeeded"]
toolchain -> exit
preflight_compile -> preflight_lint [condition="outcome=succeeded"]
preflight_compile -> exit
preflight_lint -> implement [condition="outcome=succeeded"]
preflight_lint -> fix_lints
fix_lints -> preflight_lint
implement -> simplify_opus -> simplify_gpt -> verify
verify -> fmt [condition="outcome=succeeded"]
verify -> fixup
fixup -> verify
fmt -> exit
}
```
</details>
⚒️ Generated with [Fabro](https://fabro.sh)
---------
Co-authored-by: Fabro <noreply@fabro.sh>
Co-authored-by: fabro <fabro@anthropic.com>
Co-authored-by: Bryan Helmkamp <bryan@brynary.com>
108 lines
2.8 KiB
TypeScript
108 lines
2.8 KiB
TypeScript
import type { EventEnvelope } from "@qltysh/fabro-api-client";
|
|
|
|
export type RunPhaseKind = "submitted" | "pending" | "runnable" | "initializing";
|
|
|
|
export interface RunPhase {
|
|
kind: RunPhaseKind;
|
|
label: string;
|
|
startMs: number;
|
|
endMs: number | null;
|
|
}
|
|
|
|
const PHASE_LABEL: Record<RunPhaseKind, string> = {
|
|
submitted: "Submitted",
|
|
pending: "Pending",
|
|
runnable: "Runnable",
|
|
initializing: "Initializing",
|
|
};
|
|
|
|
export function phaseLabel(kind: RunPhaseKind): string {
|
|
return PHASE_LABEL[kind];
|
|
}
|
|
|
|
// Stages own the timeline once `run.running` fires, so we stop slicing there.
|
|
export function deriveRunPhases(
|
|
events: ReadonlyArray<EventEnvelope> | undefined,
|
|
createdAtIso: string,
|
|
): RunPhase[] {
|
|
const createdMs = Date.parse(createdAtIso);
|
|
if (Number.isNaN(createdMs)) return [];
|
|
|
|
let startRequestedMs: number | null = null;
|
|
let pendingMs: number | null = null;
|
|
let runnableMs: number | null = null;
|
|
let startingMs: number | null = null;
|
|
let runningMs: number | null = null;
|
|
let remaining = 5;
|
|
|
|
for (const event of events ?? []) {
|
|
if (remaining === 0) break;
|
|
let target: "startRequested" | "pending" | "runnable" | "starting" | "running" | null = null;
|
|
switch (event.event) {
|
|
case "run.start_requested":
|
|
if (startRequestedMs == null) target = "startRequested";
|
|
break;
|
|
case "run.pending":
|
|
if (pendingMs == null) target = "pending";
|
|
break;
|
|
case "run.runnable":
|
|
if (runnableMs == null) target = "runnable";
|
|
break;
|
|
case "run.starting":
|
|
if (startingMs == null) target = "starting";
|
|
break;
|
|
case "run.running":
|
|
if (runningMs == null) target = "running";
|
|
break;
|
|
}
|
|
if (target == null) continue;
|
|
const ms = Date.parse(event.ts);
|
|
if (Number.isNaN(ms)) continue;
|
|
switch (target) {
|
|
case "startRequested": startRequestedMs = ms; break;
|
|
case "pending": pendingMs = ms; break;
|
|
case "runnable": runnableMs = ms; break;
|
|
case "starting": startingMs = ms; break;
|
|
case "running": runningMs = ms; break;
|
|
}
|
|
remaining -= 1;
|
|
}
|
|
|
|
const phases: RunPhase[] = [];
|
|
|
|
phases.push({
|
|
kind: "submitted",
|
|
label: PHASE_LABEL.submitted,
|
|
startMs: createdMs,
|
|
endMs: startRequestedMs ?? pendingMs ?? runnableMs ?? startingMs ?? runningMs,
|
|
});
|
|
|
|
if (pendingMs != null) {
|
|
phases.push({
|
|
kind: "pending",
|
|
label: PHASE_LABEL.pending,
|
|
startMs: pendingMs,
|
|
endMs: runnableMs ?? startingMs ?? runningMs,
|
|
});
|
|
}
|
|
|
|
if (runnableMs != null) {
|
|
phases.push({
|
|
kind: "runnable",
|
|
label: PHASE_LABEL.runnable,
|
|
startMs: runnableMs,
|
|
endMs: startingMs ?? runningMs,
|
|
});
|
|
}
|
|
|
|
if (startingMs != null) {
|
|
phases.push({
|
|
kind: "initializing",
|
|
label: PHASE_LABEL.initializing,
|
|
startMs: startingMs,
|
|
endMs: runningMs,
|
|
});
|
|
}
|
|
|
|
return phases;
|
|
}
|