diff --git a/CHANGELOG.md b/CHANGELOG.md index b702c5f..eb819b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ has a matching GitHub release whose body comes from its section below. ## [Unreleased] +## [v0.6.1] - 2026-11-15 + ### Fixed - The gateway no longer sends a request to an engine whose lease is draining, parking or releasing. It holds the @@ -18,6 +20,12 @@ has a matching GitHub release whose body comes from its section below. instead of idle. Before, an NInfer build without `/slots`, or Ollama, read idle while it served, and a juggle handed its card over as if no request were running. `berth status --format json` shows the new `in_flight_reported` field per engine. +- On a phone narrower than 340 pixels, the SCHEDULE label in the harbor's bottom tab bar no longer runs into the + labels beside it. + +### Documentation + +- The README and the harbor guide show the SCHEDULE tab, and the harbor screenshots are new. ## [v0.6.0] - 2026-11-14 diff --git a/README.md b/README.md index c23ae6d..4bb5ee1 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ claim. When another engine holds it, Berth: The numbered markers on the timeline are those four steps. A process that holds VRAM without a lease shows up as a stowaway: Berth reports its PID and memory and leaves it running. -> **Status: alpha, v0.6.0.** Runs daily on an RTX 4090 workstation beside llama-swap, NInfer, +> **Status: alpha, v0.6.1.** Runs daily on an RTX 4090 workstation beside llama-swap, NInfer, > Strata, ComfyUI and games, and testers run it on Windows. The [docs](docs/README.md) cover what works and has tests; the > [roadmap](docs/roadmap.md) lists the phases and what is still missing. @@ -270,16 +270,18 @@ which `berth service status` prints. ## Preview -The screenshots show the harbor web UI with its built-in demo data: the CARD tab, the Engines tab in advanced -mode, and the CARD tab at phone width. +The screenshots show the harbor web UI with its built-in demo data: the CARD tab, the SCHEDULE tab, the Engines +tab in advanced mode, and the CARD tab at phone width. [The harbor and telemetry](docs/harbor.md) explains every panel and shows how to add the harbor to an iPhone's Home Screen.

Berth harbor: the CARD tab with ticket counter, request KPIs, the tide of card memory by holder, and the model timeline

+

Berth harbor SCHEDULE tab: NOW with the holders, the waiters and the booking in force, 7 DAYS with one track per day of bookings, windows and the live holder, and the list of bookings

+

Berth harbor Engines tab, advanced mode: decode throughput per engine, the token ledger, the per-model leaderboard, storage and residency

-

Berth harbor at phone width: the CARD tab with the ticket counter, collisions avoided, the collision tiles and the decode and TPOT KPIs, with CARD, SWITCH, ENGINES and ABOUT in a bottom bar

+

Berth harbor at phone width: the CARD tab with the ticket counter and collisions avoided, with CARD, SWITCH, SCHEDULE, ENGINES and ABOUT in a bottom bar

## Install diff --git a/assets/preview-harbor.png b/assets/preview-harbor.png index 7e855ae..f295bb9 100644 Binary files a/assets/preview-harbor.png and b/assets/preview-harbor.png differ diff --git a/assets/preview-mobile.png b/assets/preview-mobile.png index a2d45d7..e6edcbb 100644 Binary files a/assets/preview-mobile.png and b/assets/preview-mobile.png differ diff --git a/assets/preview-requests.png b/assets/preview-requests.png index 6a86599..13325e1 100644 Binary files a/assets/preview-requests.png and b/assets/preview-requests.png differ diff --git a/assets/preview-schedule.png b/assets/preview-schedule.png new file mode 100644 index 0000000..413a0d8 Binary files /dev/null and b/assets/preview-schedule.png differ diff --git a/docs/harbor.md b/docs/harbor.md index 6aa5943..dd05659 100644 --- a/docs/harbor.md +++ b/docs/harbor.md @@ -8,6 +8,10 @@ fixture replays: a model that ran without a lease after a daemon restart, which

Berth harbor: the CARD tab with ticket counter, request KPIs, the tide of card memory by holder, and the model timeline

+The SCHEDULE tab: what holds the card now, the next seven days of bookings, and every booking in order. + +

Berth harbor SCHEDULE tab: NOW with the holders, the waiters and the booking in force, 7 DAYS with one track per day of bookings, windows and the live holder, and the list of bookings

+ The Engines tab (advanced mode): the engine cards with their learned footprints as EST. VRAM, the library (shelf, quant, size, the cached tier, the serving engine), decode throughput, the token ledger, the per-model leaderboard, storage and residency. @@ -17,7 +21,7 @@ decode throughput, the token ledger, the per-model leaderboard, storage and resi On a phone, the harbor fits the screen. The tabs move to a bar at the bottom and the panels stack. This is the CARD tab at phone width, from the same demo fixture. -

Berth harbor at phone width: the CARD tab with the ticket counter, collisions avoided, the collision tiles and the decode and TPOT KPIs, with CARD, SWITCH, ENGINES and ABOUT in a bottom bar

+

Berth harbor at phone width: the CARD tab with the ticket counter and collisions avoided, with CARD, SWITCH, SCHEDULE, ENGINES and ABOUT in a bottom bar

### The harbor on your iPhone's Home Screen @@ -132,7 +136,7 @@ for a phone. lists the last 10 events and quits. `berth service install --notify` starts it at logon. ## The harbor's views -Everything the node collects shows in one of four tabs, and every panel answers a +Everything the node collects shows in one of five tabs, and every panel answers a question an operator actually asks. **The CARD tab.** @@ -195,6 +199,12 @@ reads the key and never creates it. Without a key, the tab says so and offers no `berth gateway --harbor URL` redirects the gateway's old `/gui/` index and `/` to `URL/#switch`, so a bookmark of the engine list lands on this tab; its per-engine wake pages keep answering. +**The SCHEDULE tab** answers "who has the card now, and who has it next?" NOW lists what holds each card, the +waiters in queue order, the booking in force and the next one. 7 DAYS draws one 24-hour track per day with every +booking to the minute (run, priority or down), each engine's window and the live holder. BOOKINGS lists every +booking by start, on the node's clock. A paired device books by clicking an empty hour, and moves or cancels a +booking by clicking it or its EDIT button. [Book the card](leasing.md#book-the-card) explains the bookings themselves. + **The ENGINES tab.** - **The engine cards** answer "is this engine up and serving?" with the state the engine reports, its loaded models, decode and prefill rates, and its learned diff --git a/docs/roadmap.md b/docs/roadmap.md index 485dd26..824dd6b 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -149,6 +149,15 @@ v0.6.0 was tagged first as `v0.6.0-rc.1`. turn it was in, and a drain no longer stops an engine that is still resuming ([#275](https://github.com/T-Crypt/berth/issues/275)). +## Shipped: v0.6.1, cleaner handoffs (2026-11-15) + +- **No request into a draining engine.** The gateway holds a request while its engine's lease drains, parks or + releases, instead of sending it to an engine that is stopping. +- **A minimum turn needs a request.** An engine woken by a health probe or a warm-up no longer keeps the card for + its full `--min-turn` while a real request waits. +- **Busy or unknown.** An engine that reports no in-flight figure reads as unknown, not idle, so a juggle does not + hand its card over mid-request. + ## Next: v0.6.x - **A warmth ladder.** An engine steps down from live to parked to stopped by idle time and the next booking, and diff --git a/internal/gateway/schedule_test.go b/internal/gateway/schedule_test.go index 83168d9..72ea8b5 100644 --- a/internal/gateway/schedule_test.go +++ b/internal/gateway/schedule_test.go @@ -49,7 +49,9 @@ func decode[T any](t *testing.T, resp *http.Response) T { // a clash is a 409 naming the booking it hits. func TestScheduleRoutes(t *testing.T) { srv, _ := scheduleGateway(t) - resp := call(t, "POST", srv.URL+"/v1/berth/schedule", `{"who":"pi-pocket","engine":"pocket","start":"23:00","for":"5h","priority":"batch"}`) + // Absolute starts: between 23:00 and 23:30, "23:00" is tomorrow and "23:30" today, so they never clash. + day := time.Now().AddDate(0, 0, 1).Format("2006-01-02") + resp := call(t, "POST", srv.URL+"/v1/berth/schedule", `{"who":"pi-pocket","engine":"pocket","start":"`+day+` 23:00","for":"5h","priority":"batch"}`) if resp.StatusCode != http.StatusCreated { t.Fatalf("book = %d %s", resp.StatusCode, readAll(resp)) } @@ -58,7 +60,7 @@ func TestScheduleRoutes(t *testing.T) { t.Fatalf("booked = %+v", made) } - resp = call(t, "POST", srv.URL+"/v1/berth/schedule", `{"who":"train","engine":"sft","start":"23:30","for":"1h"}`) + resp = call(t, "POST", srv.URL+"/v1/berth/schedule", `{"who":"train","engine":"sft","start":"`+day+` 23:30","for":"1h"}`) if body := readAll(resp); resp.StatusCode != http.StatusConflict || !strings.Contains(body, "clashes with b1") { t.Fatalf("clash = %d %s", resp.StatusCode, body) } diff --git a/internal/harbor/web/harbor.css b/internal/harbor/web/harbor.css index 1f61314..6481c97 100644 --- a/internal/harbor/web/harbor.css +++ b/internal/harbor/web/harbor.css @@ -1949,6 +1949,10 @@ dialog.sheet::backdrop { background: var(--scrim); backdrop-filter: blur(3px); } .about-dl { grid-template-columns: 1fr; } .about-hero, .about-sec { padding: var(--s4); } } +/* five tabs share the bottom bar: under 340px SCHEDULE is wider than its fifth */ +@media (max-width: 339px) { + .tab { letter-spacing: 0; padding-inline: 0; } +} /* ---------- motion preferences and other media ---------- */ @media (prefers-reduced-motion: reduce) {