feat(#58): trade & embargoes — TurnResult.economy ops (trade/embargo, declare/lift) with a deterministic per-turn effect and war auto-suspension
CI / build + unit + e2e (pull_request) Successful in 2m3s

This commit is contained in:
2026-10-15 17:26:24 +00:00
parent ed91735c8a
commit b5ea8ba5a4
15 changed files with 776 additions and 23 deletions
+53
View File
@@ -143,6 +143,37 @@ export interface MapMarker {
placedTurn: number;
}
/**
* (v0.35.0, #58) An active BILATERAL TRADE agreement between two distinct
* nations. Declared by the LLM via `TurnResult.economy.trade` (a no-`lift`
* op) and ended by a `lift: true` op; while active it yields a small,
* deterministic economy gain to BOTH parties every committed turn. The
* engine suspends (removes) the trade automatically when the two parties end
* up on opposite sides of an active war (v0.33, #56).
*/
export interface TradeAgreement {
/** First party's nation id. */
a: string;
/** Second party's nation id (distinct from `a`; the pair is symmetric). */
b: string;
}
/**
* (v0.35.0, #58) An active UNILATERAL EMBARGO: `from` blocks trade with
* `target` (which must differ from `from`). Declared by the LLM via
* `TurnResult.economy.embargo` (a no-`lift` op) and lifted by a `lift: true`
* op; while active it applies a small, deterministic economy dip to the
* TARGET only, every committed turn. The engine suspends (removes) the
* embargo automatically when the two nations end up on opposite sides of an
* active war (v0.33, #56).
*/
export interface Embargo {
/** The imposing nation's id. */
from: string;
/** The embargoed nation's id (distinct from `from`). */
target: string;
}
/**
* (v0.33.0, #56) A first-class **war** — a named, ongoing armed conflict
* between two or more nations. Unlike the boolean `war` relation (which a
@@ -303,6 +334,28 @@ export interface GameState {
* additive, no data wipe.
*/
wars: War[];
/**
* (v0.35.0, #58) Active bilateral trade agreements (see {@link TradeAgreement}):
* declared/ended by a turn's `economy.trade` ops (a no-`lift` op declares,
* `lift: true` ends). Every committed turn the engine applies a small,
* deterministic economy gain to BOTH parties of each active agreement, and
* suspends (removes) any agreement whose two parties are on opposite sides
* of an active war (v0.33, #56). Always `[]` on a fresh game; rows saved
* before v0.35 load with this defaulted to `[]` (see server/db.ts) —
* additive, no data wipe.
*/
trades: TradeAgreement[];
/**
* (v0.35.0, #58) Active unilateral embargoes (see {@link Embargo}):
* imposed/lifted by a turn's `economy.embargo` ops (a no-`lift` op imposes,
* `lift: true` lifts). Every committed turn the engine applies a small,
* deterministic economy dip to each embargo's TARGET only, and suspends
* (removes) any embargo whose two nations are on opposite sides of an
* active war (v0.33, #56). Always `[]` on a fresh game; rows saved before
* v0.35 load with this defaulted to `[]` (see server/db.ts) — additive,
* no data wipe.
*/
embargoes: Embargo[];
}
/**