Merge pull request 'v0.21.0 — ISS-023 Relocate (empty flight) panel moves to left pane' (#33) from feat/relocate-left-pane into master

AGENTS.md

@@ -1,18 +1,16 @@
 # Flight Simulator — Workflow Rules
 
 ## Change process (mandatory)
-1. **Small, incremental changes** — work is done one change at a time, in smaller parts; each part must be tested thoroughly with unit and e2e tests covering it before moving on.
+1. **Small, incremental changes** — work is done one change at a time, in smaller parts; each part must be tested thoroughly with unit and e2e tests covering it before moving on. Connected issues/tasks that reference the same part of code MAY be done together on one branch/PR with a single version bump (e.g. two UI tweaks to the same panel).
 2. **Feature branch + PR** — every change lands on a feature branch off `master` (no direct pushes to master). The branch carries the commits below; open a pull request to `master`.
 3. **Changelog entry** — every such change is listed in `CHANGELOG.md` with date, time and version (format: `## v<version> — YYYY-MM-DD HH:MM`, then bullet points of what changed).
 4. **Version bump** — the version is updated in `package.json`.
-5. **CI must pass** — the PR's pipeline (build → unit tests → e2e, `.gitea/workflows/ci.yml`) must be green before merging. CI never deploys to production; its e2e runs against an isolated stack inside dind.
+5. **CI must pass** — enforced by branch protection on `master` (required status check `CI / build + unit + e2e (pull request)`): the PR cannot be merged until CI is green. Merge via auto-merge (`POST /repos/{owner}/{repo}/pulls/{n}/merge` with body `{"do":"merge","merge_style":"merge","merge_when_checks_succeed":true}`) so it merges automatically once CI passes. CI never deploys to production; its e2e runs against an isolated stack inside dind.
 6. **Tag + manual deploy after merge** — once merged, tag the version on `master` (e.g. `v0.13.0`). Production (`https://flight.dev.kkhost.pl`) is updated manually afterwards: `docker compose up -d --build` on the host.
 
 ## E2E tests (mandatory)
-1. **Docker compose instance is the app under test** — e2e always runs against a docker-compose build, never a local `next dev` on :3000 (dev builds don't render for non-loopback clients, and a second instance splits state). Locally that means the Traefik-routed instance at `https://flight.dev.kkhost.pl`; in CI it is an isolated stack inside dind (`docker-compose.ci.yml`) — **CI never deploys to or modifies production**.
-2. **Update before testing (local)** — deploy current code first: `docker compose up -d --build`, then run the suite with plain `npx playwright test`. The config's webServer block is off by default; set `E2E_DEPLOY_CMD` to have Playwright itself run a deploy command and wait for readiness.
-3. **Remote browsers** — local runs drive browsers through the shared Playwright server at `192.168.1.4:3000` (Docker image tag must match this repo's @playwright/test version, pinned in devDependencies). Set `PW_REMOTE_BROWSER=0` to run local chromium instead — CI does, because the remote server cannot reach a stack inside dind.
-4. **CI env vars** (`playwright.config.ts`, all optional; defaults preserve the local flow) — `E2E_BASE_URL` (app under test), `E2E_DEPLOY_CMD` (webServer deploy command), `PW_REMOTE_BROWSER=0` (local browsers); `e2e/state.spec.ts` reads `E2E_COMPOSE_ARGS` for its mid-run container restart.
+1. **CI-only** — e2e runs ONLY in CI, against an isolated docker stack inside dind built from `docker-compose.ci.yml` (project name `flight-ci`, app container on a static IP; see `.gitea/workflows/ci.yml`). There are NO local e2e runs at all: locally you verify with `tsc --noEmit` + `npx vitest run` + `npx playwright test --list` (typecheck, unit suite, specs compile and list), and the full e2e suite is verified by CI on every PR. **CI never deploys to or modifies production.**
+2. **CI env vars** (`playwright.config.ts`, all optional) — `E2E_BASE_URL` (app under test; CI sets it to the in-network app host, so the config's default of the live Traefik instance at `https://flight.dev.kkhost.pl` is never used), `E2E_DEPLOY_CMD` (runs as Playwright webServer: deploys the stack and waits for readiness before tests start; CI uses build + `up -d` + `logs -f`), `PW_REMOTE_BROWSER=0` (CI runs local chromium because the shared remote browser server at 192.168.1.4 cannot reach a stack inside dind — when unset, the config defaults to that remote server and to the live instance as baseURL), and `E2E_COMPOSE_ARGS`, read by `e2e/state.spec.ts` for its mid-run `docker compose restart flight` (CI points it at `-f docker-compose.ci.yml -p flight-ci`).
 
 ## API
 1. **Live base URL** — `https://flight.dev.kkhost.pl` (the docker-compose build behind Traefik).

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## v0.21.0 — 2026-09-19 21:01
+- **Relocate panel moves to the left pane (ISS-023).** Flying an empty/grounded plane to another airport is "anything with our plane", so it belongs in the left pane, not as a market row on the right. The `.market-row.market-row-relocate` JSX (`relocate-plane` select of grounded planes labeled `{planeName} — {icao}`, `relocate-dest` name-sorted select, `relocate-go` button → `POST /api/planes/{id}/fly {destIcao}`) moved verbatim from `components/RightPane.tsx` into a new "Relocate" `<section>` in `components/LeftPane.tsx`, inserted between On board and Time. Its state (`relocatePlaneId` / `relocateDestIcao`) and the one-time `/api/airports` fetch (promise-ref pattern, GeoJSON → `{name, icao}[]` sorted by name) moved with it — the relocate-dest select was that fetch's only consumer in RightPane, so nothing else there changed. Busy gating rewired from RightPane's `busy` to LeftPane's own `useGameAction` instance (`actionsBusy`); a grounded-plane filter was added next to the existing `onboard` compute; plane labels reuse the expression already inlined in the Fleet rows. Testids kept byte-identical (`relocate-plane` / `relocate-dest` / `relocate-go`) and the row keeps its `.market-row market-row-relocate` classes (global CSS, works in the 360 px left pane); stale "280 px right pane" comment updated in `app/globals.css`. The map-popup relocation controls (`airport-popup-*`, Map.tsx) are a separate surface fed by the snapshot only — untouched
+- Tests: e2e — only `relocation.spec.ts` touches these testids and all locators are global, so no locator changes; the first test's title (which mentioned "right pane") and the file header comments now say left-pane Relocate section. No unit-test changes (baseline 283)
+- Verified: `tsc --noEmit` clean; unit suite green locally; e2e not run locally by design — CI verifies against an isolated stack
+
+## v0.20.0 — 2026-09-19 19:21
+- **On board moved to the left pane (ISS-021).** The "On board" section (per-plane blocks with loaded/expired cargo rows, Refuel-for-leg / Fly-to / Abandon + penalty preview) now renders in `components/LeftPane.tsx` between Fleet and Time — wallet stays on top. The JSX moved verbatim (same testids: `onboard-{planeId}`, `onboard-package-{pkg.id}`, `refuel-for-*`, `fly-to-*`, `abandon-*` + penalty preview), along with the `onboard` computation (`planes.filter(flying || slotsUsedFor > 0)`) and per-plane cargo filter. All onboard e2e locators are global testids, so existing specs work unchanged
+- **Left pane widened: grid swapped to 360/1fr/280.** `.app-shell` in `app/globals.css` goes from `280px minmax(0, 1fr) 360px` to `360px minmax(0, 1fr) 280px` — total fixed width stays 640 px, so the map column is pixel-identical (map.spec.ts clicks via dynamic `map.project()`). Stale comments updated (on-board blocks now in the left pane; Relocate row comment reflects the 280 px right pane)
+- **Shared action runner hook.** RightPane's local `runAction` (busy gate, inline pane error + shell toast on failure, full post-action snapshot pushed via `applySnapshot`) extracted to new `lib/useGameAction.ts`: `useGameAction(state, applySnapshot, onError) → { runAction, busy, actionError }`, exact semantics kept incl. the non-2xx throw/catch and inline-error auto-clear on the next snapshot. Used in BOTH panes; LeftPane receives `applySnapshot` from the shell (`app/page.tsx`). RightPane keeps `[data-testid="right-error"]`; LeftPane gains a matching `[data-testid="left-action-error"]`. Pure helpers `slotsUsedFor` / `loadEligiblePlanes` stay exported from RightPane (unit tests import them there; LeftPane imports `slotsUsedFor` from it); the Market Relocate row + `/api/airports` fetch stay in RightPane
+- Tests: e2e — `panes.spec.ts` first test now also asserts the "On board" heading is visible inside `[data-testid="left-pane"]` and absent from the right pane; stale header comments updated in `actions.spec.ts` / `right-pane.spec.ts`. No unit-test changes (baseline 283)
+- Verified: `tsc --noEmit` clean; unit suite green locally; e2e not run locally by design — CI verifies against an isolated stack
+- **On-board cargo rows are two lines (ISS-028).** Each `onboard-package-*` row now stacks a full-width "Fly to <airport>" button on its own line above Refuel + Abandon side by side: `components/LeftPane.tsx` moves the fly-to button out of `.contract-main` into the row root and wraps refuel-for + abandon in a new `.onboard-actions` div — all testids, label text, penalty preview and disabled states unchanged. Long destination names in the fly-to label truncate with an ellipsis instead of overflowing: the label's inner span gets `min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap`, full name preserved via a `title` attribute (CSS in `app/globals.css`: `.onboard-block .contract-row` becomes flex-column, new `.onboard-fly-btn` / `.onboard-fly-label` / `.onboard-actions`). No e2e changes — specs locate everything by testid and assert no layout or button order; no version bump (part 2 of v0.20.0)
+
+## v0.19.2 — 2026-09-19 20:06
+- **AGENTS.md "Change process" item 1** — connected issues/tasks that reference the same part of code may now be done together on one branch/PR with a single version bump (e.g. two UI tweaks to the same panel)
+- **AGENTS.md "E2E tests" section rewritten to match current reality** — e2e runs ONLY in CI, against an isolated docker stack inside dind (`docker-compose.ci.yml`); there are NO local e2e runs at all (local verification = `tsc --noEmit` + `npx vitest run` + `npx playwright test --list`; the full suite is verified by CI on every PR). Dropped the stale local-run instructions (deploying to the Traefik-routed instance before testing, driving browsers through the remote Playwright server at 192.168.1.4:3000); kept and reworded the CI env vars that actually exist in `playwright.config.ts` (`E2E_BASE_URL`, `E2E_DEPLOY_CMD`, `PW_REMOTE_BROWSER=0`, `E2E_COMPOSE_ARGS`)
+
+## v0.19.1 — 2026-09-19 18:48
+- AGENTS.md: document that CI-green is enforced on master by branch protection (required status check) and that merges use auto-merge (`merge_when_checks_succeed`) so PRs merge automatically once CI passes
+
 ## v0.19.0 — 2026-09-19 18:05
 - **Auto-slow to 1× when all planes have landed (ISS-011).** When the last plane in flight lands, the sim slows down on its own so an idle fleet doesn't sit at 1000×. Server-side and authoritative: `tickOnce` (`lib/sim/engine.ts`) now remembers how many planes `deliverPackages` finalized during a tick, and when ≥1 plane landed this tick AND no plane remains with status `'flying'` AND the sim is not paused, it persists `timeScale = 1` on the same `sim_state` write as the clock — so the UI slider reflects it on the very next snapshot (no API or OpenAPI change: timeScale is still set via the existing `POST /api/sim`, and `clampTimeScale` semantics are untouched since 1 is a valid ladder value)
 - **Arrival-triggered, not idle-enforced.** The trigger fires only on the tick that processes a landing — a grounded fleet at high scale with no flight ever happening is left alone (this keeps the existing slider e2e in `panes.spec.ts` green: it sets 1000× and expects the server to confirm it while nothing is flying). Paused state is untouched: while paused no landings are processed, so a paused sim never auto-slows

app/globals.css

@@ -102,10 +102,12 @@ body {
   color: #334155;
 }
 
-/* v0.9.0 — single-screen 3-pane shell: left Assets / center map / right Jobs & Market */
+/* v0.9.0 — single-screen 3-pane shell: left Assets / center map / right Jobs & Market.
+   ISS-021 (v0.20.0): left widened to 360px (it now carries the On board section), right
+   narrowed to 280px — total fixed width stays 640px, so the map column is unchanged. */
 .app-shell {
   display: grid;
-  grid-template-columns: 280px minmax(0, 1fr) 360px;
+  grid-template-columns: 360px minmax(0, 1fr) 280px;
   height: 100%;
 }
 
@@ -362,7 +364,7 @@ body {
 }
 
 /* ISS-010 (v0.18.0) — the Relocate row carries TWO selects, so let it wrap instead of
-   squeezing both below their readable width in the 360 px pane. */
+   squeezing both below their readable width in the 360 px left pane (moved there in ISS-023 v0.21.0). */
 .market-row-relocate {
   flex-wrap: wrap;
 }
@@ -374,7 +376,7 @@ body {
   font-variant-numeric: tabular-nums;
 }
 
-/* v0.12.0 — on-board blocks (per plane) in the right pane */
+/* v0.12.0 — on-board blocks (per plane); moved to the left pane in ISS-021 (v0.20.0) */
 .onboard-block {
   background: rgba(30, 41, 59, 0.6);
   border-radius: 6px;
@@ -382,10 +384,36 @@ body {
   margin-bottom: 8px;
 }
 
+/* ISS-028 (v0.20.0 part 2) — on-board cargo rows are two lines: a full-width fly-to button,
+   then refuel + abandon side by side below it; long destination names truncate with an ellipsis. */
 .onboard-block .contract-row {
   background: transparent;
   padding: 6px 0 0;
   border-top: 1px solid rgba(148, 163, 184, 0.2);
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+}
+
+.onboard-block .contract-row .contract-sub {
+  margin-top: 0; /* row spacing comes from the container's gap */
+}
+
+.onboard-fly-btn {
+  width: 100%;
+}
+
+.onboard-fly-label {
+  display: block;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.onboard-actions {
+  display: flex;
+  gap: 6px;
 }
 
 /* v0.17.0 — ISS-008: bottom-right toast stack (action errors + game events) */

app/page.tsx

@@ -43,7 +43,9 @@ export default function Home() {
 
   return (
     <div className="app-shell">
-      <LeftPane state={state} loading={loading} error={error} onRefresh={refresh} onHover={setHovered} onError={onError} />
+      {/* ISS-021 (v0.20.0) — applySnapshot also reaches the left pane: its On board section's
+          refuel/fly/abandon actions push their response snapshot into the shared state */}
+      <LeftPane state={state} loading={loading} error={error} onRefresh={refresh} applySnapshot={applySnapshot} onHover={setHovered} onError={onError} />
       {/* v0.11.0 — the same polled snapshot drives the map's plane markers + route lines;
           ISS-010 (v0.18.0) — applySnapshot lets the airport popup's Relocate row push its
           action response into the shared state, exactly like RightPane does */}

components/LeftPane.tsx

@@ -1,11 +1,15 @@
 'use client';
 
 import { useCallback, useEffect, useRef, useState, type ChangeEvent } from 'react';
+import type { GeoJsonFeatureCollection } from '@/lib/airports';
 import type { PlaneState, StateSnapshot } from '@/lib/game/state';
 import { PLANE_TYPES } from '@/lib/game/catalog';
-import { formatCash, formatFuel, formatSimClock } from '@/lib/format';
+import { abandonPenalty } from '@/lib/game/penalty';
+import { formatCash, formatDeadlineRelative, formatFuel, formatSimClock } from '@/lib/format';
 import { TIME_SCALES, scaleToSlider, sliderToScale } from '@/lib/timeScale';
+import { useGameAction } from '@/lib/useGameAction';
 import { useSimClock } from '@/lib/useSimClock';
+import { slotsUsedFor } from './RightPane';
 import type { HoverTarget } from './hoverTypes';
 
 interface LeftPaneProps {
@@ -14,6 +18,9 @@ interface LeftPaneProps {
   error: string | null;
   // The shell's single-poll refresh — called after a sim-control POST so the pane updates immediately.
   onRefresh: () => void;
+  // ISS-021 (v0.20.0): push the full snapshot returned by an action endpoint into the shared shell
+  // state — needed now that the On board section's refuel/fly/abandon actions live in this pane.
+  applySnapshot: (snapshot: StateSnapshot) => void;
   // ISS-002 (v0.15.0): report fleet-row hovers to the shell so the map can highlight the plane.
   onHover: (target: HoverTarget | null) => void;
   // ISS-008 (v0.17.0): report a failed sim-control POST to the shell as an error toast.
@@ -83,9 +90,40 @@ export async function retrySimPost(
   return { ok: false, reason: 'exhausted', error: lastError };
 }
 
-export default function LeftPane({ state, loading, error, onRefresh, onHover, onError }: LeftPaneProps) {
+export default function LeftPane({ state, loading, error, onRefresh, applySnapshot, onHover, onError }: LeftPaneProps) {
   const [busy, setBusy] = useState(false);
 
+  // ISS-021 (v0.20.0): shared action runner for the On board section (moved here from RightPane).
+  const { runAction, busy: actionsBusy, actionError } = useGameAction(state, applySnapshot, onError);
+
+  // ISS-023 (v0.21.0): Relocate selections — moved here from the right-pane market row; same
+  // "effective selection" pattern as there: the user's pick while it stays valid, else a sensible
+  // default (first grounded plane / first airport).
+  const [relocatePlaneId, setRelocatePlaneId] = useState<string | null>(null);
+  const [relocateDestIcao, setRelocateDestIcao] = useState<string | null>(null);
+
+  // ISS-010 (v0.18.0): one-time /api/airports fetch per page life — destination options for the
+  // Relocate section, sorted by name so e2e selection is stable. Same promise-ref pattern as Map.tsx;
+  // on failure airportOptions stays null and the Relocate button simply remains disabled. Moved here
+  // from RightPane in ISS-023 (v0.21.0) — the relocate-dest select was its only consumer there.
+  const [airportOptions, setAirportOptions] = useState<Array<{ name: string; icao: string }> | null>(null);
+  const airportsPromiseRef = useRef<Promise<Array<{ name: string; icao: string }>> | null>(null);
+  useEffect(() => {
+    if (!airportsPromiseRef.current) {
+      airportsPromiseRef.current = fetch('/api/airports', { cache: 'no-store' })
+        .then((res) => {
+          if (!res.ok) throw new Error(`GET /api/airports → HTTP ${res.status}`);
+          return res.json() as Promise<GeoJsonFeatureCollection>;
+        })
+        .then((fc) =>
+          fc.features
+            .map((f) => ({ name: f.properties.name, icao: f.properties.icao }))
+            .sort((a, b) => a.name.localeCompare(b.name, 'en')),
+        );
+    }
+    void airportsPromiseRef.current.then(setAirportOptions).catch(() => {});
+  }, []);
+
   // POST /api/sim (retried up to SIM_POST_MAX_ATTEMPTS× on failure — CI runs #44/#47), then
   // refetch the full snapshot immediately so the pane reflects the new controls without waiting
   // for the next poll tick. After the final attempt fails keep the stale UI and surface an error
@@ -153,6 +191,20 @@ export default function LeftPane({ state, loading, error, onRefresh, onHover, on
   const paused = state?.simState.paused ?? false;
   const timeScale = state?.simState.timeScale ?? 1;
 
+  // On board (v0.12.0, moved from the right pane in ISS-021 v0.20.0): every plane that carries
+  // cargo or is mid-flight gets a block — its loaded/expired packages with fly-to-destination +
+  // abandon controls, and flying planes show their current leg.
+  const clockMs = state?.simState.clockMs ?? 0;
+  const onboard = state ? state.planes.filter((p) => p.status === 'flying' || slotsUsedFor(state, p.id) > 0) : [];
+
+  // ISS-023 (v0.21.0): Relocate — any GROUNDED plane can be repositioned to any airport via the
+  // existing fly endpoint (pure repositioning, no package needed since v0.12.0). Moved here from
+  // the right-pane market row; with state null both fall back to null and the section isn't rendered.
+  const grounded = state ? state.planes.filter((p) => p.status === 'available') : [];
+  const relocatePlane = grounded.find((p) => p.id === relocatePlaneId) ?? grounded[0] ?? null;
+  const relocateDest =
+    airportOptions === null ? null : airportOptions.find((a) => a.icao === relocateDestIcao) ?? airportOptions[0] ?? null;
+
   // Slider commit (v0.9.1): the displayed value follows the drag optimistically via
   // pendingScale; POST /api/sim fires after a 250 ms debounce, or immediately when the
   // user releases the slider (browsers fire a native 'change' on release). The server's
@@ -294,6 +346,143 @@ export default function LeftPane({ state, loading, error, onRefresh, onHover, on
             )}
           </section>
 
+          {/* ISS-021 (v0.20.0): moved here from the right pane — between Fleet and Time. */}
+          <section className="pane-section">
+            <h3 className="pane-heading">On board</h3>
+            {onboard.length === 0 ? (
+              <p className="pane-muted">Nothing on board.</p>
+            ) : (
+              onboard.map((plane) => {
+                const cargo = state.packages.filter(
+                  (pkg) => pkg.planeId === plane.id && (pkg.status === 'loaded' || pkg.status === 'expired'),
+                );
+                return (
+                  // ISS-002: hovering the on-board block (including its cargo rows) highlights the plane.
+                  // Handlers live only on the outer div — React's enter/leave don't fire when moving to a
+                  // child, so this covers the whole block without flicker between sub-elements.
+                  <div
+                    key={plane.id}
+                    data-testid={`onboard-${plane.id}`}
+                    className="onboard-block"
+                    onMouseEnter={() => onHover({ kind: 'plane', id: plane.id })}
+                    onMouseLeave={() => onHover(null)}
+                  >
+                    <div className="contract-main">
+                      <span className="plane-model">{PLANE_TYPES[plane.model]?.name ?? plane.model}</span>
+                      {plane.status === 'flying' ? (
+                        <>
+                          <span className="plane-status status-flying">in flight</span>
+                          {plane.destName && (
+                            <span data-testid={`plane-leg-${plane.id}`} className="contract-route">
+                              {plane.locationName} → {plane.destName}
+                            </span>
+                          )}
+                        </>
+                      ) : (
+                        <span className="plane-status status-available">{plane.locationIcao}</span>
+                      )}
+                    </div>
+                    {cargo.map((pkg) => {
+                      const penalty = abandonPenalty(pkg, clockMs);
+                      return (
+                        <div key={pkg.id} data-testid={`onboard-package-${pkg.id}`} className="contract-row">
+                          <button
+                            type="button"
+                            data-testid={`fly-to-${pkg.id}`}
+                            className="pane-btn onboard-fly-btn"
+                            disabled={actionsBusy || plane.status !== 'available'}
+                            onClick={() => void runAction(`/api/planes/${plane.id}/fly`, { destIcao: pkg.destIcao })}
+                          >
+                            <span className="onboard-fly-label" title={`Fly to ${pkg.destName}`}>
+                              Fly to {pkg.destName}
+                            </span>
+                          </button>
+                          <div className="onboard-actions">
+                            <button
+                              type="button"
+                              data-testid={`refuel-for-${pkg.id}`}
+                              className="pane-btn"
+                              disabled={actionsBusy || plane.status !== 'available'}
+                              onClick={() => void runAction(`/api/planes/${plane.id}/refuel`, { mode: 'forFlight', packageId: pkg.id })}
+                            >
+                              Refuel
+                            </button>
+                            <button
+                              type="button"
+                              data-testid={`abandon-${pkg.id}`}
+                              className="pane-btn"
+                              disabled={actionsBusy || plane.status !== 'available'}
+                              onClick={() => void runAction(`/api/packages/${pkg.id}/abandon`)}
+                            >
+                              Abandon{' '}
+                              <span data-testid={`abandon-penalty-${pkg.id}`}>−{formatCash(penalty)}</span>
+                            </button>
+                          </div>
+                          <div className="contract-sub">
+                            <span className="contract-route">{pkg.originName} → {pkg.destName}</span>
+                            <span>{formatCash(pkg.reward)}</span>
+                            {pkg.status === 'expired' ? (
+                              <span data-testid={`onboard-expired-${pkg.id}`}>expired</span>
+                            ) : (
+                              <span>{formatDeadlineRelative(pkg.deadlineSimTime, clockMs)}</span>
+                            )}
+                          </div>
+                        </div>
+                      );
+                    })}
+                  </div>
+                );
+              })
+            )}
+          </section>
+
+          {/* ISS-023 (v0.21.0): moved here from the right-pane market row — it belongs with
+              everything else about our planes, between On board and Time. */}
+          <section className="pane-section">
+            <h3 className="pane-heading">Relocate</h3>
+            {/* ISS-010 (v0.18.0): relocate a grounded plane — the fly endpoint already allows pure
+                repositioning, this row just exposes it for planes with nothing on board. */}
+            <div className="market-row market-row-relocate">
+              <select
+                data-testid="relocate-plane"
+                aria-label="Plane to relocate"
+                value={relocatePlane?.id ?? ''}
+                onChange={(e) => setRelocatePlaneId(e.target.value || null)}
+              >
+                {grounded.map((p) => (
+                  <option key={p.id} value={p.id}>
+                    {PLANE_TYPES[p.model]?.name ?? p.model} — {p.locationIcao}
+                  </option>
+                ))}
+              </select>
+              <select
+                data-testid="relocate-dest"
+                aria-label="Relocation destination airport"
+                value={relocateDest?.icao ?? ''}
+                onChange={(e) => setRelocateDestIcao(e.target.value || null)}
+              >
+                {airportOptions?.map((a) => (
+                  <option key={a.icao} value={a.icao}>
+                    {a.name}
+                  </option>
+                ))}
+              </select>
+              <button
+                type="button"
+                data-testid="relocate-go"
+                className="pane-btn"
+                disabled={actionsBusy || relocatePlane === null || relocateDest === null}
+                onClick={() => {
+                  if (relocatePlane && relocateDest) {
+                    void runAction(`/api/planes/${relocatePlane.id}/fly`, { destIcao: relocateDest.icao });
+                  }
+                }}
+              >
+                Relocate
+              </button>
+            </div>
+          </section>
+
           <section className="pane-section">
             <h3 className="pane-heading">Time</h3>
             <p data-testid="sim-clock" className="sim-clock">
@@ -347,6 +536,8 @@ export default function LeftPane({ state, loading, error, onRefresh, onHover, on
               {error}
             </p>
           )}
+          {/* ISS-021 (v0.20.0): inline error from a failed On board action — mirrors right-error. */}
+          {actionError && <p data-testid="left-action-error" className="pane-error">{actionError}</p>}
         </>
       ) : null}
     </aside>

components/RightPane.tsx

@@ -1,11 +1,10 @@
 'use client';
 
-import { useCallback, useEffect, useRef, useState } from 'react';
-import type { GeoJsonFeatureCollection } from '@/lib/airports';
+import { useState } from 'react';
 import type { PackageState, PlaneState, StateSnapshot } from '@/lib/game/state';
 import { PLANE_TYPES } from '@/lib/game/catalog';
-import { abandonPenalty } from '@/lib/game/penalty';
 import { formatCash, formatDeadlineRelative } from '@/lib/format';
+import { useGameAction } from '@/lib/useGameAction';
 import type { HoverTarget } from './hoverTypes';
 
 interface RightPaneProps {
@@ -109,13 +108,9 @@ function LoadControls({
 }
 
 export default function RightPane({ state, loading, applySnapshot, onHover, onError }: RightPaneProps) {
-  const [busy, setBusy] = useState(false);
-  // Inline error from a failed action — auto-clears on the next successful poll (the shell's
-  // snapshot prop changes every tick) or the next successful action.
-  const [actionError, setActionError] = useState<string | null>(null);
-  useEffect(() => {
-    if (state !== null) setActionError(null);
-  }, [state]);
+  // ISS-021 (v0.20.0): shared action runner — busy gate, inline pane error + shell toast on
+  // failure, full post-action snapshot pushed into the shared state on success.
+  const { runAction, busy, actionError } = useGameAction(state, applySnapshot, onError);
 
   // Market picker selections — same "effective selection" pattern as LoadControls: the
   // user's pick while it stays valid, else a sensible default (first catalog entry / first plane).
@@ -123,61 +118,8 @@ export default function RightPane({ state, loading, applySnapshot, onHover, onEr
   const [sellPlaneId, setSellPlaneId] = useState<string | null>(null);
   const [refuelPlaneId, setRefuelPlaneId] = useState<string | null>(null);
 
-  // ISS-010 (v0.18.0): Relocate row selections — same "effective selection" pattern as the rows above:
-  // the user's pick while it stays valid, else a sensible default (first grounded plane / first airport).
-  const [relocatePlaneId, setRelocatePlaneId] = useState<string | null>(null);
-  const [relocateDestIcao, setRelocateDestIcao] = useState<string | null>(null);
-
-  // ISS-010 (v0.18.0): one-time /api/airports fetch per page life — destination options for the
-  // Relocate row, sorted by name so e2e selection is stable. Same promise-ref pattern as Map.tsx;
-  // on failure airportOptions stays null and the Relocate button simply remains disabled.
-  const [airportOptions, setAirportOptions] = useState<Array<{ name: string; icao: string }> | null>(null);
-  const airportsPromiseRef = useRef<Promise<Array<{ name: string; icao: string }>> | null>(null);
-  useEffect(() => {
-    if (!airportsPromiseRef.current) {
-      airportsPromiseRef.current = fetch('/api/airports', { cache: 'no-store' })
-        .then((res) => {
-          if (!res.ok) throw new Error(`GET /api/airports → HTTP ${res.status}`);
-          return res.json() as Promise<GeoJsonFeatureCollection>;
-        })
-        .then((fc) =>
-          fc.features
-            .map((f) => ({ name: f.properties.name, icao: f.properties.icao }))
-            .sort((a, b) => a.name.localeCompare(b.name, 'en')),
-        );
-    }
-    void airportsPromiseRef.current.then(setAirportOptions).catch(() => {});
-  }, []);
-
-  // POST an action endpoint. Every success returns the FULL post-action snapshot (v0.8.0
-  // convention) — pushed into the shared state immediately; a 4xx {error} body becomes the
-  // inline pane error and the stale UI stays until the next poll. Buttons are disabled while
-  // a request is in flight, so at most one action runs at a time.
-  const runAction = useCallback(
-    async (path: string, body?: unknown) => {
-      if (busy) return;
-      setBusy(true);
-      try {
-        const res = await fetch(path, {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: body === undefined ? undefined : JSON.stringify(body),
-          cache: 'no-store',
-        });
-        const data = (await res.json()) as StateSnapshot & { error?: string };
-        if (!res.ok) throw new Error(data.error ?? `HTTP ${res.status}`);
-        setActionError(null);
-        applySnapshot(data);
-      } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        setActionError(message); // inline pane error stays…
-        onError?.(message); // …and the shell mirrors it as a bottom-right toast (ISS-008)
-      } finally {
-        setBusy(false);
-      }
-    },
-    [applySnapshot, busy, onError],
-  );
+  // ISS-023 (v0.21.0): the Relocate row moved to the left pane — it belongs with everything else
+  // about our planes, not in the market. Its state + /api/airports fetch went with it.
 
   if (loading && !state) {
     return (
@@ -192,13 +134,6 @@ export default function RightPane({ state, loading, applySnapshot, onHover, onEr
   const clockMs = state.simState.clockMs;
   const open = state.packages.filter((p) => p.status === 'open');
 
-  // On board (v0.12.0): every plane that carries cargo or is mid-flight gets a block —
-  // its loaded/expired packages with fly-to-destination + abandon controls, and flying
-  // planes show their current leg.
-  const onboard = state.planes.filter(
-    (p) => p.status === 'flying' || slotsUsedFor(state, p.id) > 0,
-  );
-
   const catalog = state.catalog;
   const buyEntry = catalog.find((e) => e.model === buyModelId) ?? catalog[0] ?? null;
 
@@ -209,12 +144,6 @@ export default function RightPane({ state, loading, applySnapshot, onHover, onEr
     state.planes.find((p) => p.id === refuelPlaneId && p.status === 'available' && p.fuel < p.maxFuel) ??
     refuelable[0] ??
     null;
-  // ISS-010 (v0.18.0): Relocate — any GROUNDED plane can be repositioned to any airport via the
-  // existing fly endpoint (pure repositioning, no package needed since v0.12.0).
-  const relocatePlane = grounded.find((p) => p.id === relocatePlaneId) ?? grounded[0] ?? null;
-  const relocateDest =
-    airportOptions === null ? null : airportOptions.find((a) => a.icao === relocateDestIcao) ?? airportOptions[0] ?? null;
-
   // Previews computed client-side from the snapshot's catalog + economy constants (v0.10.0).
   const sellEntry = sellPlane ? catalog.find((e) => e.model === sellPlane.model) : undefined;
   const sellPayout = sellEntry ? Math.round(sellEntry.price * state.sellFraction * 100) / 100 : null;
@@ -270,92 +199,7 @@ export default function RightPane({ state, loading, applySnapshot, onHover, onEr
         )}
       </section>
 
-      <section className="pane-section">
-        <h3 className="pane-heading">On board</h3>
-        {onboard.length === 0 ? (
-          <p className="pane-muted">Nothing on board.</p>
-        ) : (
-          onboard.map((plane) => {
-            const cargo = state.packages.filter(
-              (pkg) => pkg.planeId === plane.id && (pkg.status === 'loaded' || pkg.status === 'expired'),
-            );
-            return (
-              // ISS-002: hovering the on-board block (including its cargo rows) highlights the plane.
-              // Handlers live only on the outer div — React's enter/leave don't fire when moving to a
-              // child, so this covers the whole block without flicker between sub-elements.
-              <div
-                key={plane.id}
-                data-testid={`onboard-${plane.id}`}
-                className="onboard-block"
-                onMouseEnter={() => onHover({ kind: 'plane', id: plane.id })}
-                onMouseLeave={() => onHover(null)}
-              >
-                <div className="contract-main">
-                  <span className="plane-model">{planeName(plane)}</span>
-                  {plane.status === 'flying' ? (
-                    <>
-                      <span className="plane-status status-flying">in flight</span>
-                      {plane.destName && (
-                        <span data-testid={`plane-leg-${plane.id}`} className="contract-route">
-                          {plane.locationName} → {plane.destName}
-                        </span>
-                      )}
-                    </>
-                  ) : (
-                    <span className="plane-status status-available">{plane.locationIcao}</span>
-                  )}
-                </div>
-                {cargo.map((pkg) => {
-                  const penalty = abandonPenalty(pkg, clockMs);
-                  return (
-                    <div key={pkg.id} data-testid={`onboard-package-${pkg.id}`} className="contract-row">
-                      <div className="contract-main">
-                        <button
-                          type="button"
-                          data-testid={`refuel-for-${pkg.id}`}
-                          className="pane-btn"
-                          disabled={busy || plane.status !== 'available'}
-                          onClick={() => void runAction(`/api/planes/${plane.id}/refuel`, { mode: 'forFlight', packageId: pkg.id })}
-                        >
-                          Refuel
-                        </button>
-                        <button
-                          type="button"
-                          data-testid={`fly-to-${pkg.id}`}
-                          className="pane-btn"
-                          disabled={busy || plane.status !== 'available'}
-                          onClick={() => void runAction(`/api/planes/${plane.id}/fly`, { destIcao: pkg.destIcao })}
-                        >
-                          Fly to {pkg.destName}
-                        </button>
-                        <button
-                          type="button"
-                          data-testid={`abandon-${pkg.id}`}
-                          className="pane-btn"
-                          disabled={busy || plane.status !== 'available'}
-                          onClick={() => void runAction(`/api/packages/${pkg.id}/abandon`)}
-                        >
-                          Abandon{' '}
-                          <span data-testid={`abandon-penalty-${pkg.id}`}>−{formatCash(penalty)}</span>
-                        </button>
-                      </div>
-                      <div className="contract-sub">
-                        <span className="contract-route">{pkg.originName} → {pkg.destName}</span>
-                        <span>{formatCash(pkg.reward)}</span>
-                        {pkg.status === 'expired' ? (
-                          <span data-testid={`onboard-expired-${pkg.id}`}>expired</span>
-                        ) : (
-                          <span>{formatDeadlineRelative(pkg.deadlineSimTime, clockMs)}</span>
-                        )}
-                      </div>
-                    </div>
-                  );
-                })}
-              </div>
-            );
-          })
-        )}
-      </section>
+      {/* ISS-021 (v0.20.0): the On board section moved to the left pane (between Fleet and Time). */}
 
       <section className="pane-section">
         <h3 className="pane-heading">Market</h3>
@@ -455,47 +299,7 @@ export default function RightPane({ state, loading, applySnapshot, onHover, onEr
           </button>
         </div>
 
-        {/* ISS-010 (v0.18.0): relocate a grounded plane — the fly endpoint already allows pure
-            repositioning, this row just exposes it for planes with nothing on board. */}
-        <div className="market-row market-row-relocate">
-          <select
-            data-testid="relocate-plane"
-            aria-label="Plane to relocate"
-            value={relocatePlane?.id ?? ''}
-            onChange={(e) => setRelocatePlaneId(e.target.value || null)}
-          >
-            {grounded.map((p) => (
-              <option key={p.id} value={p.id}>
-                {planeName(p)} — {p.locationIcao}
-              </option>
-            ))}
-          </select>
-          <select
-            data-testid="relocate-dest"
-            aria-label="Relocation destination airport"
-            value={relocateDest?.icao ?? ''}
-            onChange={(e) => setRelocateDestIcao(e.target.value || null)}
-          >
-            {airportOptions?.map((a) => (
-              <option key={a.icao} value={a.icao}>
-                {a.name}
-              </option>
-            ))}
-          </select>
-          <button
-            type="button"
-            data-testid="relocate-go"
-            className="pane-btn"
-            disabled={busy || relocatePlane === null || relocateDest === null}
-            onClick={() => {
-              if (relocatePlane && relocateDest) {
-                void runAction(`/api/planes/${relocatePlane.id}/fly`, { destIcao: relocateDest.icao });
-              }
-            }}
-          >
-            Relocate
-          </button>
-        </div>
+        {/* ISS-023 (v0.21.0): the Relocate row moved to the left pane's "Relocate" section. */}
       </section>
 
       {actionError && <p data-testid="right-error" className="pane-error">{actionError}</p>}

e2e/actions.spec.ts

@@ -3,7 +3,8 @@ import { expect, test } from '@playwright/test';
 
 // v0.12.0 package model against the live origin (https://flight.dev.kkhost.pl):
 // the full core loop through the UI — hook creates a short package at EDDF → Load
-// via the right pane → click its destination in the on-board list → fly at 1000× →
+// via the right pane → click its destination in the on-board list (left pane since
+// v0.20.0, ISS-021) → fly at 1000× →
 // arrival delivers EXACTLY the reward + rep; abandon deducts exactly the formula
 // penalty while grounded; expired packages deliver/abandon with no reward and no
 // penalty. Mirrors lib/game/penalty.ts for exact-value assertions.

e2e/panes.spec.ts

@@ -69,6 +69,12 @@ test('left pane renders wallet, reputation and the starter fleet at Frankfurt',
 
   // Sim clock renders (UTC wall-clock of the game time).
   await expect(page.getByTestId('sim-clock')).toContainText(/UTC/);
+
+  // ISS-021 (v0.20.0): the On board section moved to the left pane (between Fleet and Time) —
+  // its heading renders here…
+  await expect(page.getByTestId('left-pane').getByRole('heading', { name: 'On board', exact: true })).toBeVisible();
+  // …and no longer in the right pane.
+  await expect(page.getByTestId('right-pane').getByRole('heading', { name: 'On board', exact: true })).toHaveCount(0);
 });
 
 test('time controls: pause freezes the sim and the ladder slider sets timeScale', async ({ page }) => {

e2e/relocation.spec.ts

@@ -3,7 +3,7 @@ import { expect, test } from '@playwright/test';
 
 // v0.18.0 — ISS-010: relocating a GROUNDED (empty) plane to any airport against the live origin.
 // Two UI surfaces drive the EXISTING POST /api/planes/{id}/fly endpoint (pure repositioning has
-// been allowed since v0.12.0 — no API change): the right-pane market row
+// been allowed since v0.12.0 — no API change): the left-pane Relocate section (ISS-023, v0.21.0)
 // (relocate-plane / relocate-dest / relocate-go) and the Relocate row inside the airport popup on
 // the map (airport-popup-plane / airport-popup-relocate). Marker-size regression is covered by
 // the existing e2e/map.spec.ts click tests, not here.
@@ -90,7 +90,7 @@ test.afterEach(async ({ page }) => {
 
 test.describe.configure({ mode: 'serial' }); // shared live DB — order matters within this file
 
-test('market row relocates a grounded plane via the right pane', async ({ page }) => {
+test('left pane Relocate section relocates a grounded plane', async ({ page }) => {
   test.setTimeout(300_000); // self-heal (worst case ~20 s at 1000×) + one short leg
   await flyHomeViaApi(page);
 

e2e/right-pane.spec.ts

@@ -2,8 +2,9 @@ import type { Page } from '@playwright/test';
 import { expect, test } from '@playwright/test';
 
 // v0.12.0 — right Jobs & Market pane against the live origin: open packages render with
-// names/reward/deadline and Load (UI click) binds one to the starter; the on-board list shows
-// loaded packages with fly-to-destination + abandon buttons (penalty preview from the same
+// names/reward/deadline and Load (UI click) binds one to the starter; the on-board list
+// (moved to the left pane in v0.20.0, ISS-021) shows loaded packages with fly-to-destination +
+// abandon buttons (penalty preview from the same
 // formula as the server); flying planes show their current leg; market buy/sell/refuel previews
 // match the catalog + economy constants exposed in /api/state. Packages are created via
 // POST /api/test/create-package (FLIGHT_TEST_HOOKS=1), same pattern as e2e/actions.spec.ts.

lib/useGameAction.ts

@@ -0,0 +1,53 @@
+'use client';
+
+import { useCallback, useEffect, useState } from 'react';
+import type { StateSnapshot } from '@/lib/game/state';
+
+// ISS-021 (v0.20.0) — shared action runner for the side panes (extracted verbatim from
+// RightPane.runAction when the On board section moved to LeftPane). POSTs an action endpoint;
+// every success returns the FULL post-action snapshot (v0.8.0 convention), pushed into the
+// shared shell state immediately via applySnapshot so the UI updates without waiting for the
+// next poll tick. A non-2xx {error} body becomes the pane's inline error AND is mirrored to
+// the shell as a bottom-right toast via onError (ISS-008 — both surfaces by design). Buttons
+// are disabled while a request is in flight, so at most one action runs per pane at a time.
+export function useGameAction(
+  state: StateSnapshot | null,
+  applySnapshot: (snapshot: StateSnapshot) => void,
+  onError?: (message: string) => void,
+): { runAction: (path: string, body?: unknown) => Promise<void>; busy: boolean; actionError: string | null } {
+  const [busy, setBusy] = useState(false);
+  // Inline error from a failed action — auto-clears on the next successful poll (the shell's
+  // snapshot prop changes every tick) or the next successful action.
+  const [actionError, setActionError] = useState<string | null>(null);
+  useEffect(() => {
+    if (state !== null) setActionError(null);
+  }, [state]);
+
+  const runAction = useCallback(
+    async (path: string, body?: unknown) => {
+      if (busy) return;
+      setBusy(true);
+      try {
+        const res = await fetch(path, {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          body: body === undefined ? undefined : JSON.stringify(body),
+          cache: 'no-store',
+        });
+        const data = (await res.json()) as StateSnapshot & { error?: string };
+        if (!res.ok) throw new Error(data.error ?? `HTTP ${res.status}`);
+        setActionError(null);
+        applySnapshot(data);
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        setActionError(message); // inline pane error stays…
+        onError?.(message); // …and the shell mirrors it as a bottom-right toast (ISS-008)
+      } finally {
+        setBusy(false);
+      }
+    },
+    [applySnapshot, busy, onError],
+  );
+
+  return { runAction, busy, actionError };
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flight-ops",
-  "version": "0.19.0",
+  "version": "0.21.0",
   "private": true,
   "scripts": {
     "dev": "next dev -p 3000",