mirror of
https://github.com/fabro-sh/fabro.git
synced 2026-10-06 02:48:25 +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>
189 lines
6.2 KiB
TypeScript
189 lines
6.2 KiB
TypeScript
import { describe, expect, test } from "bun:test";
|
|
import type { Run, RunStatus as ApiRunStatus } from "@qltysh/fabro-api-client";
|
|
import {
|
|
columnForStatus,
|
|
columnStatusDisplay,
|
|
isRunStatus,
|
|
mapRunListItem,
|
|
mapRunToRunItem,
|
|
runStatusDisplay,
|
|
} from "./runs";
|
|
|
|
function makeRun(overrides: Partial<Run> = {}): Run {
|
|
return {
|
|
id: "01ABC",
|
|
goal: "Fix the build",
|
|
title: "Fix the build",
|
|
workflow: { slug: "fix_build", name: "Fix Build", graph_name: "FixBuild", node_count: 0, edge_count: 0 },
|
|
automation: null,
|
|
repository: { name: "myrepo", origin_url: null, provider: "unknown" },
|
|
created_by: null,
|
|
origin: { kind: "api" },
|
|
labels: {},
|
|
lifecycle: {
|
|
status: { kind: "running" },
|
|
approval: null,
|
|
pending_control: null,
|
|
queue_position: null,
|
|
error: null,
|
|
archived: false,
|
|
archived_at: null,
|
|
},
|
|
sandbox: null,
|
|
models: [],
|
|
source_directory: "/home/user/myrepo",
|
|
timestamps: {
|
|
created_at: "2026-04-08T12:00:00Z",
|
|
started_at: "2026-04-08T12:00:00Z",
|
|
last_event_at: null,
|
|
completed_at: null,
|
|
},
|
|
timing: {
|
|
wall_time_ms: 65000,
|
|
inference_time_ms: 0,
|
|
tool_time_ms: 0,
|
|
active_time_ms: 0,
|
|
},
|
|
billing: { total_usd_micros: 500000 },
|
|
size: "XS",
|
|
diff: null,
|
|
pull_request: null,
|
|
current_question: null,
|
|
superseded_by: null,
|
|
retried_from: null,
|
|
links: { web: null },
|
|
...overrides,
|
|
};
|
|
}
|
|
|
|
function withStatus(status: ApiRunStatus): Pick<Run, "lifecycle"> {
|
|
return {
|
|
lifecycle: {
|
|
status,
|
|
approval: null,
|
|
pending_control: null,
|
|
queue_position: null,
|
|
error: null,
|
|
archived: false,
|
|
archived_at: null,
|
|
},
|
|
};
|
|
}
|
|
|
|
describe("mapRunListItem", () => {
|
|
test("trusts shared server fields for board items", () => {
|
|
const summary = makeRun({
|
|
title: "Server supplied title",
|
|
...withStatus({ kind: "paused", prior_block: null }),
|
|
pull_request: {
|
|
owner: "fabro-sh",
|
|
repo: "fabro",
|
|
number: 123,
|
|
html_url: "https://github.com/fabro-sh/fabro/pull/123",
|
|
},
|
|
});
|
|
const item = mapRunListItem(summary);
|
|
expect(item.id).toBe("01ABC");
|
|
expect(item.title).toBe("Server supplied title");
|
|
expect(item.workflow).toBe("Fix Build");
|
|
expect(item.repo).toBe("myrepo");
|
|
expect(item.sourceDirectory).toBe("/home/user/myrepo");
|
|
expect(item.elapsed).toBeDefined();
|
|
expect(item.column).toBe("running");
|
|
expect(item.lifecycleStatus).toBe("paused");
|
|
expect(item.number).toBe(123);
|
|
expect(item.pullRequestUrl).toBe("https://github.com/fabro-sh/fabro/pull/123");
|
|
});
|
|
|
|
test("uses a fallback title when the server title is blank", () => {
|
|
const summary = makeRun({ id: "01EMPTY", goal: "", title: "" });
|
|
|
|
expect(mapRunListItem(summary).title).toBe("Untitled run");
|
|
});
|
|
});
|
|
|
|
describe("mapRunToRunItem", () => {
|
|
test("maps canonical run summary to RunItem", () => {
|
|
const summary = makeRun({
|
|
pull_request: {
|
|
owner: "fabro-sh",
|
|
repo: "fabro",
|
|
number: 456,
|
|
html_url: "https://github.com/fabro-sh/fabro/pull/456",
|
|
},
|
|
});
|
|
const item = mapRunToRunItem(summary);
|
|
expect(item.id).toBe("01ABC");
|
|
expect(item.title).toBe("Fix the build");
|
|
expect(item.workflow).toBe("Fix Build");
|
|
expect(item.repo).toBe("myrepo");
|
|
expect(item.sourceDirectory).toBe("/home/user/myrepo");
|
|
expect(item.elapsed).toBeDefined();
|
|
expect(item.lifecycleStatus).toBe("running");
|
|
expect(item.number).toBe(456);
|
|
expect(item.pullRequestUrl).toBe("https://github.com/fabro-sh/fabro/pull/456");
|
|
});
|
|
|
|
test("handles missing optional fields", () => {
|
|
const summary = makeRun({
|
|
id: "01DEF",
|
|
goal: "",
|
|
title: "",
|
|
workflow: { slug: null, name: null, graph_name: null, node_count: 0, edge_count: 0 },
|
|
source_directory: null,
|
|
repository: { name: "unknown", origin_url: null, provider: "unknown" },
|
|
...withStatus({ kind: "submitted" }),
|
|
timestamps: {
|
|
created_at: "2026-04-08T12:00:00Z",
|
|
started_at: null,
|
|
last_event_at: null,
|
|
completed_at: null,
|
|
},
|
|
timing: null,
|
|
billing: null,
|
|
});
|
|
const item = mapRunToRunItem(summary);
|
|
expect(item.id).toBe("01DEF");
|
|
expect(item.title).toBe("Untitled run");
|
|
expect(item.workflow).toBe("unknown");
|
|
expect(item.repo).toBe("unknown");
|
|
expect(item.sourceDirectory).toBeUndefined();
|
|
});
|
|
|
|
test("falls back to graph name and slug for workflow labels", () => {
|
|
const graphFallback = mapRunToRunItem(
|
|
makeRun({ workflow: { slug: "fix_build", name: null, graph_name: "FixBuild", node_count: 0, edge_count: 0 } }),
|
|
);
|
|
const slugFallback = mapRunToRunItem(
|
|
makeRun({ workflow: { slug: "fix_build", name: null, graph_name: null, node_count: 0, edge_count: 0 } }),
|
|
);
|
|
|
|
expect(graphFallback.workflow).toBe("FixBuild");
|
|
expect(slugFallback.workflow).toBe("fix_build");
|
|
});
|
|
|
|
test("recognizes canonical blocked, pending, and runnable run statuses", () => {
|
|
expect(isRunStatus("pending")).toBe(true);
|
|
expect(isRunStatus("runnable")).toBe(true);
|
|
expect(isRunStatus("blocked")).toBe(true);
|
|
expect(runStatusDisplay).toHaveProperty("pending");
|
|
expect(runStatusDisplay).toHaveProperty("runnable");
|
|
expect(runStatusDisplay).toHaveProperty("blocked");
|
|
});
|
|
|
|
test("recognizes archived as a terminal run status", () => {
|
|
expect(isRunStatus("archived")).toBe(true);
|
|
expect(runStatusDisplay).toHaveProperty("archived");
|
|
});
|
|
|
|
test("uses blocked board column instead of waiting", () => {
|
|
expect(columnStatusDisplay).toHaveProperty("blocked");
|
|
expect(columnStatusDisplay).not.toHaveProperty("waiting");
|
|
});
|
|
});
|
|
|
|
describe("columnForStatus", () => {
|
|
test("returns null for lifecycle states that do not map to a board column", () => {
|
|
expect(columnForStatus("removing")).toBeNull();
|
|
});
|
|
});
|