diff --git a/.claude/knowledge/codebase-graph.md b/.claude/knowledge/codebase-graph.md
index 3fb36e3..73e2964 100644
--- a/.claude/knowledge/codebase-graph.md
+++ b/.claude/knowledge/codebase-graph.md
@@ -1,35 +1,46 @@
 # Codebase Dependency Graph
 
 Generated by graphify-dotnet from the `src/` directory. Regenerates automatically before
-each build of `Perpetuum.Server` (requires .NET 10 SDK for the graphify tool — `dotnet tool restore` from the
+each build of `Perpetuum.Server` (requires .NET 10 SDK and `dotnet tool restore` from the
 solution root).
 
 ## Artifacts
 
-- **`docs/graph/graph.json`** — machine-readable graph; gitignored,
-  present after any local `Perpetuum.Server` build
-- **`docs/graph/GRAPH_REPORT.md`** — Markdown architecture report; gitignored, same condition
+- **`docs/graph/GRAPH_REPORT.md`** — Markdown summary: god nodes, community clusters, stats.
+  **Read this first.** Token-efficient starting point for any architectural question.
+- **`docs/graph/graph.json`** — Full machine-readable graph (19,926 nodes, 33,689 edges).
+  Use via `tools/query-graph.ps1` — do not read the raw file.
 - **GitHub Wiki** — latest report published by CI:
   `https://github.com/OpenPerpetuum/PerpetuumServer2/wiki/Codebase-Graph`
 
 ## Graph Structure
 
 Nodes represent C# classes, methods, and namespaces (type: `Entity` or `File`).
-Edges represent inheritance, composition, and namespace imports.
-Communities (Louvain clustering, clusters) group related symbols.
+Edges have two relationship types:
+- **`contains`** (33,623 edges) — within-file hierarchy: file → namespace → class → method
+- **`imports`** (66 edges) — cross-file namespace dependencies (the meaningful ones for impact analysis)
+
+Communities (Louvain clustering) group related symbols into 2,616 clusters.
 
 ## How to Use
 
-**Impact analysis** — when a type is modified, query `graph.json` for edges pointing to that
-node's `id` to find all dependents before assessing blast radius.
+| Goal | Action |
+|---|---|
+| Architectural overview or god-node check | Read `docs/graph/GRAPH_REPORT.md` |
+| Blast radius before modifying a class | `.\tools\query-graph.ps1 <ClassName> -Direction in` |
+| What a class depends on | `.\tools\query-graph.ps1 <ClassName> -Direction out` |
+| Full dependency picture | `.\tools\query-graph.ps1 <ClassName>` (default: both) |
+| Find other `.cs` files in the same Louvain cluster | `.\tools\query-graph.ps1 <ClassName> -Direction community` |
+
+## God-Node Awareness
 
-**God-node awareness** — the top 10 most-connected symbols are listed in `GRAPH_REPORT.md`
-under "God Nodes". These are the highest-risk symbols to change: `RelocateItems`,
-`LootItemRepository`, `PackItems`, `ChangeAmmo`, `UnstackAmount`, `EquipModule`,
-`ListContainer`, `IWeatherService`, `SetItemName`, `ILootItemRepository` — see `GRAPH_REPORT.md` for the full list.
+The top 10 most-connected symbols are listed in `docs/graph/GRAPH_REPORT.md` under "God Nodes".
+These are the highest-risk symbols to change — check the report before modifying any of them.
+The list regenerates on each build; do not rely on hardcoded names from prior sessions.
 
-**Subsystem navigation** — look up a class node in `graph.json` to find its `community` ID,
-then find other nodes with the same `community` to discover related types in the same cluster.
+Note: `tools/query-graph.ps1` matches `.cs` file nodes only — namespace-level entries in the God Nodes list (e.g. `Perpetuum.RequestHandlers`) cannot be queried by name and must be explored via `GRAPH_REPORT.md` directly.
 
-**Dependency verification** — check for edge paths between two namespaces to confirm whether
-an unintended cross-subsystem dependency would be introduced by a change.
+> **Note on import sparsity:** Only 66 `imports` edges exist across the entire codebase (AST-only
+> analysis). Only ~7 classes have meaningful inbound edges — for all others, `-Direction in` returns
+> only the parent file's `contains` edge, not actual callers. Absence of inbound edges is the norm,
+> not a signal that a class is safe to change.
diff --git a/CLAUDE.md b/CLAUDE.md
index 406c520..0b5d82c 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -158,10 +158,11 @@ For any non-trivial task:
 1. Identify affected subsystems
 2. Identify relevant documentation
 3. Locate similar implementations
-4. Understand existing patterns
-5. Evaluate runtime implications
-6. Produce a short implementation plan
-7. Then implement
+4. Check `docs/graph/GRAPH_REPORT.md` for God Nodes (high-risk symbols); run `.\tools\query-graph.ps1 <ClassName> -Direction in` to enumerate direct dependents — a null result is normal (most classes have no detected importers) and does not mean the change is safe (if `graph.json` is absent, skip and continue to step 5)
+5. Understand existing patterns
+6. Evaluate runtime implications
+7. Produce a short implementation plan
+8. Then implement
 
 ---
 
@@ -328,6 +329,7 @@ Avoid parallel abstractions unless justified.
 |---|---|
 | Main AI instructions | `CLAUDE.md` |
 | Architecture deep-dive | `.claude/knowledge/architecture.md` |
+| Codebase graph & impact analysis | `.claude/knowledge/codebase-graph.md` |
 | Specialist agents | `.claude/agents/<name>.md` |
 
 
diff --git a/docs/Patches/p36.2/Features/EquipmentSets/effects_row.sql b/docs/Patches/p36.2/Features/EquipmentSets/effects_row.sql
new file mode 100644
index 0000000..d32157b
--- /dev/null
+++ b/docs/Patches/p36.2/Features/EquipmentSets/effects_row.sql
@@ -0,0 +1,26 @@
+-- Insert effects table row for effect_equipment_set_bonus (ID 139)
+-- (IMPROVEMENT-025)
+-- Idempotent: safe to run multiple times.
+-- The effects.id column is IDENTITY(1,1), so IDENTITY_INSERT is required
+-- when inserting a specific ID value.
+
+SET IDENTITY_INSERT effects ON;
+
+IF NOT EXISTS (SELECT 1 FROM effects WHERE id = 139)
+BEGIN
+    INSERT INTO effects
+        (id, name, description, effectcategory, duration, isaura, auraradius, ispositive, display, saveable)
+    VALUES
+        (139,
+         N'Set Bonus Active',
+         N'An equipment set bonus is active on this robot.',
+         0,
+         0,
+         0,
+         0,
+         1,
+         1,
+         0);
+END;
+
+SET IDENTITY_INSERT effects OFF;
diff --git a/docs/Patches/p36.2/Features/EquipmentSets/migration.sql b/docs/Patches/p36.2/Features/EquipmentSets/migration.sql
new file mode 100644
index 0000000..b5d700d
--- /dev/null
+++ b/docs/Patches/p36.2/Features/EquipmentSets/migration.sql
@@ -0,0 +1,30 @@
+-- Equipment Set Synergy Bonuses Migration (IMPROVEMENT-025)
+-- Run once against the game database before deploying the updated server binary.
+
+CREATE TABLE equipment_sets (
+    set_id  INT          NOT NULL IDENTITY(1,1),
+    name    NVARCHAR(64) NOT NULL,
+    CONSTRAINT PK_equipment_sets PRIMARY KEY (set_id),
+    CONSTRAINT UQ_equipment_sets_name UNIQUE (name)
+);
+
+CREATE TABLE equipment_set_members (
+    set_id      INT NOT NULL,
+    definition  INT NOT NULL,
+    CONSTRAINT PK_equipment_set_members PRIMARY KEY (set_id, definition),
+    CONSTRAINT FK_equipment_set_members_set FOREIGN KEY (set_id)
+        REFERENCES equipment_sets (set_id),
+    CONSTRAINT FK_equipment_set_members_def FOREIGN KEY (definition)
+        REFERENCES entitydefaults (definition)
+);
+
+CREATE TABLE equipment_set_bonus_thresholds (
+    set_id          INT   NOT NULL,
+    required_pieces INT   NOT NULL,
+    aggregate_field INT   NOT NULL,
+    bonus_value     FLOAT NOT NULL,
+    CONSTRAINT PK_equipment_set_bonus_thresholds
+        PRIMARY KEY (set_id, required_pieces, aggregate_field),
+    CONSTRAINT FK_equipment_set_bonus_thresholds_set FOREIGN KEY (set_id)
+        REFERENCES equipment_sets (set_id)
+);
diff --git a/docs/Patches/p36.2/Features/EquipmentSets/set_striker_pilot.sql b/docs/Patches/p36.2/Features/EquipmentSets/set_striker_pilot.sql
new file mode 100644
index 0000000..b5827f6
--- /dev/null
+++ b/docs/Patches/p36.2/Features/EquipmentSets/set_striker_pilot.sql
@@ -0,0 +1,50 @@
+-- Pilot set: set_striker (IMPROVEMENT-025 validation content)
+-- Idempotent: safe to run multiple times.
+--
+-- AggregateField IDs used:
+--   17  = armor_max_modifier      (formula: Modifier — 1.05 = +5% max armor)
+--   310 = resist_kinetic_modifier (formula: Modifier — 1.08 = +8% kinetic resist)
+--
+-- Member modules: all four tiers of medium armor plates.
+-- Definition names are resolved dynamically via entitydefaults — no hardcoded IDs.
+
+-- 1. Create the set (idempotent)
+IF NOT EXISTS (SELECT 1 FROM equipment_sets WHERE name = N'set_striker')
+    INSERT INTO equipment_sets (name) VALUES (N'set_striker');
+
+DECLARE @set_id INT;
+SELECT @set_id = set_id FROM equipment_sets WHERE name = N'set_striker';
+
+-- 2. Assign member modules — all four medium armor plate tiers
+-- Skips any member already present to remain idempotent.
+INSERT INTO equipment_set_members (set_id, definition)
+SELECT @set_id, ed.definition
+FROM entitydefaults ed
+WHERE ed.definitionname IN (
+    N'def_standard_medium_armor_plate',
+    N'def_named1_medium_armor_plate',
+    N'def_named2_medium_armor_plate',
+    N'def_named3_medium_armor_plate'
+)
+AND NOT EXISTS (
+    SELECT 1
+    FROM equipment_set_members esm
+    WHERE esm.set_id = @set_id
+      AND esm.definition = ed.definition
+);
+
+-- 3. 2-piece threshold: +5% max armor (aggregate_field = 17, bonus_value = 1.05)
+IF NOT EXISTS (
+    SELECT 1 FROM equipment_set_bonus_thresholds
+    WHERE set_id = @set_id AND required_pieces = 2 AND aggregate_field = 17
+)
+    INSERT INTO equipment_set_bonus_thresholds (set_id, required_pieces, aggregate_field, bonus_value)
+    VALUES (@set_id, 2, 17, 1.05);
+
+-- 4. 4-piece threshold: +8% kinetic resist (aggregate_field = 310, bonus_value = 1.08)
+IF NOT EXISTS (
+    SELECT 1 FROM equipment_set_bonus_thresholds
+    WHERE set_id = @set_id AND required_pieces = 4 AND aggregate_field = 310
+)
+    INSERT INTO equipment_set_bonus_thresholds (set_id, required_pieces, aggregate_field, bonus_value)
+    VALUES (@set_id, 4, 310, 1.08);
diff --git a/docs/backlog/completed.md b/docs/backlog/completed.md
index ef12ee5..ef4d31b 100644
--- a/docs/backlog/completed.md
+++ b/docs/backlog/completed.md
@@ -248,6 +248,29 @@ refresh already calls `LookupCache.RefreshAllAsync` but does not call `Entities.
 
 ---
 
+## IMPROVEMENT-024 - Server Restart: Daily Objective Announcement and Admin Tool Statistics
+
+Status: DONE
+Priority: HIGH
+Area: Seasons / Objectives / Admin Tool
+
+### Description
+Two related improvements to daily objective visibility:
+
+1. **Server restart announcement** — on startup (or first pool computation after season activation), if an active season with daily objectives is configured, announce today's active objectives via the Seasons Info channel. Guard: fires only when `_dailyPool.Date == DateOnly.MinValue` (uninitialized pool), not on periodic 5-minute cache refreshes.
+
+2. **Admin Tool Season Statistics tab** — added "Today's Daily Objectives" section showing today's active pool and per-objective completion counts. Pool computed in C# using identical seeded Fisher-Yates algorithm as the server (`seed = seasonId * 397 ^ day.DayNumber`). Server's `GetObjectives` query aligned with `ORDER BY display_order` to ensure both sides shuffle from the same input order.
+
+### Implementation
+- `src/Perpetuum/Services/Seasons/SeasonService.cs` — `isFirstLoad` guard in `RefreshCache()`
+- `src/Perpetuum/Services/Seasons/SeasonRepository.cs` — added `ORDER BY display_order` to `GetObjectives`
+- `src/Perpetuum.AdminTool/Seasons/TodaysDailyObjectiveRow.cs` — new record
+- `src/Perpetuum.AdminTool/Seasons/SeasonRepository.cs` — `LoadTodaysDailyObjectivesAsync`
+- `src/Perpetuum.AdminTool/ViewModels/SeasonStatisticsViewModel.cs` — `TodaysDailyObjectives` collection
+- `src/Perpetuum.AdminTool/Views/SeasonDetailView.xaml` — new Statistics tab section
+
+---
+
 ## ISSUE-012 - New Robot dialog: incorrect entity filtering in clone pickers
 
 Status: DONE
@@ -409,3 +432,407 @@ Without `IsRobot` defaulting to true, operators must manually check it every tim
 - `CategoryFlagsNode.ContainsOrEquals` handles both exact match and descendant matching, so sub-types within each category are included automatically.
 - `StatsPanelViewModel.LoadFromClone` already supports the "Original" column display — no changes needed to that class.
 - The main entity clone picker (existing) is not affected; it continues to use the robots-only `BuildRobotItems` filter (see ISSUE-012).
+
+---
+
+## ISSUE-013 - Robot creation does not populate options field with part definitions
+
+Status: DONE
+Priority: HIGH
+Area: Game Content / Robots
+
+### Problem
+When a new robot is added, the `options` field for the robot entity is not populated with its part definitions in `GenXY` format. The options field must contain entries such as:
+
+```
+#head=n3036
+#chassis=n3037
+#leg=n3038
+#inventory=n332
+```
+
+If new robot parts are created as part of the robot creation process, the definitions generated for those parts must be referenced in these options entries.
+
+### Impact
+Robots without correctly populated options are non-functional in-game — the server cannot resolve their component parts, preventing spawning, equipping, or use of the robot.
+
+### Proposed Fix
+- Identify where robot entity creation writes the `options` field (content SQL pipeline or admin tool robot creation flow).
+- Ensure that after part definitions are created (head, chassis, leg, inventory), their resolved definition IDs are written back to the robot's `options` field using the `#head=nXXXX` / `#chassis=nXXXX` / `#leg=nXXXX` / `#inventory=nXXXX` format.
+- If part definitions are generated dynamically, the options population step must run after the part definitions exist and reference their actual IDs.
+
+### Notes
+Part definition IDs must be resolved dynamically — do not hardcode.
+Follows the `GenXY` naming convention where `n` prefix denotes a definition reference by numeric ID.
+
+---
+
+## ISSUE-014 - Robot part clone does not copy or expose options field for editing
+
+Status: DONE
+Priority: HIGH
+Area: Game Content / Robots / Admin Tool
+
+### Problem
+When cloning a robot part, the `options` field is not carried over from the source part and is not presented in the editor. The clone workflow leaves the options field empty and provides no way to review or modify it before committing.
+
+### Impact
+Cloned robot parts silently lose their options data, requiring manual correction after the fact. This is error-prone and inconsistent with the rest of the clone workflow.
+
+### Proposed Fix
+- Copy the source part's `options` field into the clone candidate at the point of clone creation.
+- Expose the options field in the clone editor using the same old/new pattern already used on the Basic tab: display the original value as read-only on the left, and provide an editable new value field on the right.
+- Reuse the existing old/new field component — do not introduce a new pattern.
+
+### Notes
+Follow the existing Basic tab old/new UI pattern exactly for consistency.
+The old (source) value must be read-only; only the new value field is editable.
+
+---
+
+## ISSUE-015 - Seasons Objectives tab: selected target not rendered in table cell
+
+Status: DONE
+Priority: HIGH
+Area: Seasons / Admin Tool
+
+### Problem
+On the Admin Tool Seasons Objectives tab, when an objective has a target selected, the chosen value is not displayed in the table cell. The value is stored and visible when the user clicks into the cell (via the picker), but the table column renders as blank.
+
+### Impact
+Operators cannot confirm at a glance which target is assigned to each objective. They must click every cell individually to audit or verify configurations, making bulk review error-prone and slow.
+
+### Proposed Fix
+- Locate the cell template / data binding for the target column in the Objectives tab DataGrid.
+- Identify why the display path does not render the selected value (likely a missing `DisplayMemberPath`, wrong binding path, or the display value not being propagated back to the row model after picker selection).
+- Ensure the table cell shows the human-readable target label (same value visible in the picker) once a target is selected, without requiring the user to click the cell.
+
+### Notes
+The picker itself works correctly — the issue is purely in how the selected value is reflected back to the table row display.
+Check whether the binding uses a converter or a nested property that is not notifying change on selection commit.
+
+---
+
+## ISSUE-016 - Saving Daily Objectives Per Day in AdminTool causes varchar to datetime cast error
+
+Status: DONE
+Priority: CRITICAL
+Area: Seasons / Admin Tool
+
+### Problem
+In the AdminTool Seasons view, saving the Daily Objectives Per Day field produces a SQL cast error: implicit or explicit conversion from varchar to datetime fails. The save operation aborts and the value is not persisted.
+
+### Impact
+Operators cannot configure Daily Objectives Per Day at all — the field is effectively broken. Any season that requires this setting cannot be properly administered.
+
+### Root Cause
+The `start_time` and `end_time` string literals in `SeasonChanges.BuildInsert` / `BuildUpdate` and `SeasonWizardViewModel.BuildSeasonScript` used the format `'yyyy-MM-dd HH:mm:ss'` (space separator). SQL Server's implicit varchar-to-datetime conversion for this format is locale/DATEFORMAT-sensitive. The ISO 8601 format `'yyyy-MM-ddTHH:mm:ss'` (T separator) is always accepted by SQL Server regardless of collation or DATEFORMAT. The `daily_objectives_per_day` field itself (`SqlLiteral.OfNullableInt`) is correct — it generates a numeric literal or NULL. The error surfaced when users first exercised the Save General path after the new field gave them a reason to use it.
+
+### Fix
+Changed `yyyy-MM-dd HH:mm:ss` → `yyyy-MM-ddTHH:mm:ss` in:
+- `SeasonChanges.cs` `BuildInsert` and `BuildUpdate` (both start_time and end_time)
+- `SeasonWizardViewModel.cs` `BuildSeasonScript`
+
+### Notes
+Field was recently introduced (commits `837d188`, `0e59ae9`, `6d5432c`, `b442883`).
+`daily_objectives_per_day` column type is `smallint [null]` — confirmed correct in schema docs.
+
+---
+
+## ISSUE-017 - Seasons Objectives tab: Activity type selector does not show all active activity types
+
+Status: DONE
+Priority: CRITICAL
+Area: Seasons / Admin Tool
+
+### Problem
+On the Admin Tool Seasons Objectives tab, the Activity type selector (dropdown/picker) did not display all active activity types. The Phase 1 (non-combat) and Phase 2 (combat) types added to `SeasonActivityType` were never added to the UI option lists.
+
+### Root Cause
+`SeasonDetailViewModel.ActivityTypeOptions` and `SeasonWizardViewModel.ObjectiveActivityTypeOptions` were both hardcoded lists of 9 types. `SeasonActivityType` has 21 values — 12 were absent from both lists: `Prototyping`, `ReverseEngineering`, `Production`, `ArtifactFound`, `EpEarned`, `DamageDone`, `DamageReceived`, `ArmorRestored`, `EnergyDrainDealt`, `EnergyDrainReceived`, `EnergyTransferDealt`, `EnergyTransferReceived`.
+
+### Fix
+Added all 12 missing types to `ActivityTypeOptions` in `SeasonDetailViewModel.cs` and `ObjectiveActivityTypeOptions` in `SeasonWizardViewModel.cs`. Labels match `SeasonActivityRateRow.ActivityTypeLabel`.
+
+---
+
+## ISSUE-018 - SeasonRepository.GetActiveSeason throws InvalidCastException on daily_objectives_per_day
+
+Status: DONE
+Priority: CRITICAL
+Area: Seasons / Server
+
+### Problem
+The server crashed on every `SeasonService.Update` tick with `System.InvalidCastException: Unable to cast object of type 'System.Int16' to type 'System.Nullable\`1[System.Int32]'` when an active season existed.
+
+### Root Cause
+`daily_objectives_per_day` is `smallint [null]` in the DB — SQL Server returns a boxed `System.Int16`. `DataRecordExtensions.GetValue<T>` does a direct unbox cast `(T)record.GetValue(index)`. The CLR cannot unbox an `Int16` as `Nullable<Int32>` — the unbox target must match the stored type exactly. The crash occurred in all three season-loading methods: `GetActiveSeason`, `GetSeasonById`, and `GetPendingRecurringSeason`.
+
+The AdminTool's `SeasonRepository` already handled this correctly with explicit `reader.GetInt16(11)` → `(int)` widening.
+
+### Fix
+Changed all three `record.GetValue<int?>("daily_objectives_per_day")` calls to `(int?)record.GetValue<short?>("daily_objectives_per_day")`. This reads the value with the correct CLR type (`Int16`) and widens to `int?` at the call site. `Season.DailyObjectivesPerDay` stays `int?` — no downstream changes required.
+
+### Notes
+`recurrence_gap_days` is `int [null]` — `GetValue<int?>` is correct there and is not affected.
+`GetValue<T>` has no numeric widening; other smallint/tinyint columns read as `int?` will hit the same issue if introduced.
+
+---
+
+## ISSUE-019 - CI build fails for AdminToolInstaller: NETSDK1047 missing RID target in assets file
+
+Status: DONE
+Priority: HIGH
+Area: Build / CI
+
+### Problem
+The CI pipeline step `dotnet build src/Perpetuum.AdminToolInstaller/Perpetuum.AdminToolInstaller.wixproj --no-restore --configuration Release -p:Platform=x64` fails with:
+
+```
+NETSDK1047: Assets file '...Perpetuum.AdminTool\obj\project.assets.json' doesn't have a target for 'net8.0-windows/win-x64'.
+Ensure that restore has run and that you have included 'net8.0-windows' in the TargetFrameworks for your project.
+You may also need to include 'win-x64' in your project's RuntimeIdentifiers.
+```
+
+### Impact
+The AdminTool installer cannot be built in CI, blocking release packaging of the AdminTool.
+
+### Root Cause
+The build step uses `--no-restore`, so NuGet restore never runs for the `Perpetuum.AdminTool` dependency. The assets file in `obj/` is either absent or was produced by a prior restore without the `win-x64` RID, so the SDK cannot resolve the `net8.0-windows/win-x64` target.
+
+### Proposed Fix
+One or more of:
+1. Add a `dotnet restore` step for `Perpetuum.AdminToolInstaller.wixproj` (or the full solution) before the `--no-restore` build, with `-p:RuntimeIdentifier=win-x64`.
+2. Ensure `Perpetuum.AdminTool.csproj` declares `<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>` so restore always produces the required RID target.
+3. Alternatively, drop `--no-restore` from the AdminToolInstaller build step and rely on the SDK to restore inline.
+
+### Notes
+The error path is `D:\a\...` (GitHub Actions runner). The fix must be applied to `.github/workflows/dotnet.yml` and/or the `.csproj`.
+
+---
+
+## IMPROVEMENT-005 - Seasons: Additional Activity Types
+
+Status: DONE
+Priority: MEDIUM
+Area: Seasons / Activities
+
+### Description
+Expanded the Seasons activity tracking system with 12 new activity types implemented in two phases. All types integrate with the existing `RecordActivity` pipeline with no DB schema changes.
+
+### Phase 1 — Non-combat types (enum values 9–13)
+- `Prototyping` (9) — hook in ProductionProcessor.cs at job completion, branch on job type
+- `ReverseEngineering` (10) — same hook, different job type branch
+- `Production` (11) — same hook, combined items + robots
+- `ArtifactFound` (12) — hook in ArtifactScanner.cs after EP boost call; amount = 1
+- `EpEarned` (13) — hook all `AddExtensionPointsBoostAndLog` call sites + passive EP accumulation path
+
+### Phase 2 — Combat types (enum values 14–20)
+- `DamageDone` (14) / `DamageReceived` (15) — hook in TakeDamage/ApplyDamageResult; amount = HP dealt
+- `ArmorRestored` (16) — hook repair module application; character = repairer; amount = HP restored
+- `EnergyDrainDealt` (17) / `EnergyDrainReceived` (18) — neutralizer + drainer modules; amount = energy removed
+- `EnergyTransferDealt` (19) / `EnergyTransferReceived` (20) — transfer module; amount = energy transferred
+
+### Anti-farming
+Handled via `unit_scale` in rates (set high for high-frequency types). Training character filter applies automatically. No new cap infrastructure needed.
+
+### Spec
+`docs/superpowers/specs/2026-05-16-improvement-005-additional-activity-types-design.md`
+
+### Notes
+Distance Travelled was deferred — see [[IMPROVEMENT-015]].
+
+---
+
+## IMPROVEMENT-006 - Daily Objectives
+
+Status: DONE
+Priority: MEDIUM
+Area: Seasons / Objectives
+
+### Description
+Introduced daily objectives: a set of objectives that reset and re-issue automatically every day. The system reuses and extends existing objective infrastructure, adding only the recurrence scheduling layer on top.
+
+### Implementation
+Extended `season_objectives` with `is_daily` (bit) and `package_id` (int, nullable). Added `day_window` (date, sentinel `1900-01-01` for regular, `UtcNow.Date` for daily) to `season_objective_progress` and rebuilt its PK to `(character_id, season_id, objective_id, day_window)`. No reset scheduler needed — fresh row per day via existing MERGE. Optional reward package delivered on daily completion via `InsertRedeemableItems`. Admin Tool gains Is Daily checkbox column, Reward Package combobox column, and All/One-time/Daily filter. Branch: `p36.1`.
+
+### Notes
+Depends on [[ISSUE-001]] — daily reset boundary must use UTC to be consistent across deployments.
+See [[IMPROVEMENT-005]] for new activity types that could back daily objective targets.
+See [[IMPROVEMENT-001]] for recurring season design — daily objectives are a finer-grained recurrence within a season.
+Reset time is hardcoded UTC midnight (configurable reset time deferred).
+
+---
+
+## IMPROVEMENT-009 - Targeted Objectives
+
+Status: DONE
+Priority: LOW
+Area: Seasons / Objectives
+Spec: `docs/superpowers/specs/2026-05-19-improvement-009-targeted-objectives-design.md`
+
+### Description
+Extended the objective system to support targeted objectives, where a specific subject must be matched for progress to count. The target is activity-type-dependent — for example, a mining objective can target a specific ore type, a kill objective can target an NPC role or rank, a production objective can target an item category, and so on.
+
+### Impact
+Targeted objectives allow season designers to create more varied and specific challenges, directing player behaviour toward particular content rather than rewarding any activity of a given type.
+
+### Notes
+Depends on [[IMPROVEMENT-005]] for the activity types that targeted objectives filter against.
+NPC rank/role filtering (see [[IMPROVEMENT-007]], [[IMPROVEMENT-008]]) was not implemented in this pass — NPC kill targets require those systems to be built first.
+
+---
+
+## IMPROVEMENT-012 - Seasons Tiers tab: on-the-fly save generating a single change script
+
+Status: DONE
+Priority: HIGH
+Area: Seasons / Admin Tool
+Spec: `docs/superpowers/specs/2026-05-16-improvement-012-tiers-tab-queue-save-design.md`
+
+### Description
+The Tiers tab in the Seasons Admin Tool was refactored to adopt the same on-the-fly save mechanic used by Activity Rates and Objectives tabs — producing a single consolidated change script per save. All three tabs now behave consistently.
+
+### Implementation
+Audited Activity Rates and Objectives save pattern (diff computation, script generation, transaction wrapper) and extended it to cover tier definitions (name, point threshold, reward). The generated script follows the same format and conventions as Activity Rates and Objectives saves.
+
+### Notes
+See [[IMPROVEMENT-010]] — the Scoring Balancing tab depends on tiers being editable inline; consistent save mechanics here unblock a clean implementation of that tab.
+Preserved existing tier DB schema — this improvement changed the save UI mechanic only, not the underlying data model.
+
+---
+
+## IMPROVEMENT-017 - New Item script filename includes definition name
+
+Status: DONE
+Priority: LOW
+Area: Admin Tool / New Item Dialog
+Spec: `docs/superpowers/specs/2026-05-18-improvement-017-script-filename-prefixes-design.md`
+
+### Description
+When saving a new item in SqlScript mode, the output `.sql` file is now named `<definitionname>_<date>_<time>.sql` instead of the generic `admintool_<date>_<time>.sql`.
+
+Example: `def_plasma_launcher_20260517_084326.sql`
+
+### Fix
+In `NewItemDialogViewModel.SaveAsync` (SqlScript branch), replaced the filename construction to prefix with the sanitised definition name. Any character that is not a letter, digit, or underscore is replaced with `_`.
+
+### Notes
+`BasicPanel.DefinitionName` is available on `NewItemDialogViewModel` via the existing `BasicPanel` property.
+The `MainViewModel.CommitAsync` SqlScript path (multi-change commits) is out of scope.
+
+---
+
+## IMPROVEMENT-018 (Season Config) - Season Config: Activity Points Scoring Mode
+
+Status: DONE
+Priority: HIGH
+Area: Seasons / Admin Tool
+
+> **Note:** ID 018 is also used by "New Robot dialog UX improvements" above. This entry covers the Season Config scoring mode improvement; that numbering conflict should be resolved by renumbering one of the two.
+
+### Description
+Added a configurable **scoring mode** option to season configuration with two values:
+
+- **Objectives only** — activity points are added to matching objective progress but do not contribute to the global season score.
+- **Objectives + Global Score** — activity points are added to objective progress and also accumulate in the global season score (current behaviour).
+
+### Implementation
+Added `scoringMode` field to the season configuration schema (DB column + server-side model). Updated the activity point processing logic to branch on this field: skips global score accumulation when mode is `ObjectivesOnly`. Exposed the option in the Admin Tool season configuration UI. New seasons default to `ObjectivesAndGlobalScore` to preserve existing behaviour.
+
+---
+
+## IMPROVEMENT-019 - New Robot Dialog: Bonuses Tab
+
+Status: DONE
+Priority: HIGH
+Area: Admin Tool / New Robot Dialog
+Spec: `docs/superpowers/specs/2026-05-19-improvement-019-robot-bonuses-tab-design.md`
+
+### Description
+Added a **Bonuses** tab to the New Robot dialog for configuring chassis bonuses (`chassisbonus` table rows). The tab follows the same pattern as the Stats tab: empty by default for new robots, pre-filled from the cloned chassis definition when cloning, and editable (add / remove / modify rows). All bonus rows are emitted in the same single SQL script produced by `RobotSqlBuilder.Build`.
+
+Each bonus row maps to one `chassisbonus` row: Extension (dropdown), Bonus value, Target property (dropdown), Effect enhancer (checkbox), Note (optional text).
+
+Chassis bonuses are stored against the chassis part definition (`@chassisDef`), not the top-level robot definition.
+
+### Notes
+Unique constraint on `chassisbonus (definition, extension, targetpropertyID)` enforced in `HasDuplicates()`.
+`OriginalBonus` (read-only reference value) is shown in the row when cloning, same pattern as `NewStatRow.OriginalValue`.
+Bonuses tab hidden when `IsRobot` is false.
+
+---
+
+## IMPROVEMENT-020 - AdminTool Installer
+
+Status: DONE
+Priority: MEDIUM
+Area: Admin Tool / Distribution
+Spec: `docs/superpowers/specs/2026-05-19-improvement-020-admintool-installer-design.md`
+
+### Description
+Created an installer for the AdminTool application using WiX Toolset. The installer handles required .NET 8 runtime dependencies and is wired into the CI pipeline to produce a fresh installer artifact on each tagged release.
+
+### Notes
+Self-contained publish was evaluated; WiX approach chosen for clean uninstall and runtime detection.
+CI job produces the installer artifact from `Perpetuum.AdminToolInstaller.wixproj`.
+
+---
+
+## IMPROVEMENT-021 - Graphify Codebase Graph Integration
+
+Status: DONE
+Priority: HIGH
+Area: Infrastructure / Tooling / AI
+Spec: docs/superpowers/specs/2026-05-23-improvement-021-graphify-integration-design.md
+
+### Description
+Integrated `graphify-dotnet` as a local dotnet tool. Generates a structural JSON graph and Markdown architecture report before every `Perpetuum.Server` build. CI publishes the report to the GitHub Wiki on each push to `develop`.
+
+### Implementation
+- `.config/dotnet-tools.json` registers `graphify-dotnet@0.7.0` (command: `graphify`)
+- `Directory.Build.targets` (solution root) fires `GenerateCodeGraph` before `Perpetuum.Server` builds; `ContinueOnError="true"` soft-fails on machines without .NET 10 SDK
+- `-f json,report` produces `docs/graph/graph.json` and `docs/graph/GRAPH_REPORT.md` (gitignored)
+- `.github/workflows/dotnet.yml` `publish-wiki` job pushes `GRAPH_REPORT.md` to GitHub Wiki as `Codebase-Graph.md` on each push to `develop`
+- `.claude/knowledge/codebase-graph.md` added for Claude orientation
+
+### Notes
+Phase 2 (.NET 8 → .NET 10 project TFM migration) is deferred as an independent workstream.
+The graphify tool requires .NET 10 SDK but the project TFMs remain at net8.0.
+
+---
+
+## IMPROVEMENT-022 - Seasons: Randomised Daily Objective Pool
+
+Status: DONE
+Priority: HIGH
+Area: Seasons / Objectives
+
+### Description
+Added a season-level `daily_objectives_per_day` option (smallint, nullable) to limit how many daily objectives are active per day, selected deterministically from the full pool. `NULL` means all configured daily objectives are active every day (existing behaviour, no breaking change).
+
+### Implementation
+When a player queries their daily objectives, the server checks `daily_objectives_per_day`. If set, it deterministically samples N objectives from the full `is_daily` pool for the current UTC day using a seed derived from `(season_id, day_window)` — all players see the same set on the same day. Admin Tool surfaces the field in the season configuration panel as a nullable integer field.
+
+### Notes
+Depends on [[IMPROVEMENT-006]] — daily objectives infrastructure must exist before pool selection can be layered on.
+Deterministic selection ensures consistent daily experience across all characters in a season.
+If `daily_objectives_per_day` exceeds the total number of configured daily objectives, treated as "all objectives."
+
+---
+
+## IMPROVEMENT-023 - Seasons: Same-IP Gate for NIC Earning/Spending Activities
+
+Status: DONE
+Priority: HIGH
+Area: Seasons / Anti-Abuse
+Spec: `docs/superpowers/specs/2026-05-21-improvement-023-same-ip-gate-design.md`
+
+### Description
+Enforced a same-IP gate on season activity recording so that a player running multiple accounts from the same machine cannot earn season points by trading with themselves. When two characters involved in a tracked NIC activity share the same originating IP address, neither transaction side earns points.
+
+### Implementation
+`ActivityEvent` extended with optional `CounterpartyAccountId`. `SeasonService.RecordActivity` queries `accountonlinetime` for the most recent session IP of both characters and suppresses recording when they match. Market NIC recording moved from `CharacterWallet` to explicit call sites in `Market.cs` where both counterparties are available. All 7 transport assignment `RecordActivity` calls updated with counterparty account IDs. PvpKill IP query fixed to use `TOP 1 ORDER BY loggedin DESC` with null guard. Branch: `p36.1`.
+
+### Notes
+Vendor market fills (no player counterparty) record without gate. `buyOrderPayBack` and `CashInOnSubmit` (no counterparty) left ungated. NAT false-positive limitation documented in spec.
diff --git a/docs/backlog/improvements.md b/docs/backlog/improvements.md
index 9fdb1e1..20d32e0 100644
--- a/docs/backlog/improvements.md
+++ b/docs/backlog/improvements.md
@@ -1,6 +1,6 @@
 # Last ID used
 
-023
+029
 
 ## IMPROVEMENT-002 - Refactor Hardcoded System Characters and Channels
 
@@ -28,64 +28,6 @@ Keep backward compatibility with existing DB channel records — constants shoul
 
 ---
 
-## IMPROVEMENT-005 - Seasons: Additional Activity Types
-
-Status: DONE
-Priority: MEDIUM
-Area: Seasons / Activities
-
-### Description
-Expand the Seasons activity tracking system with 12 new activity types implemented in two phases. All types integrate with the existing `RecordActivity` pipeline with no DB schema changes.
-
-### Phase 1 — Non-combat types (enum values 9–13)
-- `Prototyping` (9) — hook in ProductionProcessor.cs at job completion, branch on job type
-- `ReverseEngineering` (10) — same hook, different job type branch
-- `Production` (11) — same hook, combined items + robots
-- `ArtifactFound` (12) — hook in ArtifactScanner.cs after EP boost call; amount = 1
-- `EpEarned` (13) — hook all `AddExtensionPointsBoostAndLog` call sites + passive EP accumulation path
-
-### Phase 2 — Combat types (enum values 14–20)
-- `DamageDone` (14) / `DamageReceived` (15) — hook in TakeDamage/ApplyDamageResult; amount = HP dealt
-- `ArmorRestored` (16) — hook repair module application; character = repairer; amount = HP restored
-- `EnergyDrainDealt` (17) / `EnergyDrainReceived` (18) — neutralizer + drainer modules; amount = energy removed
-- `EnergyTransferDealt` (19) / `EnergyTransferReceived` (20) — transfer module; amount = energy transferred
-
-### Anti-farming
-Handled via `unit_scale` in rates (set high for high-frequency types). Training character filter applies automatically. No new cap infrastructure needed.
-
-### Spec
-`docs/superpowers/specs/2026-05-16-improvement-005-additional-activity-types-design.md`
-
-### Notes
-Distance Travelled was deferred — see [[IMPROVEMENT-015]].
-Verify passive EP accumulation call site (AccountManager.cs or dedicated scheduler) before wiring EpEarned.
-Confirm NPCs do not have character IDs that would cause accidental season point accumulation on DamageReceived.
-
----
-
-## IMPROVEMENT-006 - Daily Objectives
-
-Status: DONE
-Priority: MEDIUM
-Area: Seasons / Objectives
-
-### Description
-Introduce daily objectives: a set of objectives that reset and re-issue automatically every day. The system should reuse or extend existing objective infrastructure wherever possible, adding only the recurrence scheduling layer on top.
-
-### Impact
-Daily objectives provide a regular engagement loop that encourages players to log in consistently, broadening the appeal of the seasons system beyond one-time or long-horizon goals.
-
-### Implementation
-Extended `season_objectives` with `is_daily` (bit) and `package_id` (int, nullable). Added `day_window` (date, sentinel `1900-01-01` for regular, `UtcNow.Date` for daily) to `season_objective_progress` and rebuilt its PK to `(character_id, season_id, objective_id, day_window)`. No reset scheduler needed — fresh row per day via existing MERGE. Optional reward package delivered on daily completion via `InsertRedeemableItems`. Admin Tool gains Is Daily checkbox column, Reward Package combobox column, and All/One-time/Daily filter. Branch: `p36.1`.
-
-### Notes
-Depends on [[ISSUE-001]] — daily reset boundary must use UTC to be consistent across deployments.
-See [[IMPROVEMENT-005]] for new activity types that could back daily objective targets.
-See [[IMPROVEMENT-001]] for recurring season design — daily objectives are a finer-grained recurrence within a season.
-Reset time is hardcoded UTC midnight (configurable reset time deferred).
-
----
-
 ## IMPROVEMENT-007 - NPC Rank System
 
 Status: TODO
@@ -138,65 +80,6 @@ Keep the initial role set conservative; adding roles later is cheaper than chang
 
 ---
 
-## IMPROVEMENT-009 - Targeted Objectives
-
-Status: DONE
-Priority: LOW
-Area: Seasons / Objectives
-Spec: `docs/superpowers/specs/2026-05-19-improvement-009-targeted-objectives-design.md`
-
-### Description
-Extend the objective system to support targeted objectives, where a specific subject must be matched for progress to count. The target is activity-type-dependent — for example, a mining objective can target a specific ore type ("Mine 100 000 Colixium"), a kill objective can target an NPC role ("Kill 50 Combat NPCs") or rank, a production objective can target an item category, and so on.
-
-### Impact
-Targeted objectives allow season designers to create more varied and specific challenges, directing player behaviour toward particular content rather than rewarding any activity of a given type. This significantly increases the design space for seasons and daily objectives.
-
-### Proposed Implementation
-- Extend the objective definition schema with an optional `target_filter` structure: a type-discriminated payload whose shape is determined by the activity type (e.g. `{ type: "item", definition_id: 123 }` for mining, `{ type: "npc_role", role: 1 }` for kills).
-- Each activity handler is responsible for evaluating whether the event matches the objective's target filter before crediting progress; no-filter objectives behave as today (match all).
-- Target filter types to implement initially, aligned with supported activity types:
-  - **Mining** — specific ore `definition_id` or ore category.
-  - **NPC kill** — NPC `role` (see [[IMPROVEMENT-008]]) and/or `rank` (see [[IMPROVEMENT-007]]).
-  - **Production** — item category or specific `definition_id`.
-  - **Artifacting** — artifact tier or island type.
-  - **Island visitation** — specific island or island category (alpha/beta/gamma).
-- Admin Tool: when defining an objective, show a target picker whose options are driven by the selected activity type.
-- Objective display text should incorporate the target name (resolved from `definition_id` or enum label) for readable in-game descriptions.
-
-### Notes
-Depends on [[IMPROVEMENT-005]] for the activity types that targeted objectives will filter against.
-Depends on [[IMPROVEMENT-007]] and [[IMPROVEMENT-008]] for NPC rank/role filtering on kill objectives.
-Target filter should be stored as structured data (e.g. JSON column or normalised filter table) rather than freeform strings to allow reliable matching and Admin Tool rendering.
-Keep the filter evaluation path lightweight — it runs on every matching game event and must not introduce blocking or excessive allocation in hot paths.
-
----
-
-## IMPROVEMENT-012 - Seasons Tiers tab: on-the-fly save generating a single change script
-
-Status: DONE
-Priority: HIGH
-Area: Seasons / Admin Tool
-Spec: `docs/superpowers/specs/2026-05-16-improvement-012-tiers-tab-queue-save-design.md`
-
-### Description
-The Tiers tab in the Seasons Admin Tool currently uses a different save mechanic from the Activity Rates and Objectives tabs. Activity Rates and Objectives already support on-the-fly editing that produces a single consolidated change script per save. The Tiers tab should adopt the same pattern so all three tabs behave consistently.
-
-### Impact
-Inconsistent save mechanics increase operator confusion and risk: a different save flow for Tiers may require multiple manual steps or produce partial scripts, making season adjustments error-prone and harder to audit compared to the Activity Rates / Objectives workflow.
-
-### Proposed Implementation
-- Audit how Activity Rates and Objectives generate their single change script on save — identify the shared pattern (diff computation, script generation, transaction wrapper).
-- Refactor or extend that pattern to cover tier definitions (name, point threshold, reward).
-- Tiers tab save flow: compute a diff between the current persisted tier state and the edited in-memory state, then emit a single SQL/migration script covering all inserts, updates, and deletes in one transaction.
-- The generated script should follow the same format and conventions as those produced by Activity Rates and Objectives saves, so all three can be reviewed and applied uniformly.
-- Ensure that editing tiers, activity rates, and objectives in the same session and saving each produces independently coherent scripts — no cross-tab state leakage.
-
-### Notes
-See [[IMPROVEMENT-010]] — the Scoring Balancing tab depends on tiers being editable inline; consistent save mechanics here unblock a clean implementation of that tab.
-Preserve existing tier DB schema — this improvement changes the save UI mechanic only, not the underlying data model.
-
----
-
 ## IMPROVEMENT-010 - Seasons Scoring Balancing Tab
 
 Status: TODO
@@ -328,247 +211,234 @@ Destructive changes (DELETE) should also replace any prior non-destructive chang
 
 ---
 
-## IMPROVEMENT-017 - New Item script filename includes definition name
+## IMPROVEMENT-024 - Server Restart: Daily Objective Announcement and Admin Tool Statistics
 
 Status: DONE
-Priority: LOW
-Area: Admin Tool / New Item Dialog
-Spec: `docs/superpowers/specs/2026-05-18-improvement-017-script-filename-prefixes-design.md`
+Priority: HIGH
+Area: Seasons / Objectives / Admin Tool
 
 ### Description
-When saving a new item in SqlScript mode, the output `.sql` file is named
-`admintool_<date>_<time>.sql`. Include the item's `definitionname` in the
-filename so the file is immediately identifiable without opening it:
+Two related improvements to daily objective visibility:
 
-```
-<definitionname>_<date>_<time>.sql
-```
+1. **Server restart announcement** — on startup, if an active season with daily objectives is configured, announce the current day's active objectives to all players via the existing announcement channel. If the daily pool for the current day has not yet been generated (e.g. first query after midnight on a fresh restart), run the pooling selection logic (see [[IMPROVEMENT-022]]) before announcing, so the announcement reflects the actual set players will see.
 
-Example: `def_plasma_launcher_20260517_084326.sql`
+2. **Admin Tool Season Statistics tab** — surface the current active daily objective set and per-objective completion counts on the Season Statistics tab. For each daily objective active today, display: objective name, activity type, target (if any), and the number of distinct characters who have completed it on the current day.
 
 ### Impact
-Low. In SqlScript mode operators save one item per dialog invocation, so
-name collisions are unlikely regardless. The improvement is purely for
-operator ergonomics — easier to locate a specific item's script in the
-output directory without inspecting file contents.
+Without the announcement, players who log in after a server restart have no immediate indication that daily objectives are available or what they are — they must navigate to the objectives panel themselves. For the Admin Tool, operators currently have no at-a-glance view of how many players are completing each daily objective on a given day, making it impossible to assess engagement or spot broken objectives without raw DB queries.
 
-### Proposed Fix
-In `NewItemDialogViewModel.SaveAsync` (SqlScript branch), replace the
-filename construction:
-
-```csharp
-// current
-var fileName = $"admintool_{DateTime.Now:yyyyMMdd_HHmmss}.sql";
+### Proposed Implementation
 
-// proposed
-var safeName = string.Concat(BasicPanel.DefinitionName
-    .Select(c => char.IsLetterOrDigit(c) || c == '_' ? c : '_'));
-var fileName = $"{safeName}_{DateTime.Now:yyyyMMdd_HHmmss}.sql";
-```
+**Server restart announcement:**
+- Wire into `SeasonService.RefreshCache`, which is already called on startup and whenever the season cache is invalidated.
+- After the cache is refreshed, check whether an active season exists with `is_daily` objectives configured for the current UTC day.
+- If the daily pool for today has not yet been materialised (no rows in `season_objective_progress` for today's `day_window` and active season), trigger the deterministic pool selection from [[IMPROVEMENT-022]] first.
+- Compose an announcement message listing the active daily objective names (and targets where applicable), then dispatch it via the existing Seasons Info channel / Announcer character — reuse the announcement path used for season start/end notifications.
+- If no active season or no daily objectives are configured, skip silently — no error or empty announcement.
 
-The sanitisation step replaces any character that is not a letter, digit,
-or underscore with `_` to ensure the name is valid on all filesystems.
-Since definition names are validated to start with `def_` and contain only
-safe characters, the sanitisation is a defensive no-op in practice.
+**Admin Tool Season Statistics tab:**
+- Add a "Today's Daily Objectives" section to the Season Statistics tab (or a new sub-panel within it).
+- Query: for the selected season and current UTC `day_window`, return the active daily objective IDs (applying pool selection if `daily_objectives_per_day` is set), joined with `season_objective_progress` to count distinct `character_id` values where `completed = 1` per objective.
+- Display as a grid: Objective Name | Activity Type | Target | Completions Today.
+- Refresh on demand (button or tab activation) — no live polling required.
+- The query must respect the same deterministic pool selection as the server side so the displayed objectives match what players actually see.
 
 ### Notes
-`BasicPanel.DefinitionName` is available on `NewItemDialogViewModel` via
-the existing `BasicPanel` property; no new fields are needed.
-`NewItemDialogViewModel.SaveAsync` is the only call site (line ~185 of
-`NewItemDialogViewModel.cs`).
-The `MainViewModel.CommitAsync` SqlScript path uses the same
-`admintool_<date>_<time>.sql` template for multi-change commits — that
-path is out of scope since it covers multiple changes, not a single item.
+Depends on [[IMPROVEMENT-006]] — daily objective infrastructure (schema, progress tracking) must be in place.
+Depends on [[IMPROVEMENT-022]] — pool selection logic must be extractable/reusable by both the announcement path and the Admin Tool query.
+The announcement fires from `SeasonService.RefreshCache` — guard against duplicate announcements if `RefreshCache` is called multiple times within the same day (e.g. track the last announced `day_window` in memory and skip if it matches).
+If no season is active at restart time but one activates later (e.g. scheduled start), the announcement is not retroactively sent — it only fires at server startup.
+Admin Tool completion count reflects the running day only; historical per-day stats are out of scope for this improvement.
 
 ---
 
-## IMPROVEMENT-018 - Season Config: Activity Points Scoring Mode
+## IMPROVEMENT-025 - Equipment Set Synergy Bonuses
 
 Status: DONE
-Priority: HIGH
-Area: Seasons / Admin Tool
+Priority: MEDIUM
+Area: Combat / Items / Modules
 
 ### Description
-When configuring a season, there is currently no way to control how earned activity points are applied to scoring. Add a configurable **scoring mode** option with two values:
-
-- **Objectives only** — activity points are added to matching objective progress but do not contribute to the global season score.
-- **Objectives + Global Score** — activity points are added to objective progress and also accumulate in the global season score (current behaviour).
+Introduce an equipment set mechanic: modules belonging to the same named set grant the equipping character additional stat bonuses that scale proportionally with the number of set pieces currently fitted. The more set pieces equipped, the stronger the cumulative synergy bonus.
 
 ### Impact
-Operators need per-season control over how competitive the global score is. Some seasons are designed around objective completion only; others use global score as a leaderboard or reward gate. Without this option, the game logic must be patched per-season or objectives must be artificially balanced to avoid unwanted global score inflation.
+Adds a meaningful progression layer on top of individual module selection, encouraging themed loadouts and giving players a tangible reward for committing to a set. Increases build diversity and long-term equipment goals without requiring new combat systems.
 
 ### Proposed Implementation
-- Add a `scoringMode` (or equivalent) field to the season configuration schema (DB column + server-side model).
-- Update the activity point processing logic to branch on this field: skip global score accumulation when mode is `ObjectivesOnly`.
-- Expose the option in the Admin Tool season configuration UI as a dropdown or radio selector.
-- Default new seasons to `ObjectivesAndGlobalScore` to preserve current behaviour.
+
+**Data layer:**
+- Add a `set_id` (or `set_name`) column to `entitydefaults` (or a new `equipment_sets` table) to group modules into named sets.
+- Add a `equipment_set_bonuses` table: `(set_id, required_pieces, aggregate_field, bonus_value)` — each row defines a bonus unlocked at a specific piece count threshold. Alternatively, use a linear scaling formula stored per set (e.g. `bonus_per_piece`) to avoid per-threshold rows.
+
+**Server runtime:**
+- On robot fitting change (equip/unequip), scan all fitted modules for `set_id` values, count pieces per set, then evaluate the bonus table for each set.
+- Apply resulting bonuses as robot aggregate modifiers using the existing `RobotExtensions`/aggregate field pipeline — no new combat math required.
+- Bonuses must be recalculated whenever the robot's fitting changes (equip, unequip, robot swap).
+- Ensure bonuses are stripped correctly when modules are removed mid-combat or robot is unfit.
+
+**Content:**
+- Define at least one pilot set to validate the pipeline end-to-end.
+- Follow naming convention from `docs/content/claude_game_content_guide.md` (`set_` prefix suggested).
+
+**Client / UI:**
+- Module tooltip should indicate set membership and current active bonus count.
+- Requires client-side data delivery for set metadata (set name, total pieces, bonuses per threshold) — evaluate whether existing tooltip aggregate extension protocol is sufficient or if a new packet field is needed.
 
 ### Notes
-Audit the activity point award path in the Seasons subsystem to identify all places where global score is incremented — the mode check belongs there.
-Ensure the Admin Tool change script generation covers the new field.
+Bonus recalculation must not run inside the zone update hot path synchronously — trigger on fitting events only.
+Stacking rules (e.g. can a player equip two copies of the same set piece?) should be defined before implementation.
+Consider whether set bonuses interact with existing robot extension bonuses additively or via a separate modifier layer.
 
 ---
 
-## IMPROVEMENT-019 - New Robot Dialog: Bonuses Tab
+## IMPROVEMENT-026 - Wear & Tear Mechanic
 
-Status: DONE
-Priority: HIGH
-Area: Admin Tool / New Robot Dialog
-Spec: `docs/superpowers/specs/2026-05-19-improvement-019-robot-bonuses-tab-design.md`
+Status: TODO
+Priority: LOW
+Area: Items / Modules / Economy
 
 ### Description
-Add a **Bonuses** tab to the New Robot dialog (`NewRobotDialog.xaml`) for configuring chassis bonuses (`chassisbonus` table rows). The tab follows the same pattern as the Stats tab: empty by default for new robots, pre-filled from the cloned chassis definition when cloning, and editable (add / remove / modify rows). All bonus rows are emitted in the same single SQL script produced by `RobotSqlBuilder.Build`.
+Equipped and actively-used items gradually lose condition (health or a dedicated durability stat), reducing their efficiency proportionally. Items that reach critical condition become degraded; items left unrepaired eventually break or are destroyed. Periodic repair via an NPC service or player skill restores condition.
 
-Each bonus row maps to one `chassisbonus` row:
+### Impact
+Adds an ongoing maintenance loop that drives NPC interaction, credit sinks, and crafting demand. Encourages players to manage loadouts actively and creates meaningful consequences for extended combat or negligence. Increases economic depth by making repair services and spare parts relevant.
 
-| UI field | DB column | Type |
-|---|---|---|
-| Extension (dropdown) | `extension` | int → `extensions.extensionid` |
-| Bonus value | `bonus` | float |
-| Target property (dropdown) | `targetpropertyID` | int → `aggregatefields.id` |
-| Effect enhancer (checkbox) | `effectenhancer` | bit |
-| Note (optional text) | `note` | nvarchar(2000) |
+### Proposed Implementation
 
-Chassis bonuses are stored against the **chassis part definition** (`@chassisDef`), not the top-level robot definition — the tab sits at robot level in the UI but the generated SQL targets `@chassisDef`.
+**Data layer:**
+- Add a `condition` (or `durability`) field to the item instance table (e.g. `items` or equivalent), defaulting to max value on spawn.
+- Add per-definition `max_durability` and `durability_loss_rate` columns to `entitydefaults` (or a separate `item_wear_config` table).
+- Add a `broken` flag or a `condition = 0` sentinel to represent destroyed/non-functional state.
 
-### Impact
-Without this tab, operators must write `chassisbonus` INSERT statements manually or copy them from existing robots. This is error-prone, not auditable through the Admin Tool workflow, and inconsistent with how stats are handled. Adding the tab completes the robot creation surface for the most robot-defining table.
+**Server runtime:**
+- Hook into the existing damage/combat pipeline and module activation events to decrement condition by the configured rate on each relevant tick or activation.
+- Apply an efficiency scalar to module aggregate contributions proportional to remaining condition (e.g. 50% condition → some % stat penalty). Define the penalty curve (linear vs stepped) before implementation.
+- Broadcast condition changes to the client so the UI can reflect degradation.
+- At condition = 0, disable the module (treat as unfit or non-functional) without destroying the item unless the design calls for permanent destruction.
 
-### Proposed Implementation
+**Repair:**
+- Add a repair interaction with NPC repairers (cost scales with item tier and missing condition).
+- Optionally support player-side repair via a skill or consumable.
+- Repair must respect zone safety — no blocking DB writes in the zone update loop.
 
-**New files (follow `NewItem/` patterns):**
-- `NewRobot/NewBonusRow.cs` — `ObservableObject` with `ExtensionId` (int), `NewBonus` (double), `OriginalBonus` (double?), `TargetPropertyId` (int), `EffectEnhancer` (bool), `Note` (string)
-- `NewRobot/BonusesPanelViewModel.cs` — owns `ObservableCollection<NewBonusRow> Rows`; `Initialize(lookups)` receiving available extensions and aggregate fields; `AddRow` / `RemoveRow` relay commands; `LoadFromClone(IEnumerable<ChassisBonusRow>)` pre-filling rows with `OriginalBonus` set; `HasDuplicates()` guard (unique on extension + targetPropertyId)
-
-**Existing file changes:**
-- `NewRobot/NewRobotRepository.cs` — add `LoadChassisBonusesAsync(int chassisDefinition)` returning `IReadOnlyList<ChassisBonusRow>` (record: extensionId, bonus, targetPropertyId, effectEnhancer, note)
-- `NewRobot/CloneRobotExtendedData.cs` (new if needed, or extend `CloneExtendedData`) — include `IReadOnlyList<ChassisBonusRow> ChassisBonuses`
-- `ViewModels/NewRobotDialogViewModel.cs`:
-  - Add `BonusesPanelViewModel BonusesPanel` property
-  - `InitializeAsync`: call `BonusesPanel.Initialize(lookups)` with both `Extensions` and `AggregateFields`
-  - `LoadCloneAsync`: load chassis bonuses for the cloned robot's chassis definition and call `BonusesPanel.LoadFromClone(...)`
-  - `Validate`: add duplicate check on bonus panel
-- `NewRobot/RobotSqlBuilder.cs` — after part entities are declared, emit chassis bonus INSERTs targeting `@chassisDef`:
-  ```sql
-  INSERT INTO chassisbonus (definition, extension, bonus, targetpropertyID, effectenhancer, note)
-  VALUES (@chassisDef, {row.ExtensionId}, {row.NewBonus}, {row.TargetPropertyId}, {row.EffectEnhancer}, {row.Note});
-  ```
-- `Views/NewRobotDialog.xaml` — add the Bonuses `TabItem` (visible when `IsRobot`) with a DataGrid bound to `BonusesPanel.Rows`
-
-**Translation / display names:**
-- Extension dropdown items: look up `extensionname` in the `englishNames` dictionary (same dict passed to `InitializeAsync`); fall back to the raw `extensionname` if absent.
-- Target property dropdown: use `AggregateFieldInfo.DisplayLabel` (already includes the raw DB name and id).
-
-**Clone data source:**
-The robot clone source (`CloneSource`) refers to the robot entity. To load chassis bonuses for a cloned robot, resolve its chassis definition by looking up the source robot entity's options string for the `chassis` key (GenXY format: `#chassis=nXXXX`), then query `chassisbonus WHERE definition = @resolvedChassisDef`. This avoids a schema join and reuses the already-available options field on `EntityDefaultRow`.
+**Client / UI:**
+- Module tooltip and fitting screen should display current condition / max condition.
+- Add a visual indicator (colour, icon overlay) when condition falls below a warning threshold.
+- Requires client protocol additions for condition field delivery; assess whether existing item attribute packet can carry this or a new field is needed.
 
 ### Notes
-- The unique constraint on `chassisbonus (definition, extension, targetpropertyID)` must be enforced in `HasDuplicates()` — duplicate (extensionId + targetPropertyId) pair in the same save should be rejected with a clear validation message.
-- `OriginalBonus` (read-only reference value) is shown in the row when cloning, same pattern as `NewStatRow.OriginalValue`.
-- Chassis bonus rows are only meaningful when `IsRobot` is true — the Bonuses tab should be hidden when `IsRobot` is false (consistent with head/chassis/leg/inventory tabs).
-- The `note` column is nullable; treat empty string as `NULL` in the generated SQL.
-- `effectenhancer` default is `0`; new rows should default the checkbox to unchecked.
+Define which item categories wear (active modules only, all fitted items, weapons, etc.) before implementation to scope the data changes.
+Determine whether condition persists on trade/storage or resets — this has significant economy implications.
+Avoid running condition decay calculations in the zone update hot path; prefer event-driven hooks on module activation and combat events.
+Consider interaction with existing repair/maintenance NPC infrastructure if any exists.
 
 ---
 
-## IMPROVEMENT-020 - AdminTool Installer
+## IMPROVEMENT-027 - Equipment Set Bonus Values in Effect Display
 
 Status: DONE
-Priority: MEDIUM
-Area: Admin Tool / Distribution
-Spec: `docs/superpowers/specs/2026-05-19-improvement-020-admintool-installer-design.md`
+Priority: HIGH
+Area: Combat / Items / UI
 
-### Description
-Create an installer for the AdminTool application that handles required runtime dependencies and supports future updates. The installer should allow operators to set up and update the AdminTool without manually managing prerequisites.
+### Problem
+
+The set bonus effect applied by `SetBonusEffectApplicator` uses `.EnableModifiers(false)`, so no property modifier values are embedded in the effect. The client receives the `effect_equipment_set_bonus` effect token and can show an icon, but has no bonus amounts to display — the player cannot see what they actually gained.
 
 ### Impact
-Without an installer, operators must manually install .NET runtime dependencies and track future releases themselves. This creates friction for new deployments, increases support burden, and makes it easy to run an outdated or broken AdminTool version.
 
-### Proposed Implementation
-- Choose an installer technology appropriate for a Windows WPF/.NET 8 app (e.g. NSIS, WiX Toolset, Inno Setup, or a self-contained MSIX package).
-- Bundle or detect the required .NET 8 runtime; prompt installation if absent.
-- Include all AdminTool binaries and assets produced by the Release build.
-- Provide an uninstaller that cleanly removes all installed files.
-- Support in-place updates: either via a versioned installer (run new installer over old install) or an integrated update check mechanism that notifies the operator when a newer release is available.
-- Wire installer creation into the CI pipeline (`.github/workflows/dotnet.yml`) so a fresh installer artifact is produced on each tagged release.
+Players equipping set pieces receive silent bonuses with no in-UI feedback. This makes the mechanic invisible and undermines the design intent of rewarding themed loadouts.
 
-### Notes
-Self-contained publish (`dotnet publish --self-contained`) is an alternative to bundling the runtime installer — evaluate size vs. convenience trade-off.
-If an auto-update mechanism is included, it should be opt-in and not silently replace binaries while the tool is running.
-Installer output should be a single executable or package that operators can distribute without additional steps.
+### Proposed Fix
 
----
+Embed the actual `ItemPropertyModifier` values into each set's effect using the same `.WithPropertyModifiers()` builder pattern already used by `RemoteCommandTranslatorModule.SetupEffect()`.
 
-## IMPROVEMENT-021 - Graphify Codebase Graph Integration
+**Required changes:**
 
-Status: DONE
-Priority: HIGH
-Area: Infrastructure / Tooling / AI
-Spec: docs/superpowers/specs/2026-05-23-improvement-021-graphify-integration-design.md
+1. **`EquipmentSetBonusResult`** — replace the flat `IReadOnlyList<ItemPropertyModifier> Modifiers` with `IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>> ModifiersPerSet` keyed by set ID. Retain `ActiveSetIds` or derive it from the dictionary keys.
 
-### Description
-Integrated `graphify-dotnet` (https://github.com/elbruno/graphify-dotnet) as a local dotnet
-tool. Generates a structural JSON graph and Markdown architecture report before every
-`Perpetuum.Server` build. CI publishes the report to the GitHub Wiki on each push to `develop`.
-
-### Implementation
-- `.config/dotnet-tools.json` registers `graphify-dotnet@0.7.0` (command: `graphify`)
-- `Directory.Build.targets` (solution root) fires `GenerateCodeGraph` before `Perpetuum.Server`
-  builds; `ContinueOnError="true"` soft-fails on machines without .NET 10 SDK
-- `-f json,report` produces `docs/graph/graph.json` and `docs/graph/GRAPH_REPORT.md` (gitignored)
-- `.github/workflows/dotnet.yml` `publish-wiki` job pushes `GRAPH_REPORT.md` to GitHub Wiki as
-  `Codebase-Graph.md` on each push to `develop`
-- `.claude/knowledge/codebase-graph.md` added for Claude orientation
+2. **`EquipmentSetBonusCalculator.Compute()`** — the per-set grouping loop already exists; retain modifiers per set ID instead of collecting them into a flat list.
+
+3. **`SetBonusEffectApplicator.Update()`** — accept the full `EquipmentSetBonusResult` (or the `ModifiersPerSet` dictionary). When creating a new set effect, call `.EnableModifiers(true)` and chain `.WithPropertyModifiers(modifiersForThisSet)`. Effect removal logic is unchanged.
+
+4. **`Robot.OnUpdate()`** — pass the per-set modifier data when calling `_setBonusEffectApplicator.Update()`. `_setBonusModifiers` field may be removed if no other consumer needs the flat list.
+
+**Reuse note:** The `ModuleProperty` class hierarchy from `RemoteCommandTranslatorModule` is not applicable here — set bonus values are static DB-sourced thresholds, not dynamically computed from ammo. The reusable element is solely the `EffectBuilder.WithPropertyModifiers()` call pattern.
+
+### Performance Notes
+
+`SetBonusEffectApplicator.Update()` is called every `OnUpdate()` tick but creates or removes effects only when the active set composition changes (set-difference check). Modifiers are passed only at effect-creation time, not on every tick. `EquipmentSetBonusCalculator.Compute()` already runs on fitting events only, not in the hot path. The per-set grouping change inside `Compute()` is a trivial restructure with no hot-path impact. No performance concern.
 
 ### Notes
-Phase 2 (.NET 8 → .NET 10 project TFM migration) is deferred as an independent workstream.
-The graphify tool requires .NET 10 SDK but the project TFMs remain at net8.0.
-Run `dotnet tool restore` once after cloning to enable graph regeneration.
-GitHub Wiki must have at least one page initialized before the CI publish job can push.
+
+Verify that the client-side effect display pipeline for `effect_equipment_set_bonus` actually reads and renders `PropertyModifiers` from the effect packet — confirm before declaring the work complete.
 
 ---
 
-## IMPROVEMENT-023 - Seasons: Same-IP Gate for NIC Earning/Spending Activities
+## IMPROVEMENT-028 - AdminTool Equipment Set Management
 
 Status: DONE
-Priority: HIGH
-Area: Seasons / Anti-Abuse
-Spec: `docs/superpowers/specs/2026-05-21-improvement-023-same-ip-gate-design.md`
+Priority: MEDIUM
+Area: Admin Tool / Items / Modules
 
 ### Description
-Enforce a same-IP gate on season activity recording so that a player running multiple accounts from the same machine cannot earn season points by trading with themselves. When two characters involved in a tracked NIC activity share the same originating IP address, neither transaction side earns points.
 
-### Implementation
-`ActivityEvent` extended with optional `CounterpartyAccountId`. `SeasonService.RecordActivity` queries `accountonlinetime` for the most recent session IP of both characters and suppresses recording when they match. Market NIC recording moved from `CharacterWallet` to explicit call sites in `Market.cs` where both counterparties are available. All 7 transport assignment `RecordActivity` calls updated with counterparty account IDs. PvpKill IP query fixed to use `TOP 1 ORDER BY loggedin DESC` with null guard. Branch: `p36.1`.
+Extend the AdminTool with a dedicated UI for managing equipment sets (introduced in IMPROVEMENT-025) and the synergy bonuses they provide. Operators currently have no in-tool way to create sets, assign modules to sets, or configure per-threshold bonuses — all changes require direct DB edits.
+
+### Impact
+
+Without tooling, managing equipment sets is error-prone and requires database access. A purpose-built AdminTool panel lowers the barrier for content creators, reduces the risk of inconsistent data, and makes set configuration auditable from within the admin interface.
+
+### Proposed Implementation
+
+**Equipment Sets panel:**
+- List all defined sets (from `equipment_sets` table) with name and ID.
+- Create / rename / delete sets.
+- View which module definitions are assigned to each set.
+
+**Module assignment:**
+- In the existing module/item definition editor, expose a "Set" dropdown (nullable) that lets operators assign or clear the module's set membership (`set_id` on `entitydefaults` or equivalent column).
+
+**Bonus threshold editor:**
+- For each set, display the bonus rows from `equipment_set_bonuses` (`required_pieces`, `aggregate_field`, `bonus_value`).
+- Allow adding, editing, and removing bonus threshold rows.
+- Validate that `required_pieces` values are positive integers and that `aggregate_field` references a known aggregate field ID.
+
+**Read path:**
+- Surface current set assignments and bonus rows without requiring a server restart — query live DB state.
 
 ### Notes
-Approach used: `CounterpartyAccountId` on `ActivityEvent`, gate centralised in `RecordActivity`. Vendor market fills (no player counterparty) record without gate. `buyOrderPayBack` and `CashInOnSubmit` (no counterparty) left ungated. NAT false-positive limitation documented in spec.
+
+Follow existing AdminTool patterns for CRUD panels (look at NPC or loot table editors as reference).
+Consider read-only vs. edit permissions if the AdminTool has role-based access controls.
+Deleting a set should warn if modules are still assigned to it.
 
 ---
 
-## IMPROVEMENT-022 - Seasons: Randomised Daily Objective Pool
+## IMPROVEMENT-029 - Pin Daily Activity Announcements in Discord
 
-Status: DONE
+Status: TODO
 Priority: HIGH
-Area: Seasons / Objectives
+Area: Seasons / Announcements / Discord Integration
 
-### Description
-Add a season-level option to limit how many daily objectives are active per day, selected randomly from the full set of configured daily objectives. Instead of all `is_daily` objectives being visible every day, each day only a configured number are drawn from the pool, providing variety across the season without requiring manual scheduling.
+### Problem
+
+Daily activity announcements are sent to players but quickly get buried by subsequent in-game chat messages. The in-game channel topic is not a viable alternative due to its character limit. Relying on players scrolling back to find the announcement is not sustainable.
 
 ### Impact
-With no pooling, players see the same set of daily objectives every day for the entire season, which becomes repetitive. A randomised daily pool reduces monotony, extends perceived content variety, and encourages players to engage with different activity types on different days. Season designers gain control over daily objective density without needing to manually cycle objectives.
 
-### Proposed Implementation
-- Add a `daily_objectives_per_day` field (smallint, nullable) to the season configuration — `NULL` means all configured daily objectives are active every day (current behaviour, no breaking change).
-- When a player queries their daily objectives for the current day, the server checks whether `daily_objectives_per_day` is set:
-  - If `NULL`: return all `is_daily` objectives as today.
-  - If set: deterministically sample `N` objectives from the full `is_daily` pool for the current UTC day, using a seed derived from `(season_id, day_window)` so all players see the same set on the same day.
-- Deterministic seed ensures consistency: all players on the same day get the same pool regardless of query order or server restarts.
-- Store the day's selected objective IDs (or derive them on-the-fly from the seed) — avoid per-player randomisation, which would create unfair daily experiences.
-- Admin Tool: surface `daily_objectives_per_day` in the season configuration panel as a nullable integer field (empty = all objectives).
+Players miss the current day's active objectives because the announcement disappears from view. Objective visibility is critical for engagement — if players cannot easily see what objectives are active, participation drops.
+
+### Proposed Fix
+
+When a daily activity announcement is dispatched to the integrated Discord channel, automatically pin the message so it remains visible regardless of subsequent chat volume.
+
+- After sending the announcement message to Discord, retrieve the message ID from the Discord API response.
+- Call the Discord "Pin Message" endpoint for the channel to pin the message.
+- Before pinning the new announcement, unpin the previous day's announcement (if any) to avoid the pin list growing indefinitely — store the last pinned message ID (in memory or a small config/DB record) so it can be unpinned on the next announcement cycle.
+- If the unpin or pin call fails (e.g. bot lacks Manage Messages permission), log a warning but do not block the announcement itself.
 
 ### Notes
-Depends on [[IMPROVEMENT-006]] — daily objectives infrastructure must exist before pool selection can be layered on.
-Deterministic selection is strongly preferred over per-player random to keep the daily experience consistent across all characters in a season.
-If `daily_objectives_per_day` exceeds the total number of configured daily objectives, treat it as "all objectives" rather than erroring.
-The sampling algorithm (e.g. Fisher-Yates seeded shuffle, take first N) should be documented and stable — changing it mid-season would invalidate an active day's pool for players who have not yet completed their objectives.
+
+Requires the Discord bot/webhook integration to have the `Manage Messages` permission in the target channel.
+If the current integration uses an incoming webhook rather than a bot token, pinning is not possible via webhooks — a bot token with the `Manage Messages` permission will be required. Assess the current integration type before implementing.
+The last pinned message ID can be stored in memory across restarts only if a restart always re-announces; otherwise persist it (a single-row config table or a flat file entry is sufficient).
diff --git a/docs/backlog/issues.md b/docs/backlog/issues.md
index d9be5f9..ff8ce06 100644
--- a/docs/backlog/issues.md
+++ b/docs/backlog/issues.md
@@ -1,125 +1,59 @@
 # Last ID used
 
-019
+021
 
-## ISSUE-019 - CI build fails for AdminToolInstaller: NETSDK1047 missing RID target in assets file
+## ISSUE-021 - NPC fleeing state speed reduction insufficient or not applied
 
 Status: DONE
 Priority: HIGH
-Area: Build / CI
+Area: NPC AI / Combat
 
 ### Problem
-The CI pipeline step `dotnet build src/Perpetuum.AdminToolInstaller/Perpetuum.AdminToolInstaller.wixproj --no-restore --configuration Release -p:Platform=x64` fails with:
-
-```
-NETSDK1047: Assets file '...Perpetuum.AdminTool\obj\project.assets.json' doesn't have a target for 'net8.0-windows/win-x64'.
-Ensure that restore has run and that you have included 'net8.0-windows' in the TargetFrameworks for your project.
-You may also need to include 'win-x64' in your project's RuntimeIdentifiers.
-```
+Players report that NPCs in a fleeing state still move too fast. The expected maximum speed while fleeing is 75% of normal, but the reduction may be set too high or may not apply at all. Target value is 50% of normal max speed.
 
 ### Impact
-The AdminTool installer cannot be built in CI, blocking release packaging of the AdminTool.
-
-### Root Cause
-The build step uses `--no-restore`, so NuGet restore never runs for the `Perpetuum.AdminTool` dependency. The assets file in `obj/` is either absent or was produced by a prior restore without the `win-x64` RID, so the SDK cannot resolve the `net8.0-windows/win-x64` target.
+NPCs can outrun or evade players while fleeing more effectively than intended, undermining combat balance and player experience.
 
 ### Proposed Fix
-One or more of:
-1. Add a `dotnet restore` step for `Perpetuum.AdminToolInstaller.wixproj` (or the full solution) before the `--no-restore` build, with `-p:RuntimeIdentifier=win-x64`.
-2. Ensure `Perpetuum.AdminTool.csproj` declares `<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>` so restore always produces the required RID target.
-3. Alternatively, drop `--no-restore` from the AdminToolInstaller build step and rely on the SDK to restore inline.
-
-### Notes
-The error path is `D:\a\...` (GitHub Actions runner). The fix must be applied to `.github/workflows/dotnet.yml` and/or the `.csproj`.
-
----
-
-## ISSUE-018 - SeasonRepository.GetActiveSeason throws InvalidCastException on daily_objectives_per_day
-
-Status: DONE
-Priority: CRITICAL
-Area: Seasons / Server
-
-### Problem
-The server crashed on every `SeasonService.Update` tick with `System.InvalidCastException: Unable to cast object of type 'System.Int16' to type 'System.Nullable\`1[System.Int32]'` when an active season existed.
-
-### Root Cause
-`daily_objectives_per_day` is `smallint [null]` in the DB — SQL Server returns a boxed `System.Int16`. `DataRecordExtensions.GetValue<T>` does a direct unbox cast `(T)record.GetValue(index)`. The CLR cannot unbox an `Int16` as `Nullable<Int32>` — the unbox target must match the stored type exactly. The crash occurred in all three season-loading methods: `GetActiveSeason`, `GetSeasonById`, and `GetPendingRecurringSeason`.
-
-The AdminTool's `SeasonRepository` already handled this correctly with explicit `reader.GetInt16(11)` → `(int)` widening.
-
-### Fix
-Changed all three `record.GetValue<int?>("daily_objectives_per_day")` calls to `(int?)record.GetValue<short?>("daily_objectives_per_day")`. This reads the value with the correct CLR type (`Int16`) and widens to `int?` at the call site. `Season.DailyObjectivesPerDay` stays `int?` — no downstream changes required.
+- Locate where the fleeing state applies a speed modifier to NPCs.
+- Verify the modifier is actually applied during fleeing (not silently skipped).
+- Change the maximum speed cap for the fleeing state from 75% to 50%.
+- Add a code-level assertion or log that confirms the modifier is applied when an NPC enters the fleeing state.
 
 ### Notes
-`recurrence_gap_days` is `int [null]` — `GetValue<int?>` is correct there and is not affected.
-`GetValue<T>` has no numeric widening; other smallint/tinyint columns read as `int?` will hit the same issue if introduced.
-
----
-
-## ISSUE-017 - Seasons Objectives tab: Activity type selector does not show all active activity types
-
-Status: DONE
-Priority: CRITICAL
-Area: Seasons / Admin Tool
-
-### Problem
-On the Admin Tool Seasons Objectives tab, the Activity type selector (dropdown/picker) did not display all active activity types. The Phase 1 (non-combat) and Phase 2 (combat) types added to `SeasonActivityType` were never added to the UI option lists.
-
-### Root Cause
-`SeasonDetailViewModel.ActivityTypeOptions` and `SeasonWizardViewModel.ObjectiveActivityTypeOptions` were both hardcoded lists of 9 types. `SeasonActivityType` has 21 values — 12 were absent from both lists: `Prototyping`, `ReverseEngineering`, `Production`, `ArtifactFound`, `EpEarned`, `DamageDone`, `DamageReceived`, `ArmorRestored`, `EnergyDrainDealt`, `EnergyDrainReceived`, `EnergyTransferDealt`, `EnergyTransferReceived`.
-
-### Fix
-Added all 12 missing types to `ActivityTypeOptions` in `SeasonDetailViewModel.cs` and `ObjectiveActivityTypeOptions` in `SeasonWizardViewModel.cs`. Labels match `SeasonActivityRateRow.ActivityTypeLabel`.
+Validate by tracing the NPC state machine: confirm the fleeing state handler sets the speed modifier and that the modifier reaches the movement/speed calculation layer.
+Check whether other states (e.g. roaming, chasing) use a similar modifier pattern and could be used as a reference.
 
 ---
 
-## ISSUE-016 - Saving Daily Objectives Per Day in AdminTool causes varchar to datetime cast error
+## ISSUE-020 - NIC Spend activity not tracked for market purchases
 
 Status: DONE
 Priority: CRITICAL
-Area: Seasons / Admin Tool
+Area: Seasons / Activities
 
 ### Problem
-In the AdminTool Seasons view, saving the Daily Objectives Per Day field produces a SQL cast error: implicit or explicit conversion from varchar to datetime fails. The save operation aborts and the value is not persisted.
+The `NIC spend` daily objective does not credit points when a player buys an item on the market. A player bought an item costing over 1,000,000 NIC (activity rate: 1 pt per 10,000 NIC), the objective was active, buyer and seller had different IPs, but no completion announcement was made and no points were awarded.
 
 ### Impact
-Operators cannot configure Daily Objectives Per Day at all — the field is effectively broken. Any season that requires this setting cannot be properly administered.
-
-### Root Cause
-The `start_time` and `end_time` string literals in `SeasonChanges.BuildInsert` / `BuildUpdate` and `SeasonWizardViewModel.BuildSeasonScript` used the format `'yyyy-MM-dd HH:mm:ss'` (space separator). SQL Server's implicit varchar-to-datetime conversion for this format is locale/DATEFORMAT-sensitive. The ISO 8601 format `'yyyy-MM-ddTHH:mm:ss'` (T separator) is always accepted by SQL Server regardless of collation or DATEFORMAT. The `daily_objectives_per_day` field itself (`SqlLiteral.OfNullableInt`) is correct — it generates a numeric literal or NULL. The error surfaced when users first exercised the Save General path after the new field gave them a reason to use it.
-
-### Fix
-Changed `yyyy-MM-dd HH:mm:ss` → `yyyy-MM-ddTHH:mm:ss` in:
-- `SeasonChanges.cs` `BuildInsert` and `BuildUpdate` (both start_time and end_time)
-- `SeasonWizardViewModel.cs` `BuildSeasonScript`
-
-### Notes
-Field was recently introduced (commits `837d188`, `0e59ae9`, `6d5432c`, `b442883`).
-`daily_objectives_per_day` column type is `smallint [null]` — confirmed correct in schema docs.
-
----
-
-## ISSUE-015 - Seasons Objectives tab: selected target not rendered in table cell
-
-Status: DONE
-Priority: HIGH
-Area: Seasons / Admin Tool
+The `NIC spend` objective is silently broken for market purchases. Players cannot progress through or complete this daily objective, undermining season participation and reward integrity.
 
-### Problem
-On the Admin Tool Seasons Objectives tab, when an objective has a target selected, the chosen value is not displayed in the table cell. The value is stored and visible when the user clicks into the cell (via the picker), but the table column renders as blank.
-
-### Impact
-Operators cannot confirm at a glance which target is assigned to each objective. They must click every cell individually to audit or verify configurations, making bulk review error-prone and slow.
+### Known Facts
+- Objective is configured and active.
+- Rate: 1 point per 10,000 NIC.
+- Purchase amount: >1,000,000 NIC (should yield >100 points).
+- Buyer and seller had different IPs (rules out self-trade suppression as cause).
+- No completion announcement fired, confirming zero points were awarded.
 
 ### Proposed Fix
-- Locate the cell template / data binding for the target column in the Objectives tab DataGrid.
-- Identify why the display path does not render the selected value (likely a missing `DisplayMemberPath`, wrong binding path, or the display value not being propagated back to the row model after picker selection).
-- Ensure the table cell shows the human-readable target label (same value visible in the picker) once a target is selected, without requiring the user to click the cell.
+- Locate where market buy orders are fulfilled and identify where (or whether) the `NIC spend` activity hook is called.
+- Verify the hook call site passes the correct player, amount, and activity type.
+- Check if the activity tracking filters out market transactions (e.g. self-trade guard, zone guard, or missing call entirely).
+- Add the missing hook call or fix the incorrect filtering so NIC spent on market purchases is credited.
 
 ### Notes
-The picker itself works correctly — the issue is purely in how the selected value is reflected back to the table row display.
-Check whether the binding uses a converter or a nested property that is not notifying change on selection commit.
+Cross-reference the `DamageDone` and `NPC kill` activity paths to understand the expected hook pattern.
+Check whether the `NIC spend` hook is also missing for other spend types (crafting, repair, etc.) — this may be a broader gap.
 
 ---
 
@@ -186,58 +120,3 @@ Add a `SaveGeneral` guard in `SeasonDetailViewModel`: if `Season.IsRecurring &&
 ### Notes
 Introduced by IMPROVEMENT-001 (Recurring Seasons). The wizard already validates this (gap must be ≥ 1 day), but the detail view has no equivalent guard.
 See `SeasonDetailViewModel.cs` `SaveGeneral` command for the save entry point.
-
----
-
-## ISSUE-013 - Robot creation does not populate options field with part definitions
-
-Status: DONE
-Priority: HIGH
-Area: Game Content / Robots
-
-### Problem
-When a new robot is added, the `options` field for the robot entity is not populated with its part definitions in `GenXY` format. The options field must contain entries such as:
-
-```
-#head=n3036
-#chassis=n3037
-#leg=n3038
-#inventory=n332
-```
-
-If new robot parts are created as part of the robot creation process, the definitions generated for those parts must be referenced in these options entries.
-
-### Impact
-Robots without correctly populated options are non-functional in-game — the server cannot resolve their component parts, preventing spawning, equipping, or use of the robot.
-
-### Proposed Fix
-- Identify where robot entity creation writes the `options` field (content SQL pipeline or admin tool robot creation flow).
-- Ensure that after part definitions are created (head, chassis, leg, inventory), their resolved definition IDs are written back to the robot's `options` field using the `#head=nXXXX` / `#chassis=nXXXX` / `#leg=nXXXX` / `#inventory=nXXXX` format.
-- If part definitions are generated dynamically, the options population step must run after the part definitions exist and reference their actual IDs.
-
-### Notes
-Part definition IDs must be resolved dynamically — do not hardcode.
-Follows the `GenXY` naming convention where `n` prefix denotes a definition reference by numeric ID.
-
----
-
-## ISSUE-014 - Robot part clone does not copy or expose options field for editing
-
-Status: DONE
-Priority: HIGH
-Area: Game Content / Robots / Admin Tool
-
-### Problem
-When cloning a robot part, the `options` field is not carried over from the source part and is not presented in the editor. The clone workflow leaves the options field empty and provides no way to review or modify it before committing.
-
-### Impact
-Cloned robot parts silently lose their options data, requiring manual correction after the fact. This is error-prone and inconsistent with the rest of the clone workflow.
-
-### Proposed Fix
-- Copy the source part's `options` field into the clone candidate at the point of clone creation.
-- Expose the options field in the clone editor using the same old/new pattern already used on the Basic tab: display the original value as read-only on the left, and provide an editable new value field on the right.
-- Reuse the existing old/new field component — do not introduce a new pattern.
-
-### Notes
-Follow the existing Basic tab old/new UI pattern exactly for consistency.
-The old (source) value must be read-only; only the new value field is editable.
diff --git a/docs/superpowers/plans/2026-05-23-improvement-024.md b/docs/superpowers/plans/2026-05-23-improvement-024.md
new file mode 100644
index 0000000..688fd31
--- /dev/null
+++ b/docs/superpowers/plans/2026-05-23-improvement-024.md
@@ -0,0 +1,444 @@
+# IMPROVEMENT-024 Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Announce today's daily objectives on server cold boot, and surface today's active daily pool with per-objective completion counts in the Admin Tool Statistics tab.
+
+**Architecture:** Sub-feature 1 is a 4-line guard added to `SeasonService.RefreshCache()` that fires the already-existing `AnnounceDailyPool()` exactly once per server start. Sub-feature 2 adds a new `TodaysDailyObjectiveRow` record, a new `LoadTodaysDailyObjectivesAsync` method on the Admin Tool's `SeasonRepository`, a new observable collection on `SeasonStatisticsViewModel`, and a new XAML section in `SeasonDetailView.xaml`. The pool is computed in C# using the same seeded Fisher-Yates algorithm as the server — no new DB tables required.
+
+**Tech Stack:** C# 12, .NET 8, WPF, CommunityToolkit.Mvvm, Microsoft.Data.SqlClient, SQL Server.
+
+**Note on testing:** This project has no automated test suite. Each task ends with a build verification step. Manual end-to-end validation steps are at the end of the plan.
+
+---
+
+## File Map
+
+| Action | File |
+|--------|------|
+| Modify | `src/Perpetuum/Services/Seasons/SeasonService.cs` |
+| Create | `src/Perpetuum.AdminTool/Seasons/TodaysDailyObjectiveRow.cs` |
+| Modify | `src/Perpetuum.AdminTool/Seasons/SeasonRepository.cs` |
+| Modify | `src/Perpetuum.AdminTool/ViewModels/SeasonStatisticsViewModel.cs` |
+| Modify | `src/Perpetuum.AdminTool/Views/SeasonDetailView.xaml` |
+
+---
+
+## Task 1: Server cold-boot announcement guard
+
+**Files:**
+- Modify: `src/Perpetuum/Services/Seasons/SeasonService.cs` (lines 148–156 of `RefreshCache()`)
+
+### Context
+
+`RefreshCache()` already computes the daily pool on cold boot and on season change, but never announces it. The daily rollover in `Update()` does call `AnnounceDailyPool()`, but `Update()` skips the announcement when `_dailyPool.Date` already equals today — which it does immediately after `RefreshCache()` runs on startup.
+
+The fix is a single `isColdBoot` flag captured before the pool is assigned. `_dailyPool` starts as `EmptyDailyPool` (date = `DateOnly.MinValue`). On the 5-minute periodic `RefreshCache`, the date is already set, so the guard is false — no duplicate announcement.
+
+- [ ] **Step 1: Locate the pool computation block in `RefreshCache()`**
+
+Find this block (approximately lines 148–156):
+
+```csharp
+if (!season.DailyObjectivesPerDay.HasValue)
+{
+    _dailyPool = EmptyDailyPool;
+}
+else if (previous?.Id != season.Id || _dailyPool.Date == DateOnly.MinValue)
+{
+    var today = DateOnly.FromDateTime(DateTime.UtcNow);
+    _dailyPool = new DailyPool(SelectDailyPool(season, _activeObjectives, today), today);
+}
+```
+
+- [ ] **Step 2: Replace the `else if` branch with the cold-boot guard**
+
+Replace only the `else if` block (leave the `if (!season.DailyObjectivesPerDay.HasValue)` block untouched):
+
+```csharp
+else if (previous?.Id != season.Id || _dailyPool.Date == DateOnly.MinValue)
+{
+    bool isColdBoot = _dailyPool.Date == DateOnly.MinValue;
+    var today = DateOnly.FromDateTime(DateTime.UtcNow);
+    _dailyPool = new DailyPool(SelectDailyPool(season, _activeObjectives, today), today);
+    if (isColdBoot)
+    {
+        int totalDaily = _activeObjectives.Count(o => o.IsDaily);
+        var poolObjs = _activeObjectives.Where(o => _dailyPool.Ids.Contains(o.Id)).ToList();
+        if (poolObjs.Count > 0)
+            AnnounceDailyPool(poolObjs, totalDaily);
+    }
+}
+```
+
+- [ ] **Step 3: Build the server project to verify no errors**
+
+```
+dotnet build src/Perpetuum/Perpetuum.csproj -c Release -p:Platform=x64
+```
+
+Expected: build succeeds with 0 errors.
+
+- [ ] **Step 4: Commit**
+
+```
+git add src/Perpetuum/Services/Seasons/SeasonService.cs
+git commit -m "feat: announce daily objective pool on server cold boot (IMPROVEMENT-024)"
+```
+
+---
+
+## Task 2: TodaysDailyObjectiveRow record
+
+**Files:**
+- Create: `src/Perpetuum.AdminTool/Seasons/TodaysDailyObjectiveRow.cs`
+
+- [ ] **Step 1: Create the file**
+
+```csharp
+using Perpetuum.Services.Seasons;
+
+namespace Perpetuum.AdminTool.Seasons
+{
+    public record TodaysDailyObjectiveRow(
+        string Name,
+        SeasonActivityType ActivityType,
+        long TargetValue,
+        int CompletionsToday);
+}
+```
+
+- [ ] **Step 2: Build the Admin Tool project to verify no errors**
+
+```
+dotnet build src/Perpetuum.AdminTool/Perpetuum.AdminTool.csproj -c Release -p:Platform=x64
+```
+
+Expected: build succeeds with 0 errors.
+
+- [ ] **Step 3: Commit**
+
+```
+git add src/Perpetuum.AdminTool/Seasons/TodaysDailyObjectiveRow.cs
+git commit -m "feat: add TodaysDailyObjectiveRow record (IMPROVEMENT-024)"
+```
+
+---
+
+## Task 3: SeasonRepository — LoadTodaysDailyObjectivesAsync
+
+**Files:**
+- Modify: `src/Perpetuum.AdminTool/Seasons/SeasonRepository.cs`
+
+### Context
+
+This method:
+1. Loads `daily_objectives_per_day` for the season.
+2. Loads all `is_daily = 1` objectives for the season.
+3. Computes today's pool using the identical seeded Fisher-Yates algorithm as `SeasonService.SelectDailyPool()`:
+   - `seed = seasonId * 397 ^ DateOnly.FromDateTime(DateTime.UtcNow).DayNumber`
+   - Fisher-Yates shuffle, take first `daily_objectives_per_day` entries.
+   - If `daily_objectives_per_day` is null or ≥ total daily count, all daily objectives are in the pool.
+4. Returns early with an empty list if the pool is empty (avoids an invalid `IN ()` SQL clause).
+5. Queries `season_objective_progress` scoped to today's `day_window` for pool IDs only, counting distinct completions.
+
+All three SQL statements share one open `SqlConnection` and run sequentially — each reader is fully disposed before the next command executes.
+
+- [ ] **Step 1: Add the method at the end of `SeasonRepository`, before the closing `}`**
+
+```csharp
+public async Task<List<TodaysDailyObjectiveRow>> LoadTodaysDailyObjectivesAsync(int seasonId)
+{
+    await using var cn = new SqlConnection(_connection.BuildConnectionString());
+    await cn.OpenAsync();
+
+    // 1. Load daily_objectives_per_day for the season
+    int? dailyPerDay;
+    await using (var cmd = cn.CreateCommand())
+    {
+        cmd.CommandText = "SELECT daily_objectives_per_day FROM seasons WHERE id = @seasonId";
+        cmd.Parameters.AddWithValue("@seasonId", seasonId);
+        var raw = await cmd.ExecuteScalarAsync();
+        dailyPerDay = raw == null || raw == DBNull.Value ? (int?)null : Convert.ToInt32(raw);
+    }
+
+    // 2. Load all is_daily objectives ordered by display_order
+    var daily = new List<(int Id, string Name, SeasonActivityType ActivityType, long TargetValue)>();
+    await using (var cmd = cn.CreateCommand())
+    {
+        cmd.CommandText =
+            "SELECT id, name, activity_type, target_value " +
+            "FROM season_objectives " +
+            "WHERE season_id = @seasonId AND is_daily = 1 " +
+            "ORDER BY display_order";
+        cmd.Parameters.AddWithValue("@seasonId", seasonId);
+        await using var reader = await cmd.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+        {
+            daily.Add((
+                reader.GetInt32(0),
+                reader.IsDBNull(1) ? "" : reader.GetString(1),
+                (SeasonActivityType)reader.GetInt32(2),
+                reader.GetInt64(3)
+            ));
+        }
+    }
+
+    if (daily.Count == 0)
+        return [];
+
+    // 3. Compute pool using same seeded Fisher-Yates as SeasonService.SelectDailyPool
+    List<(int Id, string Name, SeasonActivityType ActivityType, long TargetValue)> pool;
+    if (!dailyPerDay.HasValue || dailyPerDay.Value >= daily.Count)
+    {
+        pool = daily;
+    }
+    else
+    {
+        var today = DateOnly.FromDateTime(DateTime.UtcNow);
+        int seed = seasonId * 397 ^ today.DayNumber;
+        var rng = new Random(seed);
+        var shuffled = daily.ToList();
+        for (int i = shuffled.Count - 1; i > 0; i--)
+        {
+            int j = rng.Next(i + 1);
+            (shuffled[i], shuffled[j]) = (shuffled[j], shuffled[i]);
+        }
+        pool = shuffled.Take(dailyPerDay.Value).ToList();
+    }
+
+    if (pool.Count == 0)
+        return [];
+
+    // 4. Query completion counts for pool IDs scoped to today's day_window
+    var ids = pool.Select(o => o.Id).ToList();
+    var idParams = string.Join(",", ids.Select((_, i) => $"@id{i}"));
+    var counts = new Dictionary<int, int>();
+    await using (var cmd = cn.CreateCommand())
+    {
+        cmd.CommandText =
+            $"SELECT o.id, COUNT(DISTINCT p.character_id) AS completions_today " +
+            $"FROM season_objectives o " +
+            $"LEFT JOIN season_objective_progress p " +
+            $"    ON p.objective_id = o.id " +
+            $"   AND p.season_id = @seasonId " +
+            $"   AND p.day_window = CAST(GETUTCDATE() AS date) " +
+            $"   AND p.completed = 1 " +
+            $"WHERE o.season_id = @seasonId AND o.id IN ({idParams}) " +
+            $"GROUP BY o.id";
+        cmd.Parameters.AddWithValue("@seasonId", seasonId);
+        for (int i = 0; i < ids.Count; i++)
+            cmd.Parameters.AddWithValue($"@id{i}", ids[i]);
+        await using var reader = await cmd.ExecuteReaderAsync();
+        while (await reader.ReadAsync())
+            counts[reader.GetInt32(0)] = reader.GetInt32(1);
+    }
+
+    // Restore display_order (shuffle randomised the pool; daily is ordered by display_order)
+    var displayIndex = daily
+        .Select((o, idx) => (o.Id, idx))
+        .ToDictionary(x => x.Id, x => x.idx);
+
+    return pool
+        .OrderBy(o => displayIndex.GetValueOrDefault(o.Id, int.MaxValue))
+        .Select(o => new TodaysDailyObjectiveRow(
+            o.Name,
+            o.ActivityType,
+            o.TargetValue,
+            counts.GetValueOrDefault(o.Id, 0)))
+        .ToList();
+}
+```
+
+- [ ] **Step 2: Build the Admin Tool project to verify no errors**
+
+```
+dotnet build src/Perpetuum.AdminTool/Perpetuum.AdminTool.csproj -c Release -p:Platform=x64
+```
+
+Expected: build succeeds with 0 errors.
+
+- [ ] **Step 3: Commit**
+
+```
+git add src/Perpetuum.AdminTool/Seasons/SeasonRepository.cs
+git commit -m "feat: add LoadTodaysDailyObjectivesAsync to Admin Tool SeasonRepository (IMPROVEMENT-024)"
+```
+
+---
+
+## Task 4: SeasonStatisticsViewModel — wire up the new collection
+
+**Files:**
+- Modify: `src/Perpetuum.AdminTool/ViewModels/SeasonStatisticsViewModel.cs`
+
+### Context
+
+The existing VM uses `[ObservableProperty]` for scalar values and `ObservableCollection<T>` for grids. Follow the same pattern. Add a `HasTodaysDailyObjectives` bool property (backed by `[ObservableProperty]`) so the XAML can bind visibility via the already-present `BooleanToVisibilityConverter`.
+
+- [ ] **Step 1: Add the collection and visibility flag to the class body**
+
+After the existing `public ObservableCollection<ObjectiveCompletionRow> ObjectiveCompletion { get; } = new();` line, add:
+
+```csharp
+public ObservableCollection<TodaysDailyObjectiveRow> TodaysDailyObjectives { get; } = new();
+[ObservableProperty] private bool _hasTodaysDailyObjectives;
+```
+
+- [ ] **Step 2: Add the load call inside `LoadAsync`, after the existing `ObjectiveCompletion` block**
+
+The existing block looks like:
+```csharp
+ObjectiveCompletion.Clear();
+foreach (var r in await _repo.LoadObjectiveCompletionAsync(seasonId)) ObjectiveCompletion.Add(r);
+```
+
+Immediately after it, add:
+```csharp
+TodaysDailyObjectives.Clear();
+foreach (var r in await _repo.LoadTodaysDailyObjectivesAsync(seasonId))
+    TodaysDailyObjectives.Add(r);
+HasTodaysDailyObjectives = TodaysDailyObjectives.Count > 0;
+```
+
+- [ ] **Step 3: Build the Admin Tool project to verify no errors**
+
+```
+dotnet build src/Perpetuum.AdminTool/Perpetuum.AdminTool.csproj -c Release -p:Platform=x64
+```
+
+Expected: build succeeds with 0 errors.
+
+- [ ] **Step 4: Commit**
+
+```
+git add src/Perpetuum.AdminTool/ViewModels/SeasonStatisticsViewModel.cs
+git commit -m "feat: add TodaysDailyObjectives collection to SeasonStatisticsViewModel (IMPROVEMENT-024)"
+```
+
+---
+
+## Task 5: SeasonDetailView.xaml — Today's Daily Objectives section
+
+**Files:**
+- Modify: `src/Perpetuum.AdminTool/Views/SeasonDetailView.xaml`
+
+### Context
+
+The Statistics tab's `<StackPanel>` (inside the `<ScrollViewer>`) currently ends after the "Objective Completion Rates" `<DataGrid>`. Add a new section below it. Use the existing `BoolToVis` converter (already declared in `UserControl.Resources`) and the same `DataGrid` style as the existing grids.
+
+`ActivityType` is a `SeasonActivityType` enum — WPF will call `.ToString()` on it, which produces the enum member name (e.g. `NpcKill`). This is readable enough for an admin tool; no converter needed.
+
+- [ ] **Step 1: Locate the insertion point**
+
+Find the closing `</StackPanel>` that ends the Statistics tab's scroll content — it is the `</StackPanel>` immediately before the `</ScrollViewer>` at approximately line 455 of `SeasonDetailView.xaml`:
+
+```xml
+                            </DataGrid>
+                        </StackPanel>
+                    </ScrollViewer>
+```
+
+- [ ] **Step 2: Insert the new section before the closing `</StackPanel>`**
+
+Replace that closing tag sequence with:
+
+```xml
+                            </DataGrid>
+
+                            <StackPanel Visibility="{Binding HasTodaysDailyObjectives, Converter={StaticResource BoolToVis}}"
+                                        Margin="0,16,0,0">
+                                <TextBlock Text="Today's Daily Objectives" FontSize="13" FontWeight="Bold" Margin="0,0,0,4"/>
+                                <DataGrid ItemsSource="{Binding TodaysDailyObjectives}" AutoGenerateColumns="False"
+                                          IsReadOnly="True" HeadersVisibility="Column" GridLinesVisibility="Horizontal"
+                                          MaxHeight="240">
+                                    <DataGrid.Columns>
+                                        <DataGridTextColumn Header="Objective" Binding="{Binding Name}" Width="*"/>
+                                        <DataGridTextColumn Header="Activity Type" Binding="{Binding ActivityType}" Width="160"/>
+                                        <DataGridTextColumn Header="Target" Binding="{Binding TargetValue}" Width="80"/>
+                                        <DataGridTextColumn Header="Completed Today" Binding="{Binding CompletionsToday}" Width="130"/>
+                                    </DataGrid.Columns>
+                                </DataGrid>
+                            </StackPanel>
+                        </StackPanel>
+                    </ScrollViewer>
+```
+
+- [ ] **Step 3: Build the Admin Tool project to verify no errors**
+
+```
+dotnet build src/Perpetuum.AdminTool/Perpetuum.AdminTool.csproj -c Release -p:Platform=x64
+```
+
+Expected: build succeeds with 0 errors.
+
+- [ ] **Step 4: Commit**
+
+```
+git add src/Perpetuum.AdminTool/Views/SeasonDetailView.xaml
+git commit -m "feat: add Today's Daily Objectives section to Statistics tab (IMPROVEMENT-024)"
+```
+
+---
+
+## Task 6: Full solution build verification
+
+- [ ] **Step 1: Build the full solution**
+
+```
+dotnet build PerpetuumServer2.sln -c Release -p:Platform=x64
+```
+
+Expected: build succeeds with 0 errors across all projects.
+
+- [ ] **Step 2: Commit (if any fixup changes were needed)**
+
+```
+git add -p
+git commit -m "fix: IMPROVEMENT-024 build fixups"
+```
+
+Skip this step if no changes were needed.
+
+---
+
+## Manual Validation
+
+### Sub-feature 1 — Cold-boot announcement
+
+1. Ensure an active season exists in the DB with at least one `is_daily = 1` objective and `daily_objectives_per_day` set on the `seasons` row.
+2. Start the server cold (`dotnet run -- --GameRoot "..."`).
+3. Log in to the game with a character who is in the `Seasons Info` channel.
+4. **Verify:** An announcement appears in `Seasons Info` listing today's active daily objectives.
+5. Wait 5+ minutes for the periodic `RefreshCache` to fire (watch server logs if available).
+6. **Verify:** No second announcement appears for the same day's pool.
+7. Restart the server the following UTC day.
+8. **Verify:** The announcement reflects the new day's pool (different seed → potentially different objectives).
+9. Start the server with no active season.
+10. **Verify:** No announcement fires, no error in logs.
+
+### Sub-feature 2 — Admin Tool Statistics tab
+
+1. Open the Admin Tool and connect to the same DB.
+2. Navigate to the season configured above → Statistics tab → click **Refresh**.
+3. **Verify:** A "Today's Daily Objectives" section appears below "Objective Completion Rates" listing the correct pool size (≤ `daily_objectives_per_day` objectives).
+4. **Verify:** Objective names, activity types, and targets match what is configured in the DB.
+5. Have a character complete one of today's daily objectives in-game.
+6. Click **Refresh** again.
+7. **Verify:** The "Completed Today" count for that objective increments by 1.
+8. Navigate to a season with no `is_daily` objectives.
+9. **Verify:** The "Today's Daily Objectives" section is absent (not just empty — fully hidden).
+
+### Regression checks
+
+- The existing "Objective Completion Rates" section still shows all objectives with all-time completion counts — verify it is unaffected.
+- The Participation Health, Tier Distribution, and Top 10 sections are unaffected.
+- The daily pool rollover announcement in `Update()` (fires at UTC midnight when the date changes) is unaffected — the `RefreshCache` guard only fires on cold boot.
+
+---
+
+## Backlog update
+
+After validation passes, update `docs/backlog/improvements.md`:
+- Change `IMPROVEMENT-024` status from `TODO` to `DONE`.
+- Move the entry to `docs/backlog/completed.md`.
diff --git a/docs/superpowers/plans/2026-05-23-improvement-025-equipment-set-bonuses.md b/docs/superpowers/plans/2026-05-23-improvement-025-equipment-set-bonuses.md
new file mode 100644
index 0000000..dc52395
--- /dev/null
+++ b/docs/superpowers/plans/2026-05-23-improvement-025-equipment-set-bonuses.md
@@ -0,0 +1,921 @@
+# Equipment Set Synergy Bonuses (IMPROVEMENT-025) Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Introduce equipment set bonuses — modules belonging to the same named set grant threshold-based aggregate stat bonuses, visible in the fitting screen and communicated via a named effect in-zone.
+
+**Architecture:** A startup-cached `EquipmentSetRepository` feeds an `EquipmentSetBonusCalculator` that is called from `Robot.Initialize()`. Results are stored as `_setBonusModifiers` (injected in `GetPropertyModifier()`) and `_activeSetIds` (consumed by `SetBonusEffectApplicator` in `Robot.OnUpdate()`). No client changes required.
+
+**Tech Stack:** C# 12 / .NET 8, SQL Server, Autofac DI, existing `ItemPropertyModifier` / `AggregateField` pipeline, existing `EffectBuilder` / `EffectType` system.
+
+---
+
+## File Map
+
+**Create:**
+- `docs/Patches/p36.2/Features/EquipmentSets/migration.sql`
+- `docs/Patches/p36.2/Features/EquipmentSets/set_striker_pilot.sql`
+- `src/Perpetuum/Robots/EquipmentSets/SetBonusThreshold.cs`
+- `src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusResult.cs`
+- `src/Perpetuum/Robots/EquipmentSets/IEquipmentSetRepository.cs`
+- `src/Perpetuum/Robots/EquipmentSets/EquipmentSetRepository.cs`
+- `src/Perpetuum/Robots/EquipmentSets/IEquipmentSetBonusCalculator.cs`
+- `src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusCalculator.cs`
+- `src/Perpetuum/Robots/EquipmentSets/SetBonusEffectApplicator.cs`
+
+**Modify:**
+- `src/Perpetuum.ExportedTypes/EffectType.cs` — add `effect_equipment_set_bonus = 139`
+- `src/Perpetuum/Robots/Robot.cs` — property injection, `Initialize()`, `_setBonusEffectApplicator` field, `OnUpdate()` wiring
+- `src/Perpetuum/Robots/Robot.Properties.cs` — `GetPropertyModifier()` override
+- `src/Perpetuum.Bootstrapper/Modules/EntitiesModule.cs` — register repository + calculator
+- `src/Perpetuum.Bootstrapper/Modules/EffectsModule.cs` — register `Effect` keyed on `effect_equipment_set_bonus`
+
+---
+
+## Task 1: DB Schema Migration
+
+**Files:**
+- Create: `docs/Patches/p36.2/Features/EquipmentSets/migration.sql`
+
+- [ ] **Step 1: Write the migration SQL**
+
+```sql
+-- Equipment Set Synergy Bonuses Migration (IMPROVEMENT-025)
+-- Run once against the game database before deploying the updated server binary.
+
+CREATE TABLE equipment_sets (
+    set_id  INT          NOT NULL IDENTITY(1,1),
+    name    NVARCHAR(64) NOT NULL,
+    CONSTRAINT PK_equipment_sets PRIMARY KEY (set_id),
+    CONSTRAINT UQ_equipment_sets_name UNIQUE (name)
+);
+
+CREATE TABLE equipment_set_members (
+    set_id      INT NOT NULL,
+    definition  INT NOT NULL,
+    CONSTRAINT PK_equipment_set_members PRIMARY KEY (set_id, definition),
+    CONSTRAINT FK_equipment_set_members_set FOREIGN KEY (set_id)
+        REFERENCES equipment_sets (set_id),
+    CONSTRAINT FK_equipment_set_members_def FOREIGN KEY (definition)
+        REFERENCES entitydefaults (definition)
+);
+
+CREATE TABLE equipment_set_bonus_thresholds (
+    set_id          INT   NOT NULL,
+    required_pieces INT   NOT NULL,
+    aggregate_field INT   NOT NULL,
+    bonus_value     FLOAT NOT NULL,
+    CONSTRAINT PK_equipment_set_bonus_thresholds
+        PRIMARY KEY (set_id, required_pieces, aggregate_field),
+    CONSTRAINT FK_equipment_set_bonus_thresholds_set FOREIGN KEY (set_id)
+        REFERENCES equipment_sets (set_id)
+);
+```
+
+- [ ] **Step 2: Run the migration**
+
+Execute `docs/Patches/p36.2/Features/EquipmentSets/migration.sql` against the game DB.
+Verify: all three tables exist and are empty.
+
+```sql
+SELECT 'equipment_sets' AS tbl, COUNT(*) AS rows FROM equipment_sets
+UNION ALL
+SELECT 'equipment_set_members', COUNT(*) FROM equipment_set_members
+UNION ALL
+SELECT 'equipment_set_bonus_thresholds', COUNT(*) FROM equipment_set_bonus_thresholds;
+```
+
+Expected: three rows, all with `rows = 0`.
+
+- [ ] **Step 3: Commit**
+
+```
+git add docs/Patches/p36.2/Features/EquipmentSets/migration.sql
+git commit -m "feat: add equipment set DB schema (IMPROVEMENT-025)"
+```
+
+---
+
+## Task 2: EffectType Enum + Effect DB Row
+
+**Files:**
+- Modify: `src/Perpetuum.ExportedTypes/EffectType.cs`
+- Modify: `src/Perpetuum.Bootstrapper/Modules/EffectsModule.cs`
+
+- [ ] **Step 1: Add enum value**
+
+In `src/Perpetuum.ExportedTypes/EffectType.cs`, after the last line `effect_field_reactor_stabilizer = 138,`, add:
+
+```csharp
+        effect_equipment_set_bonus = 139,
+```
+
+The enum should end:
+```csharp
+        effect_field_stealth = 136,
+        effect_field_eccm = 137,
+        effect_field_reactor_stabilizer = 138,
+        effect_equipment_set_bonus = 139,
+    }
+}
+```
+
+- [ ] **Step 2: Register the effect type in Autofac**
+
+In `src/Perpetuum.Bootstrapper/Modules/EffectsModule.cs`, inside `Load()`, after the field effect lines (around line 108), add:
+
+```csharp
+            // Equipment set bonus display effect
+            _ = builder.RegisterType<Effect>().Keyed<Effect>(EffectType.effect_equipment_set_bonus);
+```
+
+- [ ] **Step 3: Insert effects DB row**
+
+Execute against the game DB:
+
+```sql
+-- Determine effectcategory value for a passive non-categorised effect (0 = undefined)
+INSERT INTO effects (id, name, description, duration, ispositive, isaura, auraradius, display, effectcategory)
+VALUES (
+    139,
+    N'Set Bonus Active',
+    N'An equipment set bonus is active on this robot.',
+    0,       -- permanent (no timer)
+    1,       -- ispositive = true
+    0,       -- not an aura
+    0,       -- aura radius = n/a
+    1,       -- display = true (show to client)
+    0        -- effectcategory = undefined (not ECCM-clearable)
+);
+```
+
+Verify:
+```sql
+SELECT * FROM effects WHERE id = 139;
+```
+
+Expected: one row with `name = 'Set Bonus Active'`.
+
+- [ ] **Step 4: Build to verify no compile errors**
+
+```
+dotnet build PerpetuumServer2.sln -c Release -p:Platform=x64
+```
+
+Expected: build succeeds.
+
+- [ ] **Step 5: Commit**
+
+```
+git add src/Perpetuum.ExportedTypes/EffectType.cs
+git add src/Perpetuum.Bootstrapper/Modules/EffectsModule.cs
+git commit -m "feat: add effect_equipment_set_bonus effect type (IMPROVEMENT-025)"
+```
+
+---
+
+## Task 3: Data Types and Repository Interface
+
+**Files:**
+- Create: `src/Perpetuum/Robots/EquipmentSets/SetBonusThreshold.cs`
+- Create: `src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusResult.cs`
+- Create: `src/Perpetuum/Robots/EquipmentSets/IEquipmentSetRepository.cs`
+
+- [ ] **Step 1: Create `SetBonusThreshold`**
+
+```csharp
+using Perpetuum.ExportedTypes;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public readonly struct SetBonusThreshold
+    {
+        public SetBonusThreshold(int requiredPieces, AggregateField field, double value)
+        {
+            RequiredPieces = requiredPieces;
+            Field = field;
+            Value = value;
+        }
+
+        public int RequiredPieces { get; }
+        public AggregateField Field { get; }
+        public double Value { get; }
+    }
+}
+```
+
+- [ ] **Step 2: Create `EquipmentSetBonusResult`**
+
+```csharp
+using Perpetuum.Items;
+using System.Collections.Generic;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public sealed class EquipmentSetBonusResult
+    {
+        public static readonly EquipmentSetBonusResult Empty =
+            new(Array.Empty<ItemPropertyModifier>(), new HashSet<int>());
+
+        public EquipmentSetBonusResult(
+            IReadOnlyList<ItemPropertyModifier> modifiers,
+            IReadOnlySet<int> activeSetIds)
+        {
+            Modifiers = modifiers;
+            ActiveSetIds = activeSetIds;
+        }
+
+        public IReadOnlyList<ItemPropertyModifier> Modifiers { get; }
+        public IReadOnlySet<int> ActiveSetIds { get; }
+    }
+}
+```
+
+- [ ] **Step 3: Create `IEquipmentSetRepository`**
+
+```csharp
+using System.Collections.Generic;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public interface IEquipmentSetRepository
+    {
+        void Init();
+
+        /// <summary>Returns all set IDs the given module definition belongs to.</summary>
+        IEnumerable<int> GetSetIdsForDefinition(int definition);
+
+        /// <summary>Returns all threshold rows for the given set, ordered by required_pieces.</summary>
+        IEnumerable<SetBonusThreshold> GetThresholds(int setId);
+    }
+}
+```
+
+- [ ] **Step 4: Build to verify**
+
+```
+dotnet build PerpetuumServer2.sln -c Release -p:Platform=x64
+```
+
+Expected: build succeeds.
+
+- [ ] **Step 5: Commit**
+
+```
+git add src/Perpetuum/Robots/EquipmentSets/
+git commit -m "feat: add equipment set data types and repository interface (IMPROVEMENT-025)"
+```
+
+---
+
+## Task 4: Repository Implementation
+
+**Files:**
+- Create: `src/Perpetuum/Robots/EquipmentSets/EquipmentSetRepository.cs`
+
+- [ ] **Step 1: Write the repository**
+
+```csharp
+using Perpetuum.Data;
+using Perpetuum.ExportedTypes;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public class EquipmentSetRepository : IEquipmentSetRepository
+    {
+        private ILookup<int, int> _definitionToSetIds;
+        private ILookup<int, SetBonusThreshold> _setIdToThresholds;
+
+        public void Init()
+        {
+            _definitionToSetIds = Db.Query()
+                .CommandText("SELECT set_id, definition FROM equipment_set_members")
+                .Execute()
+                .ToLookup(
+                    r => r.GetValue<int>("definition"),
+                    r => r.GetValue<int>("set_id"));
+
+            _setIdToThresholds = Db.Query()
+                .CommandText("SELECT set_id, required_pieces, aggregate_field, bonus_value FROM equipment_set_bonus_thresholds ORDER BY set_id, required_pieces")
+                .Execute()
+                .ToLookup(
+                    r => r.GetValue<int>("set_id"),
+                    r => new SetBonusThreshold(
+                        r.GetValue<int>("required_pieces"),
+                        (AggregateField)r.GetValue<int>("aggregate_field"),
+                        r.GetValue<double>("bonus_value")));
+        }
+
+        public IEnumerable<int> GetSetIdsForDefinition(int definition)
+        {
+            return _definitionToSetIds[definition];
+        }
+
+        public IEnumerable<SetBonusThreshold> GetThresholds(int setId)
+        {
+            return _setIdToThresholds[setId];
+        }
+    }
+}
+```
+
+- [ ] **Step 2: Build to verify**
+
+```
+dotnet build PerpetuumServer2.sln -c Release -p:Platform=x64
+```
+
+Expected: build succeeds.
+
+- [ ] **Step 3: Commit**
+
+```
+git add src/Perpetuum/Robots/EquipmentSets/EquipmentSetRepository.cs
+git commit -m "feat: implement EquipmentSetRepository with in-memory cache (IMPROVEMENT-025)"
+```
+
+---
+
+## Task 5: Calculator Interface and Implementation
+
+**Files:**
+- Create: `src/Perpetuum/Robots/EquipmentSets/IEquipmentSetBonusCalculator.cs`
+- Create: `src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusCalculator.cs`
+
+- [ ] **Step 1: Write the interface**
+
+```csharp
+using System.Collections.Generic;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public interface IEquipmentSetBonusCalculator
+    {
+        EquipmentSetBonusResult Compute(IEnumerable<int> fittedDefinitions);
+    }
+}
+```
+
+- [ ] **Step 2: Write the calculator**
+
+```csharp
+using Perpetuum.Items;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public class EquipmentSetBonusCalculator : IEquipmentSetBonusCalculator
+    {
+        private readonly IEquipmentSetRepository _repository;
+
+        public EquipmentSetBonusCalculator(IEquipmentSetRepository repository)
+        {
+            _repository = repository;
+        }
+
+        public EquipmentSetBonusResult Compute(IEnumerable<int> fittedDefinitions)
+        {
+            var piecesPerSet = new Dictionary<int, int>();
+
+            foreach (int definition in fittedDefinitions)
+            {
+                foreach (int setId in _repository.GetSetIdsForDefinition(definition))
+                {
+                    piecesPerSet.TryGetValue(setId, out int count);
+                    piecesPerSet[setId] = count + 1;
+                }
+            }
+
+            if (piecesPerSet.Count == 0)
+                return EquipmentSetBonusResult.Empty;
+
+            var modifiers = new List<ItemPropertyModifier>();
+            var activeSetIds = new HashSet<int>();
+
+            foreach (KeyValuePair<int, int> entry in piecesPerSet)
+            {
+                int setId = entry.Key;
+                int pieceCount = entry.Value;
+                bool anyMet = false;
+
+                foreach (SetBonusThreshold threshold in _repository.GetThresholds(setId)
+                    .Where(t => t.RequiredPieces <= pieceCount))
+                {
+                    modifiers.Add(ItemPropertyModifier.Create(threshold.Field, threshold.Value));
+                    anyMet = true;
+                }
+
+                if (anyMet)
+                    activeSetIds.Add(setId);
+            }
+
+            return new EquipmentSetBonusResult(modifiers, activeSetIds);
+        }
+    }
+}
+```
+
+- [ ] **Step 3: Build to verify**
+
+```
+dotnet build PerpetuumServer2.sln -c Release -p:Platform=x64
+```
+
+Expected: build succeeds.
+
+- [ ] **Step 4: Commit**
+
+```
+git add src/Perpetuum/Robots/EquipmentSets/IEquipmentSetBonusCalculator.cs
+git add src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusCalculator.cs
+git commit -m "feat: implement EquipmentSetBonusCalculator (IMPROVEMENT-025)"
+```
+
+---
+
+## Task 6: Robot — Property Injection + Initialize + GetPropertyModifier
+
+**Files:**
+- Modify: `src/Perpetuum/Robots/Robot.cs`
+- Modify: `src/Perpetuum/Robots/Robot.Properties.cs`
+
+- [ ] **Step 1: Add property and backing fields to `Robot.cs`**
+
+In `src/Perpetuum/Robots/Robot.cs`, add the following imports at the top of the file (alongside existing usings):
+
+```csharp
+using Perpetuum.Robots.EquipmentSets;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+```
+
+Then in the class body, after the existing `private readonly IntervalTimer overheatCooldownTimer;` field declaration (around line 30), add:
+
+```csharp
+        private IReadOnlyList<ItemPropertyModifier> _setBonusModifiers = Array.Empty<ItemPropertyModifier>();
+        private IReadOnlySet<int> _activeSetIds = ImmutableHashSet<int>.Empty;
+```
+
+After the existing `public InsuranceHelper InsuranceHelper { protected get; set; }` property (around line 46), add:
+
+```csharp
+        public IEquipmentSetBonusCalculator EquipmentSetBonusCalculator { private get; set; }
+```
+
+- [ ] **Step 2: Override `Initialize()` to compute set bonuses**
+
+In `src/Perpetuum/Robots/Robot.cs`, replace the existing `Initialize()` method (currently at line 123):
+
+```csharp
+        public override void Initialize()
+        {
+            InitComponents();
+            base.Initialize();
+        }
+```
+
+with:
+
+```csharp
+        public override void Initialize()
+        {
+            InitComponents();
+
+            if (EquipmentSetBonusCalculator != null)
+            {
+                EquipmentSetBonusResult result = EquipmentSetBonusCalculator.Compute(
+                    Modules.Select(m => m.Definition));
+                _setBonusModifiers = result.Modifiers;
+                _activeSetIds = result.ActiveSetIds;
+            }
+
+            base.Initialize();
+        }
+```
+
+Add `using System.Linq;` to the top of `Robot.cs` if not already present.
+
+- [ ] **Step 3: Override `GetPropertyModifier()` in `Robot.Properties.cs`**
+
+In `src/Perpetuum/Robots/Robot.Properties.cs`, replace the existing `GetPropertyModifier(AggregateField field)` method (currently at line 124):
+
+```csharp
+        public override ItemPropertyModifier GetPropertyModifier(AggregateField field)
+        {
+            ItemPropertyModifier modifier = base.GetPropertyModifier(field);
+
+            foreach (RobotComponent component in RobotComponents)
+            {
+                ItemPropertyModifier m = component.GetPropertyModifier(field);
+                m.Modify(ref modifier);
+            }
+
+            return modifier;
+        }
+```
+
+with:
+
+```csharp
+        public override ItemPropertyModifier GetPropertyModifier(AggregateField field)
+        {
+            ItemPropertyModifier modifier = base.GetPropertyModifier(field);
+
+            foreach (RobotComponent component in RobotComponents)
+            {
+                ItemPropertyModifier m = component.GetPropertyModifier(field);
+                m.Modify(ref modifier);
+            }
+
+            foreach (ItemPropertyModifier bonus in _setBonusModifiers)
+            {
+                if (bonus.Field == field)
+                    bonus.Modify(ref modifier);
+            }
+
+            return modifier;
+        }
+```
+
+- [ ] **Step 4: Build to verify**
+
+```
+dotnet build PerpetuumServer2.sln -c Release -p:Platform=x64
+```
+
+Expected: build succeeds with no errors.
+
+- [ ] **Step 5: Commit**
+
+```
+git add src/Perpetuum/Robots/Robot.cs
+git add src/Perpetuum/Robots/Robot.Properties.cs
+git commit -m "feat: integrate set bonus modifiers into Robot aggregate pipeline (IMPROVEMENT-025)"
+```
+
+---
+
+## Task 7: SetBonusEffectApplicator
+
+**Files:**
+- Create: `src/Perpetuum/Robots/EquipmentSets/SetBonusEffectApplicator.cs`
+
+- [ ] **Step 1: Write the applicator**
+
+```csharp
+using Perpetuum.ExportedTypes;
+using Perpetuum.Zones.Effects;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public sealed class SetBonusEffectApplicator
+    {
+        private readonly Dictionary<int, EffectToken> _activeTokens = new();
+
+        public void Update(Robot robot, IReadOnlySet<int> activeSetIds)
+        {
+            List<int> toRemove = _activeTokens.Keys
+                .Where(id => !activeSetIds.Contains(id))
+                .ToList();
+
+            foreach (int setId in toRemove)
+            {
+                robot.EffectHandler.RemoveEffectByToken(_activeTokens[setId]);
+                _activeTokens.Remove(setId);
+            }
+
+            foreach (int setId in activeSetIds)
+            {
+                if (_activeTokens.ContainsKey(setId))
+                    continue;
+
+                EffectToken token = EffectToken.NewToken();
+                EffectBuilder builder = robot.NewEffectBuilder()
+                    .SetType(EffectType.effect_equipment_set_bonus)
+                    .EnableModifiers(false)
+                    .WithToken(token);
+                robot.ApplyEffect(builder);
+                _activeTokens[setId] = token;
+            }
+        }
+
+        public void RemoveAll(Robot robot)
+        {
+            foreach (EffectToken token in _activeTokens.Values)
+            {
+                robot.EffectHandler.RemoveEffectByToken(token);
+            }
+            _activeTokens.Clear();
+        }
+    }
+}
+```
+
+- [ ] **Step 2: Build to verify**
+
+```
+dotnet build PerpetuumServer2.sln -c Release -p:Platform=x64
+```
+
+Expected: build succeeds.
+
+- [ ] **Step 3: Commit**
+
+```
+git add src/Perpetuum/Robots/EquipmentSets/SetBonusEffectApplicator.cs
+git commit -m "feat: add SetBonusEffectApplicator for zone-side set bonus display (IMPROVEMENT-025)"
+```
+
+---
+
+## Task 8: Wire SetBonusEffectApplicator into Robot.OnUpdate
+
+**Files:**
+- Modify: `src/Perpetuum/Robots/Robot.cs`
+
+- [ ] **Step 1: Add applicator field**
+
+In `src/Perpetuum/Robots/Robot.cs`, after the `_activeSetIds` field added in Task 6, add:
+
+```csharp
+        private readonly SetBonusEffectApplicator _setBonusEffectApplicator = new SetBonusEffectApplicator();
+```
+
+- [ ] **Step 2: Call applicator in `OnUpdate`**
+
+In `src/Perpetuum/Robots/Robot.cs`, find `OnUpdate(TimeSpan time)` (currently at line 342). After `foreach (RobotComponent robotComponent in RobotComponents) { robotComponent.Update(time); }`, add:
+
+```csharp
+            _setBonusEffectApplicator.Update(this, _activeSetIds);
+```
+
+The updated method should look like:
+
+```csharp
+        protected override void OnUpdate(TimeSpan time)
+        {
+            base.OnUpdate(time);
+
+            lockHandler.Update(time);
+
+            foreach (RobotComponent robotComponent in RobotComponents)
+            {
+                robotComponent.Update(time);
+            }
+
+            _setBonusEffectApplicator.Update(this, _activeSetIds);
+
+            if (overheatCooldownTimer.Passed)
+            {
+                OverheatHandler.Decrease(HeatDissipation);
+                ResetTimer();
+            }
+
+            overheatCooldownTimer.Update(time);
+        }
+```
+
+- [ ] **Step 3: Build to verify**
+
+```
+dotnet build PerpetuumServer2.sln -c Release -p:Platform=x64
+```
+
+Expected: build succeeds.
+
+- [ ] **Step 4: Commit**
+
+```
+git add src/Perpetuum/Robots/Robot.cs
+git commit -m "feat: wire SetBonusEffectApplicator into Robot.OnUpdate (IMPROVEMENT-025)"
+```
+
+---
+
+## Task 9: DI Registration
+
+**Files:**
+- Modify: `src/Perpetuum.Bootstrapper/Modules/EntitiesModule.cs`
+
+- [ ] **Step 1: Add using directive**
+
+In `src/Perpetuum.Bootstrapper/Modules/EntitiesModule.cs`, add to the using directives block:
+
+```csharp
+using Perpetuum.Robots.EquipmentSets;
+```
+
+- [ ] **Step 2: Register the repository and calculator**
+
+In `EntitiesModule.Load()`, after the line:
+```csharp
+builder.RegisterType<ModulePropertyModifiersReader>().OnActivated(e => e.Instance.Init()).SingleInstance();
+```
+
+add:
+
+```csharp
+            builder.RegisterType<EquipmentSetRepository>().As<IEquipmentSetRepository>()
+                .OnActivated(e => e.Instance.Init()).SingleInstance();
+            builder.RegisterType<EquipmentSetBonusCalculator>().As<IEquipmentSetBonusCalculator>()
+                .SingleInstance();
+```
+
+- [ ] **Step 3: Build to verify**
+
+```
+dotnet build PerpetuumServer2.sln -c Release -p:Platform=x64
+```
+
+Expected: build succeeds.
+
+- [ ] **Step 4: Start the server and verify no startup crash**
+
+```
+cd src/Perpetuum.Server
+dotnet run -- --GameRoot "E:\PerpetuumServer2\data"
+```
+
+Expected: server starts without exceptions. Check logs for any DI resolution errors.
+
+- [ ] **Step 5: Commit**
+
+```
+git add src/Perpetuum.Bootstrapper/Modules/EntitiesModule.cs
+git commit -m "feat: register EquipmentSetRepository and Calculator in DI (IMPROVEMENT-025)"
+```
+
+---
+
+## Task 10: Pilot Set Content SQL
+
+**Files:**
+- Create: `docs/Patches/p36.2/Features/EquipmentSets/set_striker_pilot.sql`
+
+- [ ] **Step 1: Query for valid module definitions to use**
+
+Run this against the game DB to find medium armor plate definitions to include in the pilot set:
+
+```sql
+SELECT definition, definitionname
+FROM entitydefaults
+WHERE definitionname LIKE N'def_%armor_plate%medium%'
+   OR definitionname LIKE N'def_medium%armor_plate%'
+AND enabled = 1
+ORDER BY definitionname;
+```
+
+Pick 4 definitions from the results. Note their `definitionname` values.
+
+- [ ] **Step 2: Write the pilot set SQL using the names found above**
+
+Replace `'def_module_name_1'` through `'def_module_name_4'` with the actual `definitionname` values found in Step 1.
+
+```sql
+-- Pilot set: set_striker (IMPROVEMENT-025 validation content)
+-- AggregateField values used:
+--   armor_max_modifier  = 17  (formula: Modifier, 1.05 = +5%)
+--   resist_kinetic_modifier = 310  (formula: Modifier, 1.08 = +8%)
+
+-- 1. Create the set
+IF NOT EXISTS (SELECT 1 FROM equipment_sets WHERE name = N'set_striker')
+    INSERT INTO equipment_sets (name) VALUES (N'set_striker');
+
+DECLARE @setId INT = (SELECT set_id FROM equipment_sets WHERE name = N'set_striker');
+
+-- 2. Assign member modules (replace names with actual definitionname values from the DB)
+INSERT INTO equipment_set_members (set_id, definition)
+SELECT @setId, ed.definition
+FROM entitydefaults ed
+WHERE ed.definitionname IN (
+    N'def_module_name_1',
+    N'def_module_name_2',
+    N'def_module_name_3',
+    N'def_module_name_4'
+)
+AND NOT EXISTS (
+    SELECT 1 FROM equipment_set_members m
+    WHERE m.set_id = @setId AND m.definition = ed.definition
+);
+
+-- 3. Define thresholds
+-- 2-piece: +5% max armor (armor_max_modifier = 17, value = 1.05, Modifier formula)
+IF NOT EXISTS (
+    SELECT 1 FROM equipment_set_bonus_thresholds
+    WHERE set_id = @setId AND required_pieces = 2 AND aggregate_field = 17)
+    INSERT INTO equipment_set_bonus_thresholds (set_id, required_pieces, aggregate_field, bonus_value)
+    VALUES (@setId, 2, 17, 1.05);
+
+-- 4-piece: +8% kinetic resist (resist_kinetic_modifier = 310, value = 1.08, Modifier formula)
+IF NOT EXISTS (
+    SELECT 1 FROM equipment_set_bonus_thresholds
+    WHERE set_id = @setId AND required_pieces = 4 AND aggregate_field = 310)
+    INSERT INTO equipment_set_bonus_thresholds (set_id, required_pieces, aggregate_field, bonus_value)
+    VALUES (@setId, 4, 310, 1.08);
+```
+
+- [ ] **Step 3: Execute the pilot set SQL**
+
+Run `docs/Patches/p36.2/Features/EquipmentSets/set_striker_pilot.sql` against the game DB.
+
+Verify:
+```sql
+SELECT s.name, m.definition, ed.definitionname
+FROM equipment_sets s
+JOIN equipment_set_members m ON s.set_id = m.set_id
+JOIN entitydefaults ed ON m.definition = ed.definition
+WHERE s.name = N'set_striker';
+
+SELECT s.name, t.required_pieces, t.aggregate_field, t.bonus_value
+FROM equipment_sets s
+JOIN equipment_set_bonus_thresholds t ON s.set_id = t.set_id
+WHERE s.name = N'set_striker'
+ORDER BY t.required_pieces;
+```
+
+Expected: 4 member rows, 2 threshold rows (pieces=2 field=17 value=1.05, pieces=4 field=310 value=1.08).
+
+- [ ] **Step 4: Commit**
+
+```
+git add docs/Patches/p36.2/Features/EquipmentSets/set_striker_pilot.sql
+git commit -m "feat: add set_striker pilot set content SQL (IMPROVEMENT-025)"
+```
+
+---
+
+## Task 11: Manual Validation
+
+**Prerequisites:** Server running with the pilot set SQL applied and the updated binary deployed.
+
+- [ ] **Step 1: Restart the server**
+
+Restart to trigger `EquipmentSetRepository.Init()` and reload the `effects` cache.
+Confirm in logs: no startup exceptions.
+
+- [ ] **Step 2: Fitting screen — no bonus with 1 piece**
+
+1. Dock a character with a robot.
+2. Equip exactly 1 of the 4 pilot set modules.
+3. Open the fitting screen and note `armor_max` and `resist_kinetic` values.
+4. Expected: no change from baseline values — no threshold is met with 1 piece.
+
+- [ ] **Step 3: Fitting screen — 2-piece bonus visible**
+
+1. Equip a second pilot set module into the same robot (any of the 4 members).
+2. Note `armor_max` in the fitting screen.
+3. Expected: `armor_max` is approximately 5% higher than the 1-piece value (modifier 1.05 applied).
+4. `resist_kinetic` should be unchanged (4-piece threshold not yet met).
+
+- [ ] **Step 4: Fitting screen — 4-piece bonus visible**
+
+1. Equip a third and fourth pilot set module.
+2. Note both `armor_max` and `resist_kinetic` in the fitting screen.
+3. Expected: `armor_max` +5%, `resist_kinetic` +8% vs. baseline (both thresholds active).
+
+- [ ] **Step 5: Fitting screen — bonus removed on unequip**
+
+1. Unequip one module to drop to 3 pieces.
+2. Expected: `resist_kinetic` returns to baseline (4-piece threshold lost), `armor_max` remains +5%.
+3. Unequip another to drop to 1 piece.
+4. Expected: both values return to baseline.
+
+- [ ] **Step 6: Duplicate pieces count**
+
+1. Fit 2 copies of the same set member module (same `definitionname`, stacked).
+2. Expected: 2-piece threshold is met with 2 identical modules — `armor_max` +5%.
+
+- [ ] **Step 7: Zone deployment — effect visible**
+
+1. Deploy the robot to a zone with 2+ set pieces fitted.
+2. Open the robot status UI and inspect the effect list.
+3. Expected: "Set Bonus Active" effect is present.
+4. Remove one set piece in-station, redeploy.
+5. Expected: if threshold still met, effect present; if not, effect absent.
+
+- [ ] **Step 8: Zone entry/re-entry idempotency**
+
+1. Deploy robot with 4 set pieces — one "Set Bonus Active" effect should appear.
+2. Undeploy and redeploy.
+3. Expected: still one "Set Bonus Active" effect — no duplicates.
+
+- [ ] **Step 9: Commit validation note**
+
+```
+git commit --allow-empty -m "chore: manual validation complete for IMPROVEMENT-025"
+```
+
+---
+
+## Notes
+
+- `AggregateField.armor_max_modifier = 17`, formula = Modifier (multiply). `bonus_value = 1.05` means ×1.05.
+- `AggregateField.resist_kinetic_modifier = 310`, formula = Modifier. `bonus_value = 1.08` means ×1.08.
+- `effectcategory = 0` for `effect_equipment_set_bonus` means the effect is not ECCM-clearable and has no stacking limit. Adjust if needed after playtesting.
+- The `SetBonusEffectApplicator.Update()` call in `Robot.OnUpdate()` runs every zone tick — it is O(active sets) and only creates/removes effects on change, so the hot-path cost is negligible.
+- To add more sets after this feature ships: insert into `equipment_sets`, `equipment_set_members`, and `equipment_set_bonus_thresholds` — no code changes needed.
diff --git a/docs/superpowers/plans/2026-05-24-codebase-graph-workflow-integration.md b/docs/superpowers/plans/2026-05-24-codebase-graph-workflow-integration.md
new file mode 100644
index 0000000..6f9f3b8
--- /dev/null
+++ b/docs/superpowers/plans/2026-05-24-codebase-graph-workflow-integration.md
@@ -0,0 +1,362 @@
+# Codebase Graph Workflow Integration Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Wire the existing `graphify-dotnet` graph artifacts into Claude's actual workflow via a query script, an updated knowledge file, and two edits to CLAUDE.md.
+
+**Architecture:** Three independent changes with no shared state: a new PowerShell script at `tools/query-graph.ps1`, an in-place replacement of `.claude/knowledge/codebase-graph.md`, and two targeted edits to `CLAUDE.md` (knowledge table row + Required Workflow step). Each task can be committed independently.
+
+**Tech Stack:** PowerShell 5.1 (Windows PowerShell), `graph.json` / `GRAPH_REPORT.md` already present at `docs/graph/`
+
+**Spec:** `docs/superpowers/specs/2026-05-24-codebase-graph-workflow-integration-design.md`
+
+---
+
+## File Map
+
+| Action | Path | Purpose |
+|---|---|---|
+| Create dir | `tools/` | Container for project utility scripts |
+| Create | `tools/query-graph.ps1` | Graph query script (all four directions) |
+| Modify | `.claude/knowledge/codebase-graph.md` | Add GRAPH_REPORT reference, usage table, script callout, edge-sparsity note |
+| Modify | `CLAUDE.md` | Add knowledge table row + Required Workflow step 4 |
+
+---
+
+### Task 1: Create `tools/query-graph.ps1`
+
+**Files:**
+- Create: `tools/query-graph.ps1`
+
+- [ ] **Step 1: Create the `tools/` directory**
+
+From the solution root (`E:\MyStuff\Projects\PerpetuumServer2`):
+
+```powershell
+New-Item -ItemType Directory -Force tools
+```
+
+- [ ] **Step 2: Create `tools/query-graph.ps1`**
+
+Create the file with the following content exactly:
+
+```powershell
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory=$true, Position=0)]
+    [string]$ClassName,
+
+    [Parameter(Mandatory=$false)]
+    [ValidateSet('in', 'out', 'both', 'community')]
+    [string]$Direction = 'both'
+)
+
+$graphPath = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot '..\docs\graph\graph.json'))
+
+if (-not (Test-Path $graphPath)) {
+    Write-Host "graph.json not found at: $graphPath" -ForegroundColor Yellow
+    Write-Host "Build Perpetuum.Server once to generate it:"
+    Write-Host "  dotnet build src/Perpetuum.Server/Perpetuum.Server.csproj -c Release -p:Platform=x64"
+    exit 0
+}
+
+Write-Host "Loading graph..." -ForegroundColor DarkGray
+$g = Get-Content $graphPath -Raw | ConvertFrom-Json
+
+$matchedNodes = @($g.nodes | Where-Object { $_.label -like "*$ClassName*" })
+
+if ($matchedNodes.Count -eq 0) {
+    Write-Host "No node found matching '$ClassName'"
+    exit 0
+}
+
+if ($matchedNodes.Count -gt 1) {
+    Write-Host "$($matchedNodes.Count) nodes match '$ClassName'. Use a more specific name:" -ForegroundColor Yellow
+    $matchedNodes | ForEach-Object { Write-Host "  $($_.label)  ($($_.file_path))" }
+    exit 0
+}
+
+$node = $matchedNodes[0]
+Write-Host ""
+Write-Host "Node: $($node.label)  [community $($node.community)]" -ForegroundColor Cyan
+Write-Host "File: $($node.file_path)"
+Write-Host ""
+
+if ($Direction -eq 'in' -or $Direction -eq 'both') {
+    $inEdges = @($g.edges | Where-Object { $_.target -eq $node.id })
+    Write-Host "=== Inbound ($($inEdges.Count)): who depends on this ===" -ForegroundColor Green
+    if ($inEdges.Count -eq 0) {
+        Write-Host "  (none)"
+    } else {
+        foreach ($edge in $inEdges) {
+            $srcNode = $g.nodes | Where-Object { $_.id -eq $edge.source } | Select-Object -First 1
+            $srcLabel = if ($srcNode) { $srcNode.label } else { $edge.source }
+            Write-Host "  [$($edge.relationship)]  $srcLabel"
+        }
+    }
+    Write-Host ""
+}
+
+if ($Direction -eq 'out' -or $Direction -eq 'both') {
+    $outEdges = @($g.edges | Where-Object { $_.source -eq $node.id })
+    Write-Host "=== Outbound ($($outEdges.Count)): what this depends on ===" -ForegroundColor Green
+    if ($outEdges.Count -eq 0) {
+        Write-Host "  (none)"
+    } else {
+        foreach ($edge in $outEdges) {
+            $tgtNode = $g.nodes | Where-Object { $_.id -eq $edge.target } | Select-Object -First 1
+            $tgtLabel = if ($tgtNode) { $tgtNode.label } else { $edge.target }
+            Write-Host "  [$($edge.relationship)]  $tgtLabel"
+        }
+    }
+    Write-Host ""
+}
+
+if ($Direction -eq 'community') {
+    $communityNodes = @($g.nodes | Where-Object { $_.community -eq $node.community -and $_.id -ne $node.id } | Sort-Object label)
+    Write-Host "=== Community $($node.community) ($($communityNodes.Count + 1) members) ===" -ForegroundColor Green
+    Write-Host "  [self]  $($node.label)"
+    foreach ($member in $communityNodes) {
+        Write-Host "  [$($member.type)]  $($member.label)  ($($member.file_path))"
+    }
+    Write-Host ""
+}
+```
+
+- [ ] **Step 3: Smoke-test — basic lookup**
+
+From the solution root:
+
+```powershell
+.\tools\query-graph.ps1 StandingList
+```
+
+Expected output (approximate):
+```
+Loading graph...
+
+Node: StandingList.cs  [community 1211]
+File: Perpetuum.RequestHandlers/Standings/StandingList.cs
+
+=== Inbound (N): who depends on this ===
+  ...
+=== Outbound (N): what this depends on ===
+  ...
+```
+
+The exact edge counts will vary. What matters: no errors, node is found, both sections print.
+
+- [ ] **Step 4: Smoke-test — community direction**
+
+```powershell
+.\tools\query-graph.ps1 StandingList -Direction community
+```
+
+Expected: lists other members of community 1211 with `[Entity]` or `[File]` type prefix.
+
+- [ ] **Step 5: Smoke-test — no-match case**
+
+```powershell
+.\tools\query-graph.ps1 ClassThatDoesNotExist999
+```
+
+Expected output:
+```
+Loading graph...
+No node found matching 'ClassThatDoesNotExist999'
+```
+
+- [ ] **Step 6: Smoke-test — multiple-match case**
+
+```powershell
+.\tools\query-graph.ps1 Zone
+```
+
+Expected: either lists a single matched node, or prints "N nodes match 'Zone'. Use a more specific name:" followed by a list of matches. Both are valid — what matters is no crash.
+
+- [ ] **Step 7: Smoke-test — missing graph.json**
+
+Temporarily rename the graph file, run the script, then restore it:
+
+```powershell
+Rename-Item docs\graph\graph.json docs\graph\graph.json.bak
+.\tools\query-graph.ps1 StandingList
+Rename-Item docs\graph\graph.json.bak docs\graph\graph.json
+```
+
+Expected output during rename:
+```
+graph.json not found at: ...\docs\graph\graph.json
+Build Perpetuum.Server once to generate it:
+  dotnet build src/Perpetuum.Server/Perpetuum.Server.csproj -c Release -p:Platform=x64
+```
+
+- [ ] **Step 8: Commit**
+
+```powershell
+git add tools/query-graph.ps1
+git commit -m "feat: add graph query script tools/query-graph.ps1"
+```
+
+---
+
+### Task 2: Update `.claude/knowledge/codebase-graph.md`
+
+**Files:**
+- Modify: `.claude/knowledge/codebase-graph.md`
+
+- [ ] **Step 1: Replace the file content**
+
+Replace the entire content of `.claude/knowledge/codebase-graph.md` with:
+
+```markdown
+# Codebase Dependency Graph
+
+Generated by graphify-dotnet from the `src/` directory. Regenerates automatically before
+each build of `Perpetuum.Server` (requires .NET 10 SDK and `dotnet tool restore` from the
+solution root).
+
+## Artifacts
+
+- **`docs/graph/GRAPH_REPORT.md`** — Markdown summary: god nodes, community clusters, stats.
+  **Read this first.** Token-efficient starting point for any architectural question.
+- **`docs/graph/graph.json`** — Full machine-readable graph (19,926 nodes, 33,689 edges).
+  Use via `tools/query-graph.ps1` — do not read the raw file.
+- **GitHub Wiki** — latest report published by CI:
+  `https://github.com/OpenPerpetuum/PerpetuumServer2/wiki/Codebase-Graph`
+
+## Graph Structure
+
+Nodes represent C# classes, methods, and namespaces (type: `Entity` or `File`).
+Edges have two relationship types:
+- **`contains`** (17,785 edges) — within-file hierarchy: file → namespace → class → method
+- **`imports`** (66 edges) — cross-file namespace dependencies (the meaningful ones for impact analysis)
+
+Communities (Louvain clustering) group related symbols into 2,616 clusters.
+
+## How to Use
+
+| Goal | Action |
+|---|---|
+| Architectural overview or god-node check | Read `docs/graph/GRAPH_REPORT.md` |
+| Blast radius before modifying a class | `.\tools\query-graph.ps1 <ClassName> -Direction in` |
+| What a class depends on | `.\tools\query-graph.ps1 <ClassName> -Direction out` |
+| Full dependency picture | `.\tools\query-graph.ps1 <ClassName>` (default: both) |
+| Find related types in the same subsystem | `.\tools\query-graph.ps1 <ClassName> -Direction community` |
+
+## God-Node Awareness
+
+The top 10 most-connected symbols are listed in `docs/graph/GRAPH_REPORT.md` under "God Nodes".
+These are the highest-risk symbols to change — check the report before modifying any of them.
+The list regenerates on each build; do not rely on hardcoded names from prior sessions.
+
+> **Note on import sparsity:** Only 66 `imports` edges exist across the entire codebase (AST-only
+> analysis). Inbound results for most classes will be sparse. Absence of inbound edges does not
+> mean a class is unused — it means graphify did not detect a namespace import.
+```
+
+- [ ] **Step 2: Verify the file reads correctly**
+
+Open `.claude/knowledge/codebase-graph.md` and confirm:
+- "Read this first" appears next to GRAPH_REPORT.md
+- The How to Use table contains all five rows
+- The god-node section points to GRAPH_REPORT.md (no hardcoded class names)
+- The import-sparsity note is present at the bottom
+
+- [ ] **Step 3: Commit**
+
+```powershell
+git add .claude/knowledge/codebase-graph.md
+git commit -m "docs: update codebase-graph.md with GRAPH_REPORT, query script, and edge-sparsity note"
+```
+
+---
+
+### Task 3: Update `CLAUDE.md`
+
+**Files:**
+- Modify: `CLAUDE.md`
+
+Two edits, each committed together at the end.
+
+- [ ] **Step 1: Add row to the knowledge table in AI Contribution Rules**
+
+Find this block in `CLAUDE.md` (around line 327):
+
+```markdown
+| Purpose | File |
+|---|---|
+| Main AI instructions | `CLAUDE.md` |
+| Architecture deep-dive | `.claude/knowledge/architecture.md` |
+| Specialist agents | `.claude/agents/<name>.md` |
+```
+
+Replace it with:
+
+```markdown
+| Purpose | File |
+|---|---|
+| Main AI instructions | `CLAUDE.md` |
+| Architecture deep-dive | `.claude/knowledge/architecture.md` |
+| Codebase graph & impact analysis | `.claude/knowledge/codebase-graph.md` |
+| Specialist agents | `.claude/agents/<name>.md` |
+```
+
+- [ ] **Step 2: Add step 4 to the Required Workflow**
+
+Find this block in `CLAUDE.md` (around line 154):
+
+```markdown
+For any non-trivial task:
+
+1. Identify affected subsystems
+2. Identify relevant documentation
+3. Locate similar implementations
+4. Understand existing patterns
+5. Evaluate runtime implications
+6. Produce a short implementation plan
+7. Then implement
+```
+
+Replace it with:
+
+```markdown
+For any non-trivial task:
+
+1. Identify affected subsystems
+2. Identify relevant documentation
+3. Locate similar implementations
+4. Check `docs/graph/GRAPH_REPORT.md` — if the target type is in the God Nodes list, note high blast radius; run `.\tools\query-graph.ps1 <ClassName>` for full dependent enumeration
+5. Understand existing patterns
+6. Evaluate runtime implications
+7. Produce a short implementation plan
+8. Then implement
+```
+
+- [ ] **Step 3: Verify both edits are present**
+
+Open `CLAUDE.md` and confirm:
+- The AI Contribution Rules table has the `codebase-graph.md` row
+- Required Workflow has 8 steps with the graph check as step 4
+
+- [ ] **Step 4: Commit**
+
+```powershell
+git add CLAUDE.md
+git commit -m "docs: wire codebase graph into CLAUDE.md workflow and knowledge table"
+```
+
+---
+
+## Manual Validation Checklist
+
+After all tasks are complete:
+
+1. `.\tools\query-graph.ps1 StandingList` — prints node + inbound + outbound sections, no errors
+2. `.\tools\query-graph.ps1 StandingList -Direction community` — prints community members
+3. `.\tools\query-graph.ps1 NoSuchClass999` — prints "No node found matching..." gracefully
+4. `.\tools\query-graph.ps1 Zone` — either finds a single match or lists multiple matches without crashing
+5. `CLAUDE.md` Required Workflow has 8 steps with graph check at position 4
+6. `CLAUDE.md` AI Contribution Rules table includes `codebase-graph.md` row
+7. `.claude/knowledge/codebase-graph.md` references GRAPH_REPORT.md as primary starting point, includes How to Use table, no hardcoded god-node names
+8. `git log --oneline -3` shows the three commits from this plan
diff --git a/docs/superpowers/plans/2026-05-24-equipment-set-bonus-effect-display.md b/docs/superpowers/plans/2026-05-24-equipment-set-bonus-effect-display.md
new file mode 100644
index 0000000..46f7f5c
--- /dev/null
+++ b/docs/superpowers/plans/2026-05-24-equipment-set-bonus-effect-display.md
@@ -0,0 +1,388 @@
+# Equipment Set Bonus Effect Display Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Embed per-set `ItemPropertyModifier` values into each `effect_equipment_set_bonus` effect so the client can display the actual bonus amounts a player receives from their equipment set.
+
+**Architecture:** `EquipmentSetBonusResult` gains a `ModifiersPerSet` dictionary (keyed by set ID) alongside a flat `Modifiers` convenience view computed at construction. The calculator returns modifiers grouped by set; the effect applicator embeds the correct modifier list into each per-set effect via `.EnableModifiers(true).WithPropertyModifiers(...)`. `Robot` stores a single `_setBonusResult` field instead of the two separate fields it had before.
+
+**Tech Stack:** C# 12, .NET 8. No test framework — verification is manual build + in-game observation.
+
+---
+
+## File Map
+
+| File | Action | Purpose |
+|---|---|---|
+| `src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusResult.cs` | Modify | Add `ModifiersPerSet`, compute flat `Modifiers` at construction, derive `ActiveSetIds` from keys |
+| `src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusCalculator.cs` | Modify | Build per-set dictionary instead of flat list |
+| `src/Perpetuum/Robots/EquipmentSets/SetBonusEffectApplicator.cs` | Modify | New signature; `.EnableModifiers(true)` + `.WithPropertyModifiers()` at effect creation |
+| `src/Perpetuum/Robots/Robot.cs` | Modify | Replace `_setBonusModifiers` + `_activeSetIds` with single `_setBonusResult`; remove `_emptySetIds` |
+| `src/Perpetuum/Robots/Robot.Properties.cs` | Modify | `_setBonusModifiers` → `_setBonusResult.Modifiers` |
+
+---
+
+## Task 1: Update `EquipmentSetBonusResult`
+
+**Files:**
+- Modify: `src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusResult.cs`
+
+- [ ] **Step 1: Replace the file contents**
+
+Replace the entire file with:
+
+```csharp
+using Perpetuum.Items;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public sealed class EquipmentSetBonusResult
+    {
+        public static readonly EquipmentSetBonusResult Empty =
+            new(new Dictionary<int, IReadOnlyList<ItemPropertyModifier>>());
+
+        public EquipmentSetBonusResult(IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>> modifiersPerSet)
+        {
+            ModifiersPerSet = modifiersPerSet;
+            Modifiers = modifiersPerSet.Values.SelectMany(x => x).ToArray();
+        }
+
+        public IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>> ModifiersPerSet { get; }
+        public IReadOnlyList<ItemPropertyModifier> Modifiers { get; }
+        public IEnumerable<int> ActiveSetIds => ModifiersPerSet.Keys;
+    }
+}
+```
+
+Key changes from the original:
+- Constructor now takes `IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>>` instead of `(IReadOnlyList<ItemPropertyModifier>, IReadOnlySet<int>)`
+- `Modifiers` is computed by flattening all values — allocated once at construction, zero-alloc on read
+- `ActiveSetIds` is derived from dictionary keys — no separate `HashSet<int>` stored
+- `Empty` uses an empty dictionary; both `Modifiers` and `ModifiersPerSet` are empty
+
+- [ ] **Step 2: Build to confirm no other callers are broken yet**
+
+```
+dotnet build PerpetuumServer2.sln -c Release -p:Platform=x64
+```
+
+Expected: build errors in `EquipmentSetBonusCalculator.cs` and `Robot.cs` (they still pass the old constructor signature). Tasks 2 and 4 fix these. No other files should error at this point.
+
+---
+
+## Task 2: Update `EquipmentSetBonusCalculator`
+
+**Files:**
+- Modify: `src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusCalculator.cs`
+
+- [ ] **Step 1: Replace the file contents**
+
+Replace the entire file with:
+
+```csharp
+using System.Collections.Generic;
+using Perpetuum.Items;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public class EquipmentSetBonusCalculator : IEquipmentSetBonusCalculator
+    {
+        private readonly IEquipmentSetRepository _repository;
+
+        public EquipmentSetBonusCalculator(IEquipmentSetRepository repository)
+        {
+            _repository = repository;
+        }
+
+        public EquipmentSetBonusResult Compute(IEnumerable<int> fittedDefinitions)
+        {
+            if (fittedDefinitions == null)
+                return EquipmentSetBonusResult.Empty;
+
+            var countPerSet = new Dictionary<int, int>();
+            foreach (int def in fittedDefinitions)
+            {
+                foreach (int setId in _repository.GetSetIdsForDefinition(def))
+                {
+                    countPerSet.TryGetValue(setId, out int current);
+                    countPerSet[setId] = current + 1;
+                }
+            }
+
+            if (countPerSet.Count == 0)
+                return EquipmentSetBonusResult.Empty;
+
+            var modifiersPerSet = new Dictionary<int, IReadOnlyList<ItemPropertyModifier>>();
+
+            foreach (KeyValuePair<int, int> entry in countPerSet)
+            {
+                int setId = entry.Key;
+                int count = entry.Value;
+                List<ItemPropertyModifier> setModifiers = null;
+
+                foreach (SetBonusThreshold threshold in _repository.GetThresholds(setId))
+                {
+                    if (threshold.RequiredPieces <= count)
+                    {
+                        setModifiers ??= new List<ItemPropertyModifier>();
+                        setModifiers.Add(ItemPropertyModifier.Create(threshold.Field, threshold.Value));
+                    }
+                }
+
+                if (setModifiers != null)
+                    modifiersPerSet[setId] = setModifiers; // List<T> upcast to IReadOnlyList<T>
+            }
+
+            if (modifiersPerSet.Count == 0)
+                return EquipmentSetBonusResult.Empty;
+
+            return new EquipmentSetBonusResult(modifiersPerSet);
+        }
+    }
+}
+```
+
+Key changes from the original:
+- `modifiersPerSet` is `Dictionary<int, IReadOnlyList<ItemPropertyModifier>>` (not `List<>`) so it satisfies the `EquipmentSetBonusResult` constructor's invariant `IReadOnlyDictionary` parameter
+- `setModifiers` is still `List<ItemPropertyModifier>` locally (for `.Add()`), then upcast to `IReadOnlyList<ItemPropertyModifier>` at assignment
+- The flat `modifiers` list and `activeSetIds` set are gone — the result object computes those itself
+- `anyThresholdMet` flag replaced by null-check on `setModifiers`
+
+- [ ] **Step 2: Build**
+
+```
+dotnet build PerpetuumServer2.sln -c Release -p:Platform=x64
+```
+
+Expected: still errors in `Robot.cs` (old constructor call and old field assignments). `EquipmentSetBonusCalculator` errors should be gone.
+
+---
+
+## Task 3: Update `SetBonusEffectApplicator`
+
+**Files:**
+- Modify: `src/Perpetuum/Robots/EquipmentSets/SetBonusEffectApplicator.cs`
+
+- [ ] **Step 1: Replace the file contents**
+
+Replace the entire file with:
+
+```csharp
+using System.Collections.Generic;
+using System.Linq;
+using Perpetuum.ExportedTypes;
+using Perpetuum.Items;
+using Perpetuum.Zones.Effects;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public class SetBonusEffectApplicator
+    {
+        private readonly Dictionary<int, EffectToken> _activeTokens = new();
+
+        public void Update(Robot robot, IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>> modifiersPerSet)
+        {
+            if (!robot.InZone)
+                return;
+
+            foreach (int setId in _activeTokens.Keys.Except(modifiersPerSet.Keys).ToList())
+            {
+                robot.EffectHandler.RemoveEffectByToken(_activeTokens[setId]);
+                _activeTokens.Remove(setId);
+            }
+
+            foreach (int setId in modifiersPerSet.Keys.Except(_activeTokens.Keys).ToList())
+            {
+                EffectToken token = EffectToken.NewToken();
+                EffectBuilder builder = robot.NewEffectBuilder()
+                    .SetType(EffectType.effect_equipment_set_bonus)
+                    .EnableModifiers(true)
+                    .WithPropertyModifiers(modifiersPerSet[setId])
+                    .WithToken(token);
+                robot.ApplyEffect(builder);
+                _activeTokens[setId] = token;
+            }
+        }
+    }
+}
+```
+
+Key changes from the original:
+- Parameter changes from `IReadOnlySet<int> activeSetIds` to `IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>> modifiersPerSet`
+- Remove/add set-difference logic now operates on `modifiersPerSet.Keys` (an `IEnumerable<int>`) — `Except()` works fine on it
+- `.EnableModifiers(false)` → `.EnableModifiers(true)`
+- `.WithPropertyModifiers(modifiersPerSet[setId])` added — embeds the bonus values for this set into the effect
+- `using Perpetuum.Items` added for `IReadOnlyList<ItemPropertyModifier>`
+
+- [ ] **Step 2: Build**
+
+```
+dotnet build PerpetuumServer2.sln -c Release -p:Platform=x64
+```
+
+Expected: still errors in `Robot.cs` only.
+
+---
+
+## Task 4: Update `Robot.cs` and `Robot.Properties.cs`
+
+**Files:**
+- Modify: `src/Perpetuum/Robots/Robot.cs` (lines 36–41, 138–142, 371)
+- Modify: `src/Perpetuum/Robots/Robot.Properties.cs` (line 134)
+
+- [ ] **Step 1: Remove `_emptySetIds` and the two separate bonus fields; add `_setBonusResult`**
+
+In `Robot.cs`, locate this block (around lines 36–41):
+
+```csharp
+        private static readonly IReadOnlySet<int> _emptySetIds = new HashSet<int>();
+
+        // Safe: Initialize() is called docked (no zone update) or at zone entry (before zone participation).
+        private IReadOnlyList<ItemPropertyModifier> _setBonusModifiers = Array.Empty<ItemPropertyModifier>();
+        private IReadOnlySet<int> _activeSetIds = _emptySetIds;
+        private readonly SetBonusEffectApplicator _setBonusEffectApplicator = new SetBonusEffectApplicator();
+```
+
+Replace with:
+
+```csharp
+        // Safe: Initialize() is called docked (no zone update) or at zone entry (before zone participation).
+        private EquipmentSetBonusResult _setBonusResult = EquipmentSetBonusResult.Empty;
+        private readonly SetBonusEffectApplicator _setBonusEffectApplicator = new SetBonusEffectApplicator();
+```
+
+- [ ] **Step 2: Update `Initialize()` to store the full result**
+
+In `Robot.cs`, locate this block (around lines 138–143):
+
+```csharp
+            if (EquipmentSetBonusCalculator != null)
+            {
+                EquipmentSetBonusResult result = EquipmentSetBonusCalculator.Compute(Modules.Select(m => m.Definition));
+                _setBonusModifiers = result.Modifiers;
+                _activeSetIds = result.ActiveSetIds;
+            }
+```
+
+Replace with:
+
+```csharp
+            if (EquipmentSetBonusCalculator != null)
+            {
+                _setBonusResult = EquipmentSetBonusCalculator.Compute(Modules.Select(m => m.Definition));
+            }
+```
+
+- [ ] **Step 3: Update `OnUpdate()` to pass `ModifiersPerSet`**
+
+In `Robot.cs`, locate this line (around line 371):
+
+```csharp
+            _setBonusEffectApplicator.Update(this, _activeSetIds);
+```
+
+Replace with:
+
+```csharp
+            _setBonusEffectApplicator.Update(this, _setBonusResult.ModifiersPerSet);
+```
+
+- [ ] **Step 4: Update `GetPropertyModifier()` in `Robot.Properties.cs`**
+
+In `Robot.Properties.cs`, locate this line (around line 134):
+
+```csharp
+            foreach (ItemPropertyModifier bonus in _setBonusModifiers)
+```
+
+Replace with:
+
+```csharp
+            foreach (ItemPropertyModifier bonus in _setBonusResult.Modifiers)
+```
+
+- [ ] **Step 5: Build clean**
+
+```
+dotnet build PerpetuumServer2.sln -c Release -p:Platform=x64
+```
+
+Expected: **0 errors, 0 warnings** (or only pre-existing warnings unrelated to these files). If `_emptySetIds` was referenced elsewhere, the compiler will tell you — fix by removing the reference.
+
+- [ ] **Step 6: Commit**
+
+```
+git add src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusResult.cs
+git add src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusCalculator.cs
+git add src/Perpetuum/Robots/EquipmentSets/SetBonusEffectApplicator.cs
+git add src/Perpetuum/Robots/Robot.cs
+git add src/Perpetuum/Robots/Robot.Properties.cs
+git commit -m "feat: embed set bonus modifier values in effect display (IMPROVEMENT-027)"
+```
+
+---
+
+## Task 5: Manual Validation
+
+- [ ] **Step 1: Start the server**
+
+```
+cd src/Perpetuum.Server
+dotnet run -- --GameRoot "E:\PerpetuumServer2\data"
+```
+
+- [ ] **Step 2: Log in with a character that has set pieces fitted**
+
+Ensure the robot has at least the minimum number of pieces from a set (e.g. `set_striker`) to meet at least one bonus threshold.
+
+- [ ] **Step 3: Observe `effect_equipment_set_bonus` in the UI**
+
+Open the active effects panel or hover over a fitted module tooltip. Look for the `effect_equipment_set_bonus` effect entry.
+
+- [ ] **Step 4: Verify bonus values are visible**
+
+**Pass:** The effect display shows the actual stat names and values granted by the set bonus (e.g. "+5% damage").
+
+**Fail:** The effect icon appears but no values are shown. This means the client is not consuming `PropertyModifiers` for this effect type. If this happens, log a new backlog item for client-side investigation — do not attempt to fix it server-side.
+
+- [ ] **Step 5: Verify stat computation is unchanged**
+
+Open the robot info panel and confirm the actual stat values (e.g. damage, armor) match expectations for the equipped set. The `GetPropertyModifier()` path uses `_setBonusResult.Modifiers` (flat, same data as before) — no regression expected, but confirm.
+
+- [ ] **Step 6: Equip and unequip a set piece**
+
+Remove one set piece below a threshold and confirm:
+- The set effect is removed from the active effects list
+- Stats revert correctly
+
+Re-equip and confirm the effect and stat values return.
+
+---
+
+## Task 6: Update Backlog
+
+**Files:**
+- Modify: `docs/backlog/improvements.md`
+
+- [ ] **Step 1: Mark IMPROVEMENT-027 as DONE**
+
+In `docs/backlog/improvements.md`, find the `## IMPROVEMENT-027` entry and change:
+
+```
+Status: TODO
+```
+
+to:
+
+```
+Status: DONE
+```
+
+- [ ] **Step 2: Commit**
+
+```
+git add docs/backlog/improvements.md
+git commit -m "docs: mark IMPROVEMENT-027 as DONE"
+```
diff --git a/docs/superpowers/plans/2026-05-24-improvement-028-equipment-set-admin-tool.md b/docs/superpowers/plans/2026-05-24-improvement-028-equipment-set-admin-tool.md
new file mode 100644
index 0000000..62f0878
--- /dev/null
+++ b/docs/superpowers/plans/2026-05-24-improvement-028-equipment-set-admin-tool.md
@@ -0,0 +1,1322 @@
+# IMPROVEMENT-028: Admin Tool Equipment Set Management — Implementation Plan
+
+> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
+
+**Goal:** Add an "Equipment Sets" tab to the Admin Tool allowing operators to create, rename, and delete equipment sets; assign module definitions to sets via a filtered picker dialog; and configure per-threshold bonus rows — all without direct DB access.
+
+**Architecture:** New `EquipmentSets/` folder in the Admin Tool project holds all row types, pick items, a DB repository, and a SQL change builder. Two new ViewModels and two new Views implement the tab and its picker dialog. Everything writes through the existing `ChangeQueue` + `RawSqlChange` pipeline. The tab is wired into `MainViewModel` and `MainWindow.xaml` last.
+
+**Tech Stack:** C# 12, .NET 8, WPF, CommunityToolkit.Mvvm (`[ObservableProperty]`, `[RelayCommand]`, `[NotifyPropertyChangedFor]`), Microsoft.Data.SqlClient.
+
+**Spec:** `docs/superpowers/specs/2026-05-24-improvement-028-equipment-set-admin-tool-design.md`
+
+---
+
+## File Map
+
+| Action | Path | Responsibility |
+|---|---|---|
+| Create | `src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetRow.cs` | Observable row for sets list |
+| Create | `src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetMemberRow.cs` | Read-only row for members |
+| Create | `src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetThresholdRow.cs` | Observable row for thresholds |
+| Create | `src/Perpetuum.AdminTool/EquipmentSets/SetMemberPickItem.cs` | Picker dialog list item |
+| Create | `src/Perpetuum.AdminTool/EquipmentSets/AggregateFieldPickItem.cs` | Aggregate field combo item |
+| Create | `src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetRepository.cs` | DB reads (sets, members, thresholds, aggregate fields) |
+| Create | `src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetChanges.cs` | `RawSqlChange` builders |
+| Create | `src/Perpetuum.AdminTool/ViewModels/AddSetMemberViewModel.cs` | Picker dialog VM |
+| Create | `src/Perpetuum.AdminTool/Views/AddSetMemberWindow.xaml` | Picker dialog XAML |
+| Create | `src/Perpetuum.AdminTool/Views/AddSetMemberWindow.xaml.cs` | Picker dialog code-behind |
+| Create | `src/Perpetuum.AdminTool/ViewModels/EquipmentSetsViewModel.cs` | Main tab VM |
+| Create | `src/Perpetuum.AdminTool/Views/EquipmentSetsView.xaml` | Main tab XAML |
+| Create | `src/Perpetuum.AdminTool/Views/EquipmentSetsView.xaml.cs` | Main tab code-behind |
+| Modify | `src/Perpetuum.AdminTool/ViewModels/MainViewModel.cs` | Add `EquipmentSets` property |
+| Modify | `src/Perpetuum.AdminTool/Views/MainWindow.xaml` | Add "Equipment Sets" TabItem |
+
+---
+
+## Task 1: Row Types and Pick Items
+
+**Files:**
+- Create: `src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetRow.cs`
+- Create: `src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetMemberRow.cs`
+- Create: `src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetThresholdRow.cs`
+- Create: `src/Perpetuum.AdminTool/EquipmentSets/SetMemberPickItem.cs`
+- Create: `src/Perpetuum.AdminTool/EquipmentSets/AggregateFieldPickItem.cs`
+
+- [ ] **Step 1: Create `EquipmentSetRow.cs`**
+
+```csharp
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Perpetuum.AdminTool.EquipmentSets
+{
+    public partial class EquipmentSetRow : ObservableObject
+    {
+        [ObservableProperty] private int _setId;
+        [ObservableProperty] private string _name = "";
+
+        public bool IsNew => SetId == 0;
+    }
+}
+```
+
+- [ ] **Step 2: Create `EquipmentSetMemberRow.cs`**
+
+```csharp
+namespace Perpetuum.AdminTool.EquipmentSets
+{
+    public class EquipmentSetMemberRow
+    {
+        public int SetId { get; init; }
+        public int Definition { get; init; }
+        public string DefinitionName { get; init; } = "";
+        public string TranslatedName { get; init; } = "";
+    }
+}
+```
+
+- [ ] **Step 3: Create `EquipmentSetThresholdRow.cs`**
+
+`AggregateFieldId` stores the raw integer. `FieldDisplay` is a resolved display string populated by the ViewModel. Both are observable so the DataGrid reacts to changes.
+
+```csharp
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Perpetuum.AdminTool.EquipmentSets
+{
+    public partial class EquipmentSetThresholdRow : ObservableObject
+    {
+        public int SetId { get; init; }
+
+        [ObservableProperty] private int _requiredPieces;
+        [ObservableProperty] private int _aggregateFieldId;
+        [ObservableProperty] private string _fieldDisplay = "";
+        [ObservableProperty] private double _bonusValue;
+    }
+}
+```
+
+- [ ] **Step 4: Create `SetMemberPickItem.cs`**
+
+```csharp
+namespace Perpetuum.AdminTool.EquipmentSets
+{
+    public class SetMemberPickItem
+    {
+        public int Definition { get; init; }
+        public string DefinitionName { get; init; } = "";
+        public string TranslatedName { get; init; } = "";
+
+        public string Display => string.IsNullOrEmpty(TranslatedName)
+            ? $"{Definition} — {DefinitionName}"
+            : $"{Definition} — {DefinitionName}  ({TranslatedName})";
+    }
+}
+```
+
+- [ ] **Step 5: Create `AggregateFieldPickItem.cs`**
+
+```csharp
+namespace Perpetuum.AdminTool.EquipmentSets
+{
+    public class AggregateFieldPickItem
+    {
+        public int Id { get; init; }
+        public string Name { get; init; } = "";
+        public string TranslatedName { get; init; } = "";
+
+        public string Display => string.IsNullOrEmpty(TranslatedName) ? Name : TranslatedName;
+    }
+}
+```
+
+- [ ] **Step 6: Build to verify compilation**
+
+```
+dotnet build src\Perpetuum.AdminTool\Perpetuum.AdminTool.csproj -c Release -p:Platform=x64
+```
+
+Expected: Build succeeded, 0 errors.
+
+- [ ] **Step 7: Commit**
+
+```
+git add src/Perpetuum.AdminTool/EquipmentSets/
+git commit -m "feat: add equipment set row types and pick items (IMPROVEMENT-028)"
+```
+
+---
+
+## Task 2: EquipmentSetRepository
+
+**Files:**
+- Create: `src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetRepository.cs`
+
+- [ ] **Step 1: Create `EquipmentSetRepository.cs`**
+
+Note: `LoadMembersAsync` joins `entitydefaults` to get `definitionname`. Translated names are resolved in the ViewModel using `TranslationsViewModel`, not here. `LoadAggregateFieldsAsync` mirrors `EntityRepository.LoadFieldsAsync` but returns a plain `List<AggregateFieldInfo>`.
+
+```csharp
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
+using Perpetuum.AdminTool.Entities;
+using Perpetuum.AdminTool.Settings;
+
+namespace Perpetuum.AdminTool.EquipmentSets
+{
+    public class EquipmentSetRepository
+    {
+        private readonly ConnectionSettings _connection;
+
+        public EquipmentSetRepository(ConnectionSettings connection)
+        {
+            _connection = connection;
+        }
+
+        public async Task<List<EquipmentSetRow>> LoadAllSetsAsync()
+        {
+            var result = new List<EquipmentSetRow>();
+            await using var cn = new SqlConnection(_connection.BuildConnectionString());
+            await cn.OpenAsync();
+            await using var cmd = cn.CreateCommand();
+            cmd.CommandText = "SELECT set_id, name FROM equipment_sets ORDER BY name";
+            await using var reader = await cmd.ExecuteReaderAsync();
+            while (await reader.ReadAsync())
+                result.Add(new EquipmentSetRow
+                {
+                    SetId = reader.GetInt32(0),
+                    Name  = reader.IsDBNull(1) ? "" : reader.GetString(1),
+                });
+            return result;
+        }
+
+        public async Task<List<EquipmentSetMemberRow>> LoadMembersAsync(int setId)
+        {
+            var result = new List<EquipmentSetMemberRow>();
+            await using var cn = new SqlConnection(_connection.BuildConnectionString());
+            await cn.OpenAsync();
+            await using var cmd = cn.CreateCommand();
+            cmd.CommandText =
+                "SELECT m.definition, ISNULL(e.definitionname, '') " +
+                "FROM equipment_set_members m " +
+                "LEFT JOIN entitydefaults e ON e.definition = m.definition " +
+                "WHERE m.set_id = @setId " +
+                "ORDER BY e.definitionname";
+            cmd.Parameters.AddWithValue("@setId", setId);
+            await using var reader = await cmd.ExecuteReaderAsync();
+            while (await reader.ReadAsync())
+                result.Add(new EquipmentSetMemberRow
+                {
+                    SetId          = setId,
+                    Definition     = reader.GetInt32(0),
+                    DefinitionName = reader.GetString(1),
+                });
+            return result;
+        }
+
+        public async Task<List<EquipmentSetThresholdRow>> LoadThresholdsAsync(int setId)
+        {
+            var result = new List<EquipmentSetThresholdRow>();
+            await using var cn = new SqlConnection(_connection.BuildConnectionString());
+            await cn.OpenAsync();
+            await using var cmd = cn.CreateCommand();
+            cmd.CommandText =
+                "SELECT required_pieces, aggregate_field, bonus_value " +
+                "FROM equipment_set_bonus_thresholds " +
+                "WHERE set_id = @setId " +
+                "ORDER BY required_pieces";
+            cmd.Parameters.AddWithValue("@setId", setId);
+            await using var reader = await cmd.ExecuteReaderAsync();
+            while (await reader.ReadAsync())
+                result.Add(new EquipmentSetThresholdRow
+                {
+                    SetId            = setId,
+                    RequiredPieces   = reader.GetInt32(0),
+                    AggregateFieldId = reader.GetInt32(1),
+                    BonusValue       = reader.GetDouble(2),
+                });
+            return result;
+        }
+
+        public async Task<List<AggregateFieldInfo>> LoadAggregateFieldsAsync()
+        {
+            var result = new List<AggregateFieldInfo>();
+            await using var cn = new SqlConnection(_connection.BuildConnectionString());
+            await cn.OpenAsync();
+            await using var cmd = cn.CreateCommand();
+            cmd.CommandText =
+                "SELECT id, name, formula, measurementunit, measurementmultiplier, " +
+                "measurementoffset, category, digits FROM aggregatefields";
+            await using var reader = await cmd.ExecuteReaderAsync();
+            while (await reader.ReadAsync())
+                result.Add(new AggregateFieldInfo
+                {
+                    Id                    = reader.GetInt32(0),
+                    Name                  = reader.IsDBNull(1) ? "" : reader.GetString(1),
+                    Formula               = reader.IsDBNull(2) ? 0  : reader.GetInt32(2),
+                    MeasurementUnit       = reader.IsDBNull(3) ? "" : reader.GetString(3),
+                    MeasurementMultiplier = reader.IsDBNull(4) ? 0d : reader.GetDouble(4),
+                    MeasurementOffset     = reader.IsDBNull(5) ? 0d : reader.GetDouble(5),
+                    Category              = reader.IsDBNull(6) ? 0  : reader.GetInt32(6),
+                    Digits                = reader.IsDBNull(7) ? 0  : reader.GetInt32(7),
+                });
+            return result;
+        }
+    }
+}
+```
+
+- [ ] **Step 2: Build to verify compilation**
+
+```
+dotnet build src\Perpetuum.AdminTool\Perpetuum.AdminTool.csproj -c Release -p:Platform=x64
+```
+
+Expected: Build succeeded, 0 errors.
+
+- [ ] **Step 3: Commit**
+
+```
+git add src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetRepository.cs
+git commit -m "feat: add EquipmentSetRepository for Admin Tool (IMPROVEMENT-028)"
+```
+
+---
+
+## Task 3: EquipmentSetChanges
+
+**Files:**
+- Create: `src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetChanges.cs`
+
+Key rules for SQL generation:
+- **Existing sets** (`setId > 0`): use the integer `set_id` directly.
+- **New/pending sets** (`setId == 0`): resolve via `(SELECT set_id FROM equipment_sets WHERE name = N'...')`.
+- Cascade DELETE never touches `entitydefaults`.
+- All string values go through `SqlLiteral.Of(...)` to escape single quotes.
+
+- [ ] **Step 1: Create `EquipmentSetChanges.cs`**
+
+```csharp
+using Perpetuum.AdminTool.Editing;
+
+namespace Perpetuum.AdminTool.EquipmentSets
+{
+    public static class EquipmentSetChanges
+    {
+        // Returns either the literal integer (existing sets) or a subquery (new sets).
+        private static string SetIdExpr(int setId, string setName) =>
+            setId > 0
+                ? setId.ToString()
+                : $"(SELECT set_id FROM equipment_sets WHERE name = {SqlLiteral.Of(setName)})";
+
+        public static IPendingChange BuildInsertSet(string name) =>
+            new RawSqlChange(
+                $"equipment_sets: insert '{name}'",
+                $"INSERT INTO equipment_sets (name) VALUES ({SqlLiteral.Of(name)})");
+
+        public static IPendingChange BuildRenameSet(int setId, string newName) =>
+            new RawSqlChange(
+                $"equipment_sets: rename id {setId} to '{newName}'",
+                $"UPDATE equipment_sets SET name = {SqlLiteral.Of(newName)} WHERE set_id = {setId}");
+
+        public static IPendingChange BuildDeleteSet(int setId, string name) =>
+            new RawSqlChange(
+                $"equipment_sets: cascade delete '{name}' (id {setId})",
+                $"DELETE FROM equipment_set_bonus_thresholds WHERE set_id = {setId};\n" +
+                $"DELETE FROM equipment_set_members             WHERE set_id = {setId};\n" +
+                $"DELETE FROM equipment_sets                    WHERE set_id = {setId}",
+                isDestructive: true);
+
+        public static IPendingChange BuildInsertMember(int setId, string setName, int definition) =>
+            new RawSqlChange(
+                $"equipment_set_members: add definition {definition} to set '{setName}'",
+                $"INSERT INTO equipment_set_members (set_id, definition) " +
+                $"VALUES ({SetIdExpr(setId, setName)}, {definition})");
+
+        public static IPendingChange BuildDeleteMember(int setId, string setName, int definition) =>
+            new RawSqlChange(
+                $"equipment_set_members: remove definition {definition} from set '{setName}'",
+                $"DELETE FROM equipment_set_members " +
+                $"WHERE set_id = {SetIdExpr(setId, setName)} AND definition = {definition}",
+                isDestructive: true);
+
+        public static IPendingChange BuildUpsertThreshold(
+            int setId, string setName, int requiredPieces, int aggregateFieldId, double bonusValue)
+        {
+            var sid = SetIdExpr(setId, setName);
+            var val = bonusValue.ToString("R", System.Globalization.CultureInfo.InvariantCulture);
+            return new RawSqlChange(
+                $"equipment_set_bonus_thresholds: upsert set '{setName}' pieces {requiredPieces}",
+                $"MERGE INTO equipment_set_bonus_thresholds AS target " +
+                $"USING (SELECT {sid} AS set_id, {requiredPieces} AS required_pieces) AS src " +
+                $"ON target.set_id = src.set_id AND target.required_pieces = src.required_pieces " +
+                $"WHEN MATCHED THEN UPDATE SET aggregate_field = {aggregateFieldId}, bonus_value = {val} " +
+                $"WHEN NOT MATCHED THEN INSERT (set_id, required_pieces, aggregate_field, bonus_value) " +
+                $"VALUES (src.set_id, {requiredPieces}, {aggregateFieldId}, {val})");
+        }
+
+        public static IPendingChange BuildDeleteThreshold(int setId, string setName, int requiredPieces) =>
+            new RawSqlChange(
+                $"equipment_set_bonus_thresholds: delete set '{setName}' pieces {requiredPieces}",
+                $"DELETE FROM equipment_set_bonus_thresholds " +
+                $"WHERE set_id = {SetIdExpr(setId, setName)} AND required_pieces = {requiredPieces}",
+                isDestructive: true);
+    }
+}
+```
+
+- [ ] **Step 2: Build to verify compilation**
+
+```
+dotnet build src\Perpetuum.AdminTool\Perpetuum.AdminTool.csproj -c Release -p:Platform=x64
+```
+
+Expected: Build succeeded, 0 errors.
+
+- [ ] **Step 3: Commit**
+
+```
+git add src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetChanges.cs
+git commit -m "feat: add EquipmentSetChanges SQL builder (IMPROVEMENT-028)"
+```
+
+---
+
+## Task 4: AddSetMemberViewModel and AddSetMemberWindow
+
+**Files:**
+- Create: `src/Perpetuum.AdminTool/ViewModels/AddSetMemberViewModel.cs`
+- Create: `src/Perpetuum.AdminTool/Views/AddSetMemberWindow.xaml`
+- Create: `src/Perpetuum.AdminTool/Views/AddSetMemberWindow.xaml.cs`
+
+The picker filters `LookupCache.Entities` to: `Enabled=true`, `Hidden=false`, `cf_robot_equipment` or descendant, excluding already-assigned definitions. Translated names come from `TranslationsViewModel.Store` using `definitionname` as the key (same as `EntitiesViewModel.TranslatedName`).
+
+`PackageItemPickItem.CategoryFlagsMask` is `internal static` in the same assembly — reuse it directly.
+
+- [ ] **Step 1: Create `AddSetMemberViewModel.cs`**
+
+```csharp
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows.Data;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Perpetuum.AdminTool.Common;
+using Perpetuum.AdminTool.EquipmentSets;
+using Perpetuum.AdminTool.Packages;
+using Perpetuum.AdminTool.Translations;
+using Perpetuum.AdminTool.ViewModels;
+using Perpetuum.ExportedTypes;
+
+namespace Perpetuum.AdminTool.ViewModels
+{
+    public partial class AddSetMemberViewModel : ObservableObject
+    {
+        private static readonly long _equipmentRoot = (long)CategoryFlags.cf_robot_equipment;
+        private static readonly long _equipmentMask = PackageItemPickItem.CategoryFlagsMask(_equipmentRoot);
+        private const int EnglishLangId = 0;
+
+        [ObservableProperty] private string _filterText = "";
+        [ObservableProperty] private SetMemberPickItem? _selectedItem;
+        [ObservableProperty] private string _errorMessage = "";
+
+        public ObservableCollection<SetMemberPickItem> Items { get; } = new();
+        public ICollectionView View { get; }
+
+        public AddSetMemberViewModel(
+            LookupCache lookups,
+            TranslationsViewModel translations,
+            IReadOnlySet<int> alreadyAssigned)
+        {
+            var store = translations.Store;
+            foreach (var e in lookups.Entities)
+            {
+                if (!e.Enabled) continue;
+                if (e.Hidden) continue;
+                if ((e.CategoryFlags & _equipmentMask) != _equipmentRoot) continue;
+                if (alreadyAssigned.Contains(e.Definition)) continue;
+
+                var translated = "";
+                if (store != null)
+                {
+                    var row = store.Rows.FirstOrDefault(r => r.Key == e.Name);
+                    translated = row?[EnglishLangId] ?? "";
+                }
+
+                Items.Add(new SetMemberPickItem
+                {
+                    Definition     = e.Definition,
+                    DefinitionName = e.Name,
+                    TranslatedName = translated,
+                });
+            }
+
+            View = CollectionViewSource.GetDefaultView(Items);
+            View.Filter = MatchesFilter;
+        }
+
+        partial void OnFilterTextChanged(string value) => View.Refresh();
+
+        private bool MatchesFilter(object obj)
+        {
+            if (obj is not SetMemberPickItem item) return false;
+            if (string.IsNullOrWhiteSpace(FilterText)) return true;
+            var f = FilterText.Trim();
+            if (int.TryParse(f, out var id)) return item.Definition == id;
+            return item.DefinitionName.Contains(f, StringComparison.OrdinalIgnoreCase)
+                || item.TranslatedName.Contains(f, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
+```
+
+- [ ] **Step 2: Create `AddSetMemberWindow.xaml`**
+
+```xml
+<Window x:Class="Perpetuum.AdminTool.Views.AddSetMemberWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Add module to set"
+        Width="560" Height="480"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="CanResizeWithGrip">
+    <DockPanel Margin="10">
+        <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal"
+                    HorizontalAlignment="Right" Margin="0,8,0,0">
+            <TextBlock VerticalAlignment="Center" Foreground="DarkRed" Margin="0,0,12,0"
+                       Text="{Binding ErrorMessage}"/>
+            <Button Content="Add" Padding="14,4" Margin="0,0,8,0" IsDefault="True" Click="OnAddClick"/>
+            <Button Content="Cancel" Padding="10,4" IsCancel="True" Click="OnCancelClick"/>
+        </StackPanel>
+
+        <TextBox DockPanel.Dock="Top"
+                 Text="{Binding FilterText, UpdateSourceTrigger=PropertyChanged, Delay=200}"
+                 Margin="0,0,0,6"
+                 xml:space="preserve">
+            <TextBox.Style>
+                <Style TargetType="TextBox">
+                    <Style.Triggers>
+                        <Trigger Property="Text" Value="">
+                            <Setter Property="Background">
+                                <Setter.Value>
+                                    <VisualBrush Stretch="None" AlignmentX="Left">
+                                        <VisualBrush.Visual>
+                                            <TextBlock Text="Filter by name or translated name..."
+                                                       Foreground="Gray" Margin="4,0"/>
+                                        </VisualBrush.Visual>
+                                    </VisualBrush>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </TextBox.Style>
+        </TextBox>
+
+        <DataGrid ItemsSource="{Binding View}"
+                  SelectedItem="{Binding SelectedItem}"
+                  AutoGenerateColumns="False"
+                  CanUserAddRows="False"
+                  CanUserDeleteRows="False"
+                  IsReadOnly="True"
+                  SelectionMode="Single"
+                  SelectionUnit="FullRow"
+                  HeadersVisibility="Column"
+                  GridLinesVisibility="Horizontal">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Def" Binding="{Binding Definition}" Width="60"/>
+                <DataGridTextColumn Header="Definition name" Binding="{Binding DefinitionName}" Width="220"/>
+                <DataGridTextColumn Header="Display name" Binding="{Binding TranslatedName}" Width="*"/>
+            </DataGrid.Columns>
+        </DataGrid>
+    </DockPanel>
+</Window>
+```
+
+- [ ] **Step 3: Create `AddSetMemberWindow.xaml.cs`**
+
+```csharp
+using System.Windows;
+using Perpetuum.AdminTool.ViewModels;
+
+namespace Perpetuum.AdminTool.Views
+{
+    public partial class AddSetMemberWindow : Window
+    {
+        public AddSetMemberWindow(AddSetMemberViewModel vm)
+        {
+            InitializeComponent();
+            DataContext = vm;
+        }
+
+        private void OnAddClick(object sender, RoutedEventArgs e)
+        {
+            var vm = (AddSetMemberViewModel)DataContext;
+            if (vm.SelectedItem == null)
+            {
+                vm.ErrorMessage = "Select a module first.";
+                return;
+            }
+            DialogResult = true;
+        }
+
+        private void OnCancelClick(object sender, RoutedEventArgs e) => DialogResult = false;
+    }
+}
+```
+
+- [ ] **Step 4: Build to verify compilation**
+
+```
+dotnet build src\Perpetuum.AdminTool\Perpetuum.AdminTool.csproj -c Release -p:Platform=x64
+```
+
+Expected: Build succeeded, 0 errors.
+
+- [ ] **Step 5: Commit**
+
+```
+git add src/Perpetuum.AdminTool/ViewModels/AddSetMemberViewModel.cs
+git add src/Perpetuum.AdminTool/Views/AddSetMemberWindow.xaml
+git add src/Perpetuum.AdminTool/Views/AddSetMemberWindow.xaml.cs
+git commit -m "feat: add AddSetMemberViewModel and picker dialog (IMPROVEMENT-028)"
+```
+
+---
+
+## Task 5: EquipmentSetsViewModel
+
+**Files:**
+- Create: `src/Perpetuum.AdminTool/ViewModels/EquipmentSetsViewModel.cs`
+
+This is the main tab VM. Key behaviours:
+- `Reload`: loads all sets + aggregate fields from DB; loads members+thresholds for selected set if any.
+- `SelectedSet` change: if `SetId > 0` → load members+thresholds from DB (with translated names and field display resolved); if `SetId == 0` → clear collections.
+- Threshold `PropertyChanged`: update `FieldDisplay` when `AggregateFieldId` changes; queue UPSERT when `RequiredPieces > 0 && AggregateFieldId > 0`.
+- Create set: validate unique name, queue `BuildInsertSet`, add pending row to `Sets`.
+- Delete set: confirm dialog, queue `BuildDeleteSet`, remove from `Sets`.
+- Rename set: validate unique name, queue `BuildRenameSet`.
+- Add member: open `AddSetMemberWindow`, on OK queue `BuildInsertMember`, add to `Members`.
+- Remove member: queue `BuildDeleteMember`, remove from `Members`.
+- Add threshold: add blank row to `Thresholds`, subscribe to its changes.
+- Remove threshold: queue `BuildDeleteThreshold` if `RequiredPieces > 0`, remove from `Thresholds`.
+
+- [ ] **Step 1: Create `EquipmentSetsViewModel.cs`**
+
+```csharp
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Perpetuum.AdminTool.Common;
+using Perpetuum.AdminTool.Editing;
+using Perpetuum.AdminTool.EquipmentSets;
+using Perpetuum.AdminTool.Settings;
+using Perpetuum.AdminTool.Translations;
+using Perpetuum.AdminTool.Views;
+
+namespace Perpetuum.AdminTool.ViewModels
+{
+    public partial class EquipmentSetsViewModel : ObservableObject
+    {
+        private readonly EquipmentSetRepository _repo;
+        private readonly ChangeQueue _queue;
+        private readonly LookupCache _lookups;
+        private readonly TranslationsViewModel _translations;
+        private const int EnglishLangId = 0;
+
+        [ObservableProperty] private bool _isLoading;
+        [ObservableProperty] private string _statusMessage = "";
+        [ObservableProperty] private bool _statusIsError;
+        [ObservableProperty] private string _newSetName = "";
+
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(HasSelection))]
+        [NotifyPropertyChangedFor(nameof(CanRename))]
+        private EquipmentSetRow? _selectedSet;
+
+        public bool HasSelection => SelectedSet != null;
+        public bool CanRename    => SelectedSet is { IsNew: false };
+
+        public ObservableCollection<EquipmentSetRow>          Sets       { get; } = new();
+        public ObservableCollection<EquipmentSetMemberRow>    Members    { get; } = new();
+        public ObservableCollection<EquipmentSetThresholdRow> Thresholds { get; } = new();
+        public ObservableCollection<AggregateFieldPickItem>   AggregateFieldOptions { get; } = new();
+
+        public EquipmentSetsViewModel(
+            EquipmentSetRepository repo,
+            ChangeQueue queue,
+            LookupCache lookups,
+            TranslationsViewModel translations)
+        {
+            _repo         = repo;
+            _queue        = queue;
+            _lookups      = lookups;
+            _translations = translations;
+        }
+
+        partial void OnSelectedSetChanged(EquipmentSetRow? value)
+        {
+            _ = LoadSetDetailAsync(value);
+        }
+
+        // ── Reload ───────────────────────────────────────────────────────────
+
+        public async Task ReloadAsync()
+        {
+            IsLoading    = true;
+            StatusMessage  = "";
+            StatusIsError  = false;
+            try
+            {
+                var sets    = await _repo.LoadAllSetsAsync();
+                var fields  = await _repo.LoadAggregateFieldsAsync();
+                var store   = _translations.Store;
+
+                Sets.Clear();
+                foreach (var s in sets) Sets.Add(s);
+
+                AggregateFieldOptions.Clear();
+                foreach (var f in fields
+                    .Select(f =>
+                    {
+                        var translated = "";
+                        if (store != null)
+                        {
+                            var row = store.Rows.FirstOrDefault(r => r.Key == f.Name);
+                            translated = row?[EnglishLangId] ?? "";
+                        }
+                        return new AggregateFieldPickItem { Id = f.Id, Name = f.Name, TranslatedName = translated };
+                    })
+                    .OrderBy(f => f.Display, StringComparer.OrdinalIgnoreCase))
+                {
+                    AggregateFieldOptions.Add(f);
+                }
+
+                // Reload detail for currently selected set if still present
+                var reselect = SelectedSet != null
+                    ? Sets.FirstOrDefault(s => s.SetId == SelectedSet.SetId)
+                    : null;
+                SelectedSet = reselect;
+            }
+            catch (Exception ex)
+            {
+                StatusIsError = true;
+                StatusMessage = $"Reload failed: {ex.Message}";
+            }
+            finally { IsLoading = false; }
+        }
+
+        // ── Set detail load ───────────────────────────────────────────────────
+
+        private async Task LoadSetDetailAsync(EquipmentSetRow? set)
+        {
+            Members.Clear();
+            foreach (var t in Thresholds) t.PropertyChanged -= OnThresholdPropertyChanged;
+            Thresholds.Clear();
+
+            if (set == null || set.IsNew) return;
+
+            IsLoading = true;
+            try
+            {
+                var store    = _translations.Store;
+                var members  = await _repo.LoadMembersAsync(set.SetId);
+                var thresholds = await _repo.LoadThresholdsAsync(set.SetId);
+
+                foreach (var m in members)
+                {
+                    var translated = "";
+                    if (store != null)
+                    {
+                        var row = store.Rows.FirstOrDefault(r => r.Key == m.DefinitionName);
+                        translated = row?[EnglishLangId] ?? "";
+                    }
+                    Members.Add(new EquipmentSetMemberRow
+                    {
+                        SetId          = m.SetId,
+                        Definition     = m.Definition,
+                        DefinitionName = m.DefinitionName,
+                        TranslatedName = translated,
+                    });
+                }
+
+                foreach (var t in thresholds)
+                {
+                    var display = AggregateFieldOptions
+                        .FirstOrDefault(f => f.Id == t.AggregateFieldId)?.Display
+                        ?? t.AggregateFieldId.ToString();
+                    var row = new EquipmentSetThresholdRow
+                    {
+                        SetId            = t.SetId,
+                        RequiredPieces   = t.RequiredPieces,
+                        AggregateFieldId = t.AggregateFieldId,
+                        FieldDisplay     = display,
+                        BonusValue       = t.BonusValue,
+                    };
+                    row.PropertyChanged += OnThresholdPropertyChanged;
+                    Thresholds.Add(row);
+                }
+            }
+            catch (Exception ex)
+            {
+                StatusIsError = true;
+                StatusMessage = $"Failed to load set detail: {ex.Message}";
+            }
+            finally { IsLoading = false; }
+        }
+
+        // ── Threshold PropertyChanged → auto-UPSERT ───────────────────────────
+
+        private void OnThresholdPropertyChanged(object? sender, PropertyChangedEventArgs e)
+        {
+            if (sender is not EquipmentSetThresholdRow row) return;
+            if (SelectedSet == null) return;
+
+            if (e.PropertyName == nameof(EquipmentSetThresholdRow.AggregateFieldId))
+            {
+                row.FieldDisplay = AggregateFieldOptions
+                    .FirstOrDefault(f => f.Id == row.AggregateFieldId)?.Display
+                    ?? row.AggregateFieldId.ToString();
+            }
+
+            if (row.RequiredPieces > 0 && row.AggregateFieldId > 0)
+            {
+                _queue.Add(EquipmentSetChanges.BuildUpsertThreshold(
+                    SelectedSet.SetId, SelectedSet.Name,
+                    row.RequiredPieces, row.AggregateFieldId, row.BonusValue));
+            }
+        }
+
+        // ── Create set ────────────────────────────────────────────────────────
+
+        [RelayCommand]
+        private void CreateSet()
+        {
+            var name = NewSetName.Trim();
+            if (string.IsNullOrEmpty(name))
+            {
+                SetStatus("Set name is required.", isError: true);
+                return;
+            }
+            if (Sets.Any(s => string.Equals(s.Name, name, StringComparison.OrdinalIgnoreCase)))
+            {
+                SetStatus($"A set named '{name}' already exists.", isError: true);
+                return;
+            }
+            _queue.Add(EquipmentSetChanges.BuildInsertSet(name));
+            var row = new EquipmentSetRow { SetId = 0, Name = name };
+            Sets.Add(row);
+            SelectedSet = row;
+            NewSetName  = "";
+            SetStatus($"'{name}' queued for insert. Commit to persist.", isError: false);
+        }
+
+        // ── Delete set ────────────────────────────────────────────────────────
+
+        [RelayCommand(CanExecute = nameof(HasSelection))]
+        private void DeleteSet()
+        {
+            if (SelectedSet == null) return;
+            var memberCount    = Members.Count;
+            var thresholdCount = Thresholds.Count;
+            var msg =
+                $"Delete set '{SelectedSet.Name}'?\n\n" +
+                $"This will also remove {memberCount} member(s) and {thresholdCount} threshold row(s).\n\n" +
+                "Continue?";
+            if (MessageBox.Show(msg, "Delete set", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No)
+                != MessageBoxResult.Yes) return;
+
+            _queue.Add(EquipmentSetChanges.BuildDeleteSet(SelectedSet.SetId, SelectedSet.Name));
+            Sets.Remove(SelectedSet);
+            SelectedSet = null;
+        }
+
+        // ── Rename set ────────────────────────────────────────────────────────
+
+        [RelayCommand(CanExecute = nameof(CanRename))]
+        private void RenameSet(string newName)
+        {
+            if (SelectedSet == null) return;
+            newName = newName.Trim();
+            if (string.IsNullOrEmpty(newName))
+            {
+                SetStatus("New name is required.", isError: true);
+                return;
+            }
+            if (Sets.Any(s => !ReferenceEquals(s, SelectedSet) &&
+                              string.Equals(s.Name, newName, StringComparison.OrdinalIgnoreCase)))
+            {
+                SetStatus($"A set named '{newName}' already exists.", isError: true);
+                return;
+            }
+            _queue.Add(EquipmentSetChanges.BuildRenameSet(SelectedSet.SetId, newName));
+            SelectedSet.Name = newName;
+            SetStatus($"Rename to '{newName}' queued.", isError: false);
+        }
+
+        // ── Add member ────────────────────────────────────────────────────────
+
+        public void AddMember(Window owner)
+        {
+            if (SelectedSet == null) return;
+            var assigned = Members.Select(m => m.Definition).ToHashSet();
+            var vm  = new AddSetMemberViewModel(_lookups, _translations, assigned);
+            var win = new AddSetMemberWindow(vm) { Owner = owner };
+            if (win.ShowDialog() != true || vm.SelectedItem == null) return;
+
+            var item = vm.SelectedItem;
+            _queue.Add(EquipmentSetChanges.BuildInsertMember(SelectedSet.SetId, SelectedSet.Name, item.Definition));
+            Members.Add(new EquipmentSetMemberRow
+            {
+                SetId          = SelectedSet.SetId,
+                Definition     = item.Definition,
+                DefinitionName = item.DefinitionName,
+                TranslatedName = item.TranslatedName,
+            });
+        }
+
+        // ── Remove member ─────────────────────────────────────────────────────
+
+        [RelayCommand]
+        private void RemoveMember(EquipmentSetMemberRow row)
+        {
+            if (SelectedSet == null) return;
+            _queue.Add(EquipmentSetChanges.BuildDeleteMember(SelectedSet.SetId, SelectedSet.Name, row.Definition));
+            Members.Remove(row);
+        }
+
+        // ── Add threshold ─────────────────────────────────────────────────────
+
+        [RelayCommand]
+        private void AddThreshold()
+        {
+            var row = new EquipmentSetThresholdRow { SetId = SelectedSet?.SetId ?? 0 };
+            row.PropertyChanged += OnThresholdPropertyChanged;
+            Thresholds.Add(row);
+        }
+
+        // ── Remove threshold ──────────────────────────────────────────────────
+
+        [RelayCommand]
+        private void RemoveThreshold(EquipmentSetThresholdRow row)
+        {
+            if (SelectedSet != null && row.RequiredPieces > 0 && row.AggregateFieldId > 0)
+                _queue.Add(EquipmentSetChanges.BuildDeleteThreshold(
+                    SelectedSet.SetId, SelectedSet.Name, row.RequiredPieces));
+            row.PropertyChanged -= OnThresholdPropertyChanged;
+            Thresholds.Remove(row);
+        }
+
+        // ── Helpers ───────────────────────────────────────────────────────────
+
+        private void SetStatus(string message, bool isError)
+        {
+            StatusMessage = message;
+            StatusIsError = isError;
+        }
+    }
+}
+```
+
+- [ ] **Step 2: Build to verify compilation**
+
+```
+dotnet build src\Perpetuum.AdminTool\Perpetuum.AdminTool.csproj -c Release -p:Platform=x64
+```
+
+Expected: Build succeeded, 0 errors.
+
+- [ ] **Step 3: Commit**
+
+```
+git add src/Perpetuum.AdminTool/ViewModels/EquipmentSetsViewModel.cs
+git commit -m "feat: add EquipmentSetsViewModel (IMPROVEMENT-028)"
+```
+
+---
+
+## Task 6: EquipmentSetsView
+
+**Files:**
+- Create: `src/Perpetuum.AdminTool/Views/EquipmentSetsView.xaml`
+- Create: `src/Perpetuum.AdminTool/Views/EquipmentSetsView.xaml.cs`
+
+Layout: top info bar → two-column Grid (left = sets list + create/delete, right = set detail with members and thresholds). Right panel is collapsed when `HasSelection` is false. Status message follows existing red/grey pattern.
+
+The threshold DataGrid uses a `BindingProxy` (already in `Common`) to reach `AggregateFieldOptions` from inside the DataGrid cell editing template.
+
+- [ ] **Step 1: Create `EquipmentSetsView.xaml`**
+
+```xml
+<UserControl x:Class="Perpetuum.AdminTool.Views.EquipmentSetsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:common="clr-namespace:Perpetuum.AdminTool.Common"
+             xmlns:vm="clr-namespace:Perpetuum.AdminTool.ViewModels"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d"
+             d:DataContext="{d:DesignInstance Type=vm:EquipmentSetsViewModel}">
+
+    <UserControl.Resources>
+        <common:BindingProxy x:Key="VmProxy" Data="{Binding}"/>
+        <BooleanToVisibilityConverter x:Key="BoolToVis"/>
+    </UserControl.Resources>
+
+    <DockPanel>
+
+        <!-- Top info bar -->
+        <Border DockPanel.Dock="Top" Background="#FFF8E1" Padding="8,6"
+                BorderBrush="#FFD54F" BorderThickness="0,0,0,1">
+            <DockPanel>
+                <Button DockPanel.Dock="Right" Content="Reload" Padding="10,2"
+                        Click="OnReloadClick"
+                        IsEnabled="{Binding IsLoading, Converter={x:Static common:InverseBoolConverter.Instance}}"/>
+                <TextBlock VerticalAlignment="Center" Foreground="#795548"
+                           Text="⚠  Changes take effect after server restart."/>
+            </DockPanel>
+        </Border>
+
+        <!-- Status message -->
+        <Border DockPanel.Dock="Top" Padding="8,4" Background="#F8F8F8"
+                BorderBrush="#DDD" BorderThickness="0,0,0,1"
+                Visibility="{Binding StatusMessage, Converter={x:Static common:NullOrEmptyToCollapsedConverter.Instance}}">
+            <TextBlock Text="{Binding StatusMessage}">
+                <TextBlock.Style>
+                    <Style TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="DimGray"/>
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding StatusIsError}" Value="True">
+                                <Setter Property="Foreground" Value="DarkRed"/>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBlock.Style>
+            </TextBlock>
+        </Border>
+
+        <!-- Body: left + right panels -->
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="220" MinWidth="120"/>
+                <ColumnDefinition Width="5"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <!-- Left: sets list -->
+            <DockPanel Grid.Column="0" Margin="6">
+                <!-- Create area at bottom -->
+                <StackPanel DockPanel.Dock="Bottom" Margin="0,6,0,0">
+                    <DockPanel Margin="0,0,0,4">
+                        <Button DockPanel.Dock="Right" Content="Create" Padding="8,2"
+                                Margin="4,0,0,0" Click="OnCreateSetClick"/>
+                        <TextBox Text="{Binding NewSetName, UpdateSourceTrigger=PropertyChanged}"
+                                 ToolTip="New set name"/>
+                    </DockPanel>
+                    <Button Content="Delete set" Padding="8,2" Foreground="DarkRed"
+                            IsEnabled="{Binding HasSelection}"
+                            Click="OnDeleteSetClick"/>
+                </StackPanel>
+
+                <ListBox ItemsSource="{Binding Sets}"
+                         SelectedItem="{Binding SelectedSet}"
+                         DisplayMemberPath="Name"/>
+            </DockPanel>
+
+            <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" Background="#DDD"/>
+
+            <!-- Right: set detail -->
+            <ScrollViewer Grid.Column="2" VerticalScrollBarVisibility="Auto"
+                          Visibility="{Binding HasSelection, Converter={StaticResource BoolToVis}}">
+                <StackPanel Margin="10">
+
+                    <!-- Name + Rename -->
+                    <TextBlock Text="Set name" FontWeight="Bold" Margin="0,0,0,4"/>
+                    <DockPanel Margin="0,0,0,16">
+                        <Button DockPanel.Dock="Right" Content="Rename" Padding="8,2"
+                                Margin="6,0,0,0"
+                                IsEnabled="{Binding CanRename}"
+                                Click="OnRenameSetClick"/>
+                        <TextBox x:Name="RenameBox"
+                                 Text="{Binding SelectedSet.Name, UpdateSourceTrigger=PropertyChanged}"/>
+                    </DockPanel>
+
+                    <!-- Members -->
+                    <DockPanel Margin="0,0,0,4">
+                        <Button DockPanel.Dock="Right" Content="Add member" Padding="8,2"
+                                Click="OnAddMemberClick"/>
+                        <TextBlock Text="Members" FontWeight="Bold" VerticalAlignment="Center"/>
+                    </DockPanel>
+                    <DataGrid ItemsSource="{Binding Members}"
+                              AutoGenerateColumns="False"
+                              CanUserAddRows="False"
+                              CanUserDeleteRows="False"
+                              IsReadOnly="True"
+                              HeadersVisibility="Column"
+                              GridLinesVisibility="Horizontal"
+                              MaxHeight="200"
+                              Margin="0,0,0,16">
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Header="Def" Binding="{Binding Definition}" Width="60"/>
+                            <DataGridTextColumn Header="Definition name" Binding="{Binding DefinitionName}" Width="200"/>
+                            <DataGridTextColumn Header="Display name" Binding="{Binding TranslatedName}" Width="*"/>
+                            <DataGridTemplateColumn Width="70">
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <Button Content="Remove" Padding="4,1" Foreground="DarkRed"
+                                                Command="{Binding Source={StaticResource VmProxy}, Path=Data.RemoveMemberCommand}"
+                                                CommandParameter="{Binding}"/>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn>
+                        </DataGrid.Columns>
+                    </DataGrid>
+
+                    <!-- Bonus Thresholds -->
+                    <DockPanel Margin="0,0,0,4">
+                        <Button DockPanel.Dock="Right" Content="Add threshold" Padding="8,2"
+                                Command="{Binding AddThresholdCommand}"/>
+                        <TextBlock Text="Bonus Thresholds" FontWeight="Bold" VerticalAlignment="Center"/>
+                    </DockPanel>
+                    <DataGrid ItemsSource="{Binding Thresholds}"
+                              AutoGenerateColumns="False"
+                              CanUserAddRows="False"
+                              CanUserDeleteRows="False"
+                              HeadersVisibility="Column"
+                              GridLinesVisibility="Horizontal"
+                              Margin="0,0,0,4">
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Header="Pieces" Width="60"
+                                                Binding="{Binding RequiredPieces, UpdateSourceTrigger=LostFocus}"/>
+                            <DataGridTemplateColumn Header="Aggregate field" Width="*" SortMemberPath="FieldDisplay">
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <TextBlock Text="{Binding FieldDisplay}" Margin="4,0" VerticalAlignment="Center"/>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                                <DataGridTemplateColumn.CellEditingTemplate>
+                                    <DataTemplate>
+                                        <ComboBox ItemsSource="{Binding Source={StaticResource VmProxy}, Path=Data.AggregateFieldOptions}"
+                                                  DisplayMemberPath="Display"
+                                                  SelectedValuePath="Id"
+                                                  IsEditable="True"
+                                                  IsTextSearchEnabled="True"
+                                                  TextSearch.TextPath="Display"
+                                                  SelectedValue="{Binding AggregateFieldId, UpdateSourceTrigger=PropertyChanged}"/>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellEditingTemplate>
+                            </DataGridTemplateColumn>
+                            <DataGridTextColumn Header="Bonus value" Width="100"
+                                                Binding="{Binding BonusValue, UpdateSourceTrigger=LostFocus}"/>
+                            <DataGridTemplateColumn Width="50">
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <Button Content="×" Padding="4,1" Foreground="DarkRed"
+                                                Command="{Binding Source={StaticResource VmProxy}, Path=Data.RemoveThresholdCommand}"
+                                                CommandParameter="{Binding}"/>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn>
+                        </DataGrid.Columns>
+                    </DataGrid>
+
+                </StackPanel>
+            </ScrollViewer>
+
+            <!-- Placeholder when nothing selected -->
+            <TextBlock Grid.Column="2" Text="Select a set to view details."
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       Foreground="DimGray"
+                       Visibility="{Binding HasSelection, Converter={StaticResource BoolToVis}}">
+                <TextBlock.Style>
+                    <Style TargetType="TextBlock">
+                        <Setter Property="Visibility" Value="Visible"/>
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding HasSelection}" Value="True">
+                                <Setter Property="Visibility" Value="Collapsed"/>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBlock.Style>
+            </TextBlock>
+
+        </Grid>
+    </DockPanel>
+</UserControl>
+```
+
+**Important:** The status border uses `NullOrEmptyToCollapsedConverter`. Check if this converter exists in `Common/`. If not, replace that `Visibility` binding with a direct binding to `StatusIsError` or just always show the status bar (remove the `Visibility` attribute from the status `Border`).
+
+To check: run `grep -r "NullOrEmptyToCollapsed" src/Perpetuum.AdminTool/` — if not found, remove the `Visibility` attribute from the status `Border`.
+
+- [ ] **Step 2: Check for `NullOrEmptyToCollapsedConverter` and fix if missing**
+
+```
+grep -r "NullOrEmptyToCollapsed" src/Perpetuum.AdminTool/
+```
+
+If not found: remove the `Visibility="{Binding StatusMessage, Converter=...}"` attribute from the status `Border` in `EquipmentSetsView.xaml` — the status bar will always be visible (same as how NpcLootView handles it: always-visible status text).
+
+- [ ] **Step 3: Create `EquipmentSetsView.xaml.cs`**
+
+```csharp
+using System.Windows;
+using System.Windows.Controls;
+using Perpetuum.AdminTool.ViewModels;
+
+namespace Perpetuum.AdminTool.Views
+{
+    public partial class EquipmentSetsView : UserControl
+    {
+        public EquipmentSetsView()
+        {
+            InitializeComponent();
+        }
+
+        private EquipmentSetsViewModel Vm => (EquipmentSetsViewModel)DataContext;
+
+        private async void OnReloadClick(object sender, RoutedEventArgs e)
+        {
+            await Vm.ReloadAsync();
+        }
+
+        private void OnCreateSetClick(object sender, RoutedEventArgs e)
+        {
+            Vm.CreateSetCommand.Execute(null);
+        }
+
+        private void OnDeleteSetClick(object sender, RoutedEventArgs e)
+        {
+            Vm.DeleteSetCommand.Execute(null);
+        }
+
+        private void OnRenameSetClick(object sender, RoutedEventArgs e)
+        {
+            Vm.RenameSetCommand.Execute(RenameBox.Text);
+        }
+
+        private void OnAddMemberClick(object sender, RoutedEventArgs e)
+        {
+            Vm.AddMember(Window.GetWindow(this)!);
+        }
+    }
+}
+```
+
+- [ ] **Step 4: Build to verify compilation**
+
+```
+dotnet build src\Perpetuum.AdminTool\Perpetuum.AdminTool.csproj -c Release -p:Platform=x64
+```
+
+Expected: Build succeeded, 0 errors. Fix any XAML binding errors reported at this stage.
+
+- [ ] **Step 5: Commit**
+
+```
+git add src/Perpetuum.AdminTool/Views/EquipmentSetsView.xaml
+git add src/Perpetuum.AdminTool/Views/EquipmentSetsView.xaml.cs
+git commit -m "feat: add EquipmentSetsView XAML and code-behind (IMPROVEMENT-028)"
+```
+
+---
+
+## Task 7: Wire MainViewModel + MainWindow and Final Validation
+
+**Files:**
+- Modify: `src/Perpetuum.AdminTool/ViewModels/MainViewModel.cs`
+- Modify: `src/Perpetuum.AdminTool/Views/MainWindow.xaml`
+
+- [ ] **Step 1: Add `EquipmentSets` property to `MainViewModel.cs`**
+
+Add the property declaration after `SeasonsViewModel Seasons`:
+
+```csharp
+public EquipmentSetsViewModel EquipmentSets { get; }
+```
+
+Add construction in the constructor, after the `Seasons = new SeasonsViewModel(...)` block:
+
+```csharp
+EquipmentSets = new EquipmentSetsViewModel(
+    new EquipmentSetRepository(store.Settings.Connection),
+    session.Changes,
+    session.Lookups,
+    Translations);
+```
+
+Also add the required using:
+```csharp
+using Perpetuum.AdminTool.EquipmentSets;
+```
+
+- [ ] **Step 2: Add the TabItem to `MainWindow.xaml`**
+
+Insert between the `<TabItem Header="Seasons">` block and `<TabItem Header="Translations">`:
+
+```xml
+<TabItem Header="Equipment Sets">
+    <views:EquipmentSetsView DataContext="{Binding EquipmentSets}"/>
+</TabItem>
+```
+
+- [ ] **Step 3: Build the full solution to verify no regressions**
+
+```
+dotnet build PerpetuumServer2.sln -c Release -p:Platform=x64
+```
+
+Expected: Build succeeded, 0 errors.
+
+- [ ] **Step 4: Commit**
+
+```
+git add src/Perpetuum.AdminTool/ViewModels/MainViewModel.cs
+git add src/Perpetuum.AdminTool/Views/MainWindow.xaml
+git commit -m "feat: wire Equipment Sets tab into MainViewModel and MainWindow (IMPROVEMENT-028)"
+```
+
+- [ ] **Step 5: Manual validation — create a new set end-to-end**
+
+Start the Admin Tool connected to the game DB.
+
+1. Open the "Equipment Sets" tab. Verify it loads without error, sets list shows existing sets (e.g., `set_striker`).
+2. Type `set_test` in the name box → click "Create set". Verify `set_test` appears in the list with italic/pending appearance. Verify a pending change entry appears in the Pending Changes tab.
+3. With `set_test` selected: click "Add member". Verify the picker dialog opens, shows only enabled non-hidden `cf_robot_equipment` items (no robots, ammo, or materials visible), and shows translated names where available.
+4. Search for a known module name. Select it. Click "Add". Verify the member row appears in the Members DataGrid.
+5. Click "Add threshold". Verify a new row appears in the Thresholds DataGrid. Enter `2` for Pieces, select an aggregate field from the ComboBox (verify display name shows translation), enter `0.05` for Bonus Value. Tab out. Verify a UPSERT pending change was queued.
+6. Commit (Apply mode: Direct or Script). Reload. Verify `set_test`, its member, and its threshold all appear correctly in the DB and in the tab after reload.
+7. Rename `set_test` → `set_test_renamed`. Verify the rename is queued. Commit and reload. Verify the new name.
+8. Delete `set_test_renamed`. Verify the confirmation dialog shows correct member/threshold counts. Confirm. Reload. Verify the set is gone from the list. Open a DB query tool and confirm `entitydefaults` is unchanged.
+9. Attempt to create a set with a name that already exists. Verify the inline error message appears and no duplicate queue entry is created.
+10. Attempt to add a threshold with a `required_pieces` value already used for that set. Verify the existing UPSERT queuing replaces the effective value (last queued wins).
+
+- [ ] **Step 6: Update backlog**
+
+In `docs/backlog/improvements.md`, change `IMPROVEMENT-028` status from `TODO` to `DONE`.
+
+```
+git add docs/backlog/improvements.md
+git commit -m "docs: mark IMPROVEMENT-028 as DONE"
+```
+
+---
+
+## Self-Review Notes
+
+- **Spec §6.1 delete confirmation counts**: `DeleteSetCommand` reads `Members.Count` and `Thresholds.Count` from in-memory collections — covered in Task 5.
+- **Spec §5.4 rename disabled for new sets**: `CanRename` returns `SelectedSet is { IsNew: false }` — covered in Task 5.
+- **Spec §5.2 name-subquery for new sets**: `SetIdExpr` in `EquipmentSetChanges` — covered in Task 3.
+- **Spec §6.2 category filter**: `_equipmentMask` check in `AddSetMemberViewModel` — covered in Task 4.
+- **Spec §6.2 translation in picker**: resolved at construction time in `AddSetMemberViewModel` — covered in Task 4.
+- **Spec §7.1 `AggregateFieldOptions` with translation**: resolved in `ReloadAsync` — covered in Task 5.
+- **Potential issue in Task 6 XAML**: `NullOrEmptyToCollapsedConverter` may not exist — Step 2 explicitly handles this with a grep check.
diff --git a/docs/superpowers/specs/2026-05-23-improvement-024-design.md b/docs/superpowers/specs/2026-05-23-improvement-024-design.md
new file mode 100644
index 0000000..bd333a2
--- /dev/null
+++ b/docs/superpowers/specs/2026-05-23-improvement-024-design.md
@@ -0,0 +1,187 @@
+# IMPROVEMENT-024 Design — Server Restart Announcement & Admin Tool Daily Stats
+
+Date: 2026-05-23  
+Status: Approved
+
+---
+
+## Overview
+
+Two independent improvements to daily objective visibility:
+
+1. **Server restart announcement** — on cold boot, if an active season with a daily pool is configured, announce today's active daily objectives to all players via the existing Seasons Info channel.
+2. **Admin Tool Statistics tab** — add a "Today's Daily Objectives" section showing today's active pool and per-objective completion counts.
+
+---
+
+## Architecture
+
+Both sub-features are additive. Neither requires new DB tables, new interfaces, or new server request handlers.
+
+Sub-feature 1 is a 4-line guard added to `SeasonService.RefreshCache()`.
+
+Sub-feature 2 adds one new method to the Admin Tool's `SeasonRepository`, one new collection to `SeasonStatisticsViewModel`, and one new XAML section in `SeasonDetailView.xaml`. The daily pool is computed in C# using the same deterministic seeded algorithm as the server — no DB materialization required because the algorithm is pure and side-effect-free.
+
+---
+
+## Sub-feature 1 — Server Restart Announcement
+
+### Affected file
+
+`src/Perpetuum/Services/Seasons/SeasonService.cs`
+
+### Change
+
+In `RefreshCache()`, the pool computation branch currently computes the pool silently on cold boot. Add an `isColdBoot` guard that fires `AnnounceDailyPool()` exactly once per server start:
+
+```csharp
+else if (previous?.Id != season.Id || _dailyPool.Date == DateOnly.MinValue)
+{
+    bool isColdBoot = _dailyPool.Date == DateOnly.MinValue;
+    var today = DateOnly.FromDateTime(DateTime.UtcNow);
+    _dailyPool = new DailyPool(SelectDailyPool(season, _activeObjectives, today), today);
+    if (isColdBoot)
+    {
+        int totalDaily = _activeObjectives.Count(o => o.IsDaily);
+        var poolObjs = _activeObjectives.Where(o => _dailyPool.Ids.Contains(o.Id)).ToList();
+        if (poolObjs.Count > 0)
+            AnnounceDailyPool(poolObjs, totalDaily);
+    }
+}
+```
+
+### Behaviour
+
+- Fires only when `_dailyPool.Date == DateOnly.MinValue` before the update — i.e., the server has just started cold.
+- Does not fire on the 5-minute periodic `RefreshCache` calls within the same day.
+- Does not fire when a season activates mid-day (only fires at server start).
+- If no active season or no daily objectives are configured, the guard never reaches `AnnounceDailyPool` — silent no-op.
+- `AnnounceDailyPool` already exists and is called identically from the daily rollover in `Update()`.
+
+---
+
+## Sub-feature 2 — Admin Tool Season Statistics: Today's Daily Objectives
+
+### New row type
+
+**File:** `src/Perpetuum.AdminTool/Seasons/TodaysDailyObjectiveRow.cs`
+
+```csharp
+public record TodaysDailyObjectiveRow(
+    string Name,
+    SeasonActivityType ActivityType,
+    long TargetValue,
+    int CompletionsToday);
+```
+
+### SeasonRepository — new method
+
+**File:** `src/Perpetuum.AdminTool/Seasons/SeasonRepository.cs`
+
+```csharp
+public async Task<List<TodaysDailyObjectiveRow>> LoadTodaysDailyObjectivesAsync(int seasonId)
+```
+
+**Algorithm:**
+
+1. Load `daily_objectives_per_day` for the season from the `seasons` table.
+2. Load all `is_daily = 1` objectives for the season from `season_objectives`.
+3. If no daily objectives exist, return empty list.
+4. Compute today's pool IDs using the same seeded Fisher-Yates shuffle as the server:
+   - `seed = seasonId * 397 ^ DateOnly.FromDateTime(DateTime.UtcNow).DayNumber`
+   - Shuffle the daily objectives list with `new Random(seed)`
+   - Take first `daily_objectives_per_day` entries (or all if `daily_objectives_per_day` is null or >= count)
+4a. If the resulting pool is empty, return an empty list immediately — do not proceed to the SQL query (avoids constructing an invalid `IN ()` clause).
+5. Query completion counts for those IDs only:
+
+```sql
+SELECT o.name, o.activity_type, o.target_value,
+       COUNT(DISTINCT p.character_id) AS completions_today
+FROM season_objectives o
+LEFT JOIN season_objective_progress p
+    ON p.objective_id = o.id
+   AND p.season_id = @seasonId
+   AND p.day_window = CAST(GETUTCDATE() AS date)
+   AND p.completed = 1
+WHERE o.season_id = @seasonId
+  AND o.id IN (<pool_ids>)
+GROUP BY o.id, o.name, o.activity_type, o.target_value, o.display_order
+ORDER BY o.display_order
+```
+
+Pool IDs are parameterised into the `IN` clause from the C# shuffle result.
+
+### SeasonStatisticsViewModel
+
+**File:** `src/Perpetuum.AdminTool/ViewModels/SeasonStatisticsViewModel.cs`
+
+Add:
+
+```csharp
+public ObservableCollection<TodaysDailyObjectiveRow> TodaysDailyObjectives { get; } = new();
+```
+
+In `LoadAsync`, after the existing `ObjectiveCompletion` load:
+
+```csharp
+TodaysDailyObjectives.Clear();
+foreach (var r in await _repo.LoadTodaysDailyObjectivesAsync(seasonId))
+    TodaysDailyObjectives.Add(r);
+```
+
+### SeasonDetailView.xaml
+
+**File:** `src/Perpetuum.AdminTool/Views/SeasonDetailView.xaml`
+
+Append a new section after the existing "Objective Completion Rates" `DataGrid`. The section is hidden when `TodaysDailyObjectives` is empty:
+
+```
+Today's Daily Objectives
+┌─────────────────────┬──────────────────┬──────────┬─────────────────┐
+│ Objective           │ Activity Type    │ Target   │ Completed Today │
+├─────────────────────┼──────────────────┼──────────┼─────────────────┤
+│ Kill 10 NPCs        │ NPC Kill         │ 10       │ 42              │
+└─────────────────────┴──────────────────┴──────────┴─────────────────┘
+```
+
+Visibility is bound to `TodaysDailyObjectives.Count > 0` via a converter or `DataTrigger` — no error state, silent absence when the season has no daily pool.
+
+---
+
+## Dependencies
+
+- Requires IMPROVEMENT-006 (daily objective infrastructure: `season_objectives.is_daily`, `season_objective_progress.day_window`, `season_objectives.daily_objectives_per_day` on `seasons`).
+- No dependency on IMPROVEMENT-022 — pool selection logic is already fully implemented in `SeasonService.SelectDailyPool()` and replicated here.
+
+---
+
+## Out of Scope
+
+- Historical per-day completion stats (only today's window is shown).
+- Retroactive announcement when a season activates after server start.
+- Any changes to `ISeasonService` or the game protocol.
+
+---
+
+## Manual Validation Steps
+
+**Sub-feature 1:**
+1. Configure a season with `daily_objectives_per_day` set and at least one `is_daily` objective.
+2. Start the server cold. Verify an announcement appears in the Seasons Info channel listing today's pool objectives.
+3. Wait for or trigger the 5-minute `RefreshCache` cycle. Verify no duplicate announcement fires.
+4. Restart the server again the next UTC day. Verify the announcement reflects the new day's pool.
+5. Start the server with no active season. Verify no announcement fires.
+
+**Sub-feature 2:**
+1. Open the Admin Tool, navigate to a season with daily objectives and `daily_objectives_per_day` configured.
+2. Go to Statistics tab → click Refresh.
+3. Verify "Today's Daily Objectives" section appears with the correct pool size.
+4. Verify completion counts match raw DB counts in `season_objective_progress` for today's `day_window`.
+5. Navigate to a season with no daily objectives. Verify the section is absent.
+
+---
+
+## Potential Regressions
+
+- `RefreshCache()` is called from `SendActivationMailToOnlineCharacters()` (which calls `RefreshCache()` directly). Since `_dailyPool.Date` will not be `DateOnly.MinValue` at that point, the announcement guard will not fire — correct.
+- The seeded shuffle in the Admin Tool must use identical logic to `SeasonService.SelectDailyPool()`. Any future change to the server-side seed formula must be mirrored in the Admin Tool method.
diff --git a/docs/superpowers/specs/2026-05-23-improvement-025-equipment-set-bonuses-design.md b/docs/superpowers/specs/2026-05-23-improvement-025-equipment-set-bonuses-design.md
new file mode 100644
index 0000000..fe7bce8
--- /dev/null
+++ b/docs/superpowers/specs/2026-05-23-improvement-025-equipment-set-bonuses-design.md
@@ -0,0 +1,287 @@
+# IMPROVEMENT-025: Equipment Set Synergy Bonuses — Design Spec
+
+**Date:** 2026-05-23
+**Status:** Approved
+**Branch:** p36.2
+
+---
+
+## Overview
+
+Introduce an equipment set mechanic: modules belonging to the same named set grant additional stat bonuses that scale with the number of set pieces fitted. Bonuses are threshold-based (2-piece unlocks one bonus, 4-piece unlocks another). Bonuses are visible in the fitting screen (docked) and in zone. A named effect notifies the player when a threshold is active. No client changes required.
+
+---
+
+## Constraints
+
+- Game client cannot be changed.
+- All stat delivery must go through the existing `AggregateField` / `ItemPropertyModifier` pipeline.
+- Effect display must use the existing `EffectType` + `effects` DB table mechanism (already extended by OPP up to ID 138).
+- Fitting is docked-only; zone entry re-initializes the robot from DB.
+
+---
+
+## Data Layer
+
+### New Tables
+
+**`equipment_sets`**
+```sql
+set_id   INT          NOT NULL IDENTITY PRIMARY KEY,
+name     NVARCHAR(64) NOT NULL UNIQUE   -- e.g. 'set_striker'
+```
+
+**`equipment_set_members`**
+```sql
+set_id      INT NOT NULL REFERENCES equipment_sets(set_id),
+definition  INT NOT NULL REFERENCES entitydefaults(definition),
+PRIMARY KEY (set_id, definition)
+```
+Each row maps one module definition to a set. A module may belong to at most one set (enforced by content convention, not schema).
+
+**`equipment_set_bonus_thresholds`**
+```sql
+set_id          INT   NOT NULL REFERENCES equipment_sets(set_id),
+required_pieces INT   NOT NULL,
+aggregate_field INT   NOT NULL,   -- AggregateField enum value
+bonus_value     FLOAT NOT NULL,   -- e.g. 1.05 for a 5% Modifier bonus
+PRIMARY KEY (set_id, required_pieces, aggregate_field)
+```
+Each row is one bonus unlocked at a specific piece count. Multiple rows with the same `(set_id, required_pieces)` are allowed (multiple fields per threshold).
+
+### EffectType Extension
+
+Add to `Perpetuum.ExportedTypes/EffectType.cs`:
+```csharp
+effect_equipment_set_bonus = 139,
+```
+
+Add to the `effects` DB table:
+```
+id=139, name='Set Bonus Active', ispositive=1, display=1,
+description='An equipment set bonus is active on this robot.',
+duration=0, isaura=0, effectcategory=0
+```
+`effectcategory=0` (`undefined`) — set bonuses are not clearable by ECCM and have no stacking limit.
+
+No `effectdefaultmodifiers` rows — the effect carries no property modifiers. Stats are applied exclusively via the aggregate pipeline.
+
+---
+
+## Server-Side Architecture
+
+### `IEquipmentSetRepository` (new)
+
+Loaded once at startup from the three new tables; cached in memory (pattern: `DefaultPropertyModifierReader`).
+
+```csharp
+public interface IEquipmentSetRepository
+{
+    // Returns set_id for each definition that belongs to a set
+    ILookup<int, int> GetSetMemberships(IEnumerable<int> definitions);
+
+    // Returns all threshold rows for a set, ordered by required_pieces
+    IEnumerable<SetBonusThreshold> GetThresholds(int setId);
+}
+
+public readonly struct SetBonusThreshold
+{
+    public int RequiredPieces { get; }
+    public AggregateField Field { get; }
+    public double Value { get; }
+}
+```
+
+Autofac registration: singleton.
+
+### `EquipmentSetBonusCalculator` (new)
+
+Pure stateless service. Given a list of fitted module definitions, returns active bonus modifiers.
+
+```csharp
+public record EquipmentSetBonusResult(
+    IReadOnlyList<ItemPropertyModifier> Modifiers,
+    IReadOnlySet<int> ActiveSetIds);
+
+public interface IEquipmentSetBonusCalculator
+{
+    EquipmentSetBonusResult Compute(IEnumerable<int> fittedDefinitions);
+}
+```
+
+**Algorithm:**
+1. Look up set memberships for all fitted definitions (one repository call).
+2. Count fitted instances per `set_id` (duplicates count — each instance contributes).
+3. For each set where `actual_count >= any threshold`, add the set ID to `activeSetIds`.
+4. Include all threshold rows where `required_pieces <= actual_count`; accumulate modifiers.
+5. Return `EquipmentSetBonusResult` with both lists.
+
+No DB access at call time — all data is from the in-memory repository.
+
+Autofac registration: singleton.
+
+### `Robot` changes
+
+**New field:**
+```csharp
+private IReadOnlyList<ItemPropertyModifier> _setBonusModifiers
+    = Array.Empty<ItemPropertyModifier>();
+```
+
+**`Initialize()` override:**
+```csharp
+public override void Initialize()
+{
+    InitComponents();
+    var result = _setBonusCalculator.Compute(Modules.Select(m => m.Definition));
+    _setBonusModifiers = result.Modifiers;
+    _activeSetIds = result.ActiveSetIds;
+    base.Initialize();
+}
+```
+`_setBonusCalculator` injected via constructor. `_activeSetIds` is a new `IReadOnlySet<int>` field on `Robot`, consumed by `SetBonusEffectApplicator`.
+
+**`GetPropertyModifier()` override:**
+```csharp
+public override ItemPropertyModifier GetPropertyModifier(AggregateField field)
+{
+    ItemPropertyModifier modifier = base.GetPropertyModifier(field);
+
+    foreach (RobotComponent component in RobotComponents)
+    {
+        component.GetPropertyModifier(field).Modify(ref modifier);
+    }
+
+    foreach (ItemPropertyModifier bonus in _setBonusModifiers)
+    {
+        if (bonus.Field == field)
+            bonus.Modify(ref modifier);
+    }
+
+    return modifier;
+}
+```
+
+No DB access, no allocation — iterates a small in-memory list.
+
+### `SetBonusEffectApplicator` (new, owned by `Robot`)
+
+Tracks which sets currently have a display effect applied. Called from the robot's zone update path alongside `PassiveEffectModule.Update()`.
+
+```csharp
+public class SetBonusEffectApplicator
+{
+    private readonly Dictionary<int, EffectToken> _activeTokens = new();
+
+    public void Update(Robot robot, IEnumerable<int> activeSetIds)
+    {
+        var incoming = activeSetIds.ToHashSet();
+
+        // Remove effects for sets no longer active
+        foreach (int setId in _activeTokens.Keys.Except(incoming).ToList())
+        {
+            robot.EffectHandler.RemoveEffectByToken(_activeTokens[setId]);
+            _activeTokens.Remove(setId);
+        }
+
+        // Apply effects for newly active sets
+        foreach (int setId in incoming.Except(_activeTokens.Keys))
+        {
+            var token = EffectToken.NewToken();
+            var builder = robot.NewEffectBuilder()
+                .SetType(EffectType.effect_equipment_set_bonus)
+                .EnableModifiers(false)
+                .WithToken(token);
+            robot.ApplyEffect(builder);
+            _activeTokens[setId] = token;
+        }
+    }
+}
+```
+
+`activeSetIds` comes from `Robot._activeSetIds`, populated by `Initialize()` alongside `_setBonusModifiers`.
+
+**Zone-only constraint:** `SetBonusEffectApplicator.Update()` is only called when `robot.InZone` is true. Docked robots get stats via the aggregate pipeline but no effect display — consistent with how `PassiveEffectModule` works.
+
+---
+
+## Fitting Change Flow
+
+1. `EquipModule` / `RemoveModule` handler fires.
+2. `robot.Initialize(character)` called (already exists).
+3. `Initialize()` recomputes `_setBonusModifiers` from scratch.
+4. `robot.ToDictionary()` includes updated aggregate stats in the response.
+5. Client receives improved/reduced stats immediately in the fitting panel.
+
+## Zone Entry Flow
+
+1. Robot loaded from DB → `Initialize()` → `_setBonusModifiers` computed.
+2. On first zone update tick, `SetBonusEffectApplicator.Update()` called.
+3. For each set with an active threshold, a display effect is applied.
+4. Client sees "Set Bonus Active" in the robot's effect list.
+
+---
+
+## Edge Cases
+
+| Scenario | Behaviour |
+|---|---|
+| Duplicate set pieces fitted | Each instance counts toward piece count |
+| Module unequipped mid-session | `Initialize()` recomputes; `SetBonusEffectApplicator` removes effect |
+| Multiple active sets | One effect token per set; flat modifier list aggregates all |
+| 3 pieces in a 2/4 set | 2-piece thresholds active; 4-piece thresholds excluded |
+| Unknown set_id / missing rows | Repository returns empty; calculator produces no modifiers |
+| Robot repack / swap | Zone exit clears effects; next deploy re-applies via `Initialize()` |
+
+---
+
+## Content Pipeline (Pilot Set)
+
+Define one set to validate the full pipeline:
+
+- **Set name:** `set_striker`
+- **Members:** 3–4 existing module definitions (e.g. medium armor plates)
+- **Thresholds:**
+  - 2 pieces → `armor_max_modifier = 1.05` (+5% max armor)
+  - 4 pieces → `kinetic_resist_modifier = 1.08` (+8% kinetic resist)
+
+**SQL authoring rules:**
+- Always resolve `set_id` dynamically: `SELECT set_id FROM equipment_sets WHERE name = N'set_striker'`
+- Never hardcode `set_id` values
+- Follow `docs/content/claude_game_content_guide.md` section 2 (entity lifecycle) and section 3 (naming conventions)
+- Use idempotent patterns (`MERGE` or `IF NOT EXISTS`)
+
+---
+
+## Admin Tool
+
+Out of scope for this improvement. Sets are authored via content SQL. A future improvement can add a set editor UI once the runtime system is validated.
+
+---
+
+## Performance
+
+- `GetPropertyModifier()` iterates `_setBonusModifiers` — typically 0–6 entries, no allocation, no DB access.
+- Repository is read-only singleton loaded at startup.
+- Calculator is called only at `Initialize()` time (fitting events and zone entry), not per-tick.
+- No impact on zone update hot path.
+
+---
+
+## Manual Validation Steps
+
+1. Fit 1 set piece → confirm no set bonus in stats; no effect active in zone.
+2. Fit 2 set pieces → confirm 2-piece threshold bonus visible in fitting stats; effect appears in zone.
+3. Fit 4 set pieces → confirm both thresholds active; stats reflect cumulative bonuses.
+4. Fit 2 identical set pieces → confirm each instance counts (2 instances = 2-piece threshold met).
+5. Unequip one piece to drop below threshold → confirm bonus removed from stats; effect removed in zone.
+6. Deploy robot → confirm effect visible; undeploy and redeploy → confirm effect re-applies correctly.
+7. Two different active sets simultaneously → confirm both effects present and both bonus sets applied.
+
+---
+
+## Potential Regressions
+
+- `Robot.GetPropertyModifier()` change: any code that calls this and caches results must handle the new modifier source — verify `UpdateRelatedProperties()` is called after fitting changes (it already is via `Initialize()`).
+- `Robot.Initialize()` now calls the calculator — verify it is safe to call during robot construction and that `Modules` is populated before `Initialize()` is invoked.
+- `SetBonusEffectApplicator` effect removal path: verify `RemoveEffectByToken` is safe to call when the token has already expired or the robot is dead.
diff --git a/docs/superpowers/specs/2026-05-24-codebase-graph-workflow-integration-design.md b/docs/superpowers/specs/2026-05-24-codebase-graph-workflow-integration-design.md
new file mode 100644
index 0000000..b12c75c
--- /dev/null
+++ b/docs/superpowers/specs/2026-05-24-codebase-graph-workflow-integration-design.md
@@ -0,0 +1,184 @@
+# Codebase Graph Workflow Integration Design
+
+**Date:** 2026-05-24
+**Status:** Approved
+**Area:** Infrastructure / Tooling / AI
+
+---
+
+## Overview
+
+Wire the existing `graphify-dotnet` codebase graph (IMPROVEMENT-021) into Claude's actual
+workflow. The graph artifacts exist and are up to date, but Claude has no instruction path
+that triggers their use. This spec closes that gap with three targeted changes:
+
+1. `tools/query-graph.ps1` — a PowerShell query script for programmatic graph lookups
+2. `.claude/knowledge/codebase-graph.md` — updated to reference `GRAPH_REPORT.md` and the script
+3. `CLAUDE.md` — wired into the knowledge table and Required Workflow
+
+---
+
+## Graph Structure (Reference)
+
+`docs/graph/graph.json` contains:
+
+| Property | Value |
+|---|---|
+| Total nodes | 19,926 |
+| Total edges | 33,689 |
+| Communities (Louvain) | 2,616 |
+| Edge: `contains` | 17,785 — within-file hierarchy (file → namespace → class → method) |
+| Edge: `imports` | 66 — cross-file namespace dependencies |
+
+Node shape:
+```json
+{
+  "id": "standinglist",
+  "label": "StandingList.cs",
+  "type": "Entity",
+  "community": 1211,
+  "file_path": "Perpetuum.RequestHandlers/Standings/StandingList.cs"
+}
+```
+
+Edge shape:
+```json
+{
+  "source": "standinglist",
+  "target": "standinglist_perpetuum_requesthandlers_standings",
+  "relationship": "contains",
+  "weight": 1
+}
+```
+
+Node labels include: file names (`StandingList.cs`), method names (`HandleRequest()`),
+class names, and namespace names. Search by label (case-insensitive, partial match).
+
+---
+
+## Component 1: `tools/query-graph.ps1`
+
+### Purpose
+
+Provide a single reusable script for Claude and developers to query the codebase graph
+without parsing 21MB of JSON manually.
+
+### Location
+
+`tools/query-graph.ps1` (new file — `tools/` is a new directory created for this script)
+
+### Interface
+
+```powershell
+.\tools\query-graph.ps1 <ClassName> [-Direction <in|out|both|community>]
+```
+
+| Parameter | Default | Meaning |
+|---|---|---|
+| `ClassName` | required | Case-insensitive partial match against node `label` |
+| `Direction` | `both` | Which edges to traverse |
+
+### Direction Semantics
+
+| Direction | Query | Use case |
+|---|---|---|
+| `in` | Edges where `target == node.id` | Who depends on this class (blast radius) |
+| `out` | Edges where `source == node.id` | What this class depends on |
+| `both` | Both above, labeled separately | Full dependency picture |
+| `community` | All nodes with same `community` value | Related types in same subsystem |
+
+Output labels the relationship type (`contains` vs `imports`) so the caller can distinguish
+within-file hierarchy from cross-file dependencies.
+
+### Error Handling
+
+- No match: print "No node found matching '<ClassName>'" and exit 0
+- Multiple matches: list all matches with their `file_path` and prompt the user to be more specific
+- `graph.json` not present: print a clear message directing user to build `Perpetuum.Server`
+
+### Implementation Notes
+
+- Load graph with `$g = Get-Content docs/graph/graph.json | ConvertFrom-Json`
+- Match nodes: `$g.nodes | Where-Object { $_.label -like "*$ClassName*" }`
+- Sort community output by label for readability
+- Prefix each result line with the relationship type: `[contains]` or `[imports]`
+
+---
+
+## Component 2: `.claude/knowledge/codebase-graph.md` (updated)
+
+### Changes
+
+Replace the current file content with an updated version that:
+
+1. **Adds GRAPH_REPORT.md as the primary starting point** — token-efficient, already summarizes
+   god nodes, community clusters, and stats. Read this before reaching for `graph.json`.
+
+2. **Updates god node guidance** — remove the hardcoded list (it becomes stale); instead point
+   to `GRAPH_REPORT.md > God Nodes` as the authoritative, regenerated source.
+
+3. **Adds concrete "How to use" section** with three explicit workflows:
+
+   | Goal | Action |
+   |---|---|
+   | Architectural overview | Read `docs/graph/GRAPH_REPORT.md` |
+   | Blast radius for a class | `.\tools\query-graph.ps1 <ClassName> -Direction in` |
+   | Subsystem navigation | `.\tools\query-graph.ps1 <ClassName> -Direction community` |
+   | Full dependency picture | `.\tools\query-graph.ps1 <ClassName> -Direction both` |
+
+4. **Notes the edge sparsity** — `imports` edges (66 total) are the meaningful cross-file
+   dependencies; `contains` edges (17,785) are the within-file hierarchy. Impact analysis
+   via `imports` may be limited due to graphify AST-only mode.
+
+---
+
+## Component 3: `CLAUDE.md` changes
+
+### Change A — Knowledge table
+
+Add one row to the AI Contribution Rules table under "Where to Edit":
+
+| Codebase graph & impact analysis | `.claude/knowledge/codebase-graph.md` |
+
+### Change B — Required Workflow (new step 4)
+
+Insert between step 3 ("Locate similar implementations") and step 4 ("Understand existing patterns"):
+
+```
+4. Check `docs/graph/GRAPH_REPORT.md` — if the target type appears in the God Nodes list,
+   note high blast radius; run `tools/query-graph.ps1 <ClassName>` for full dependent
+   enumeration
+```
+
+Existing steps 4–7 shift to 5–8.
+
+---
+
+## Files Changed
+
+| Action | Path |
+|---|---|
+| Create | `tools/query-graph.ps1` |
+| Modify | `.claude/knowledge/codebase-graph.md` |
+| Modify | `CLAUDE.md` |
+
+---
+
+## Constraints
+
+- No changes to `graph.json`, `GRAPH_REPORT.md`, or `Directory.Build.targets` — those are owned by IMPROVEMENT-021
+- Script must work on PowerShell 5.1 (Windows PowerShell, not PS Core requirement)
+- Script must soft-fail if `graph.json` is absent (e.g., freshly cloned without a build)
+- No new NuGet or npm dependencies
+
+---
+
+## Validation
+
+1. Run `.\tools\query-graph.ps1 Zone` — verify output shows node matches and their edges
+2. Run `.\tools\query-graph.ps1 Zone -Direction community` — verify community members listed
+3. Run `.\tools\query-graph.ps1 Zone -Direction in` — verify inbound edges listed with relationship type
+4. Run `.\tools\query-graph.ps1 NonExistentClass` — verify graceful "no match" message
+5. Rename `graph.json` temporarily, run script — verify it prints a clear missing-file message
+6. Open `CLAUDE.md` and confirm knowledge table row and workflow step 4 are present
+7. Open `.claude/knowledge/codebase-graph.md` and confirm GRAPH_REPORT.md reference and How to use table are present
diff --git a/docs/superpowers/specs/2026-05-24-equipment-set-bonus-effect-display-design.md b/docs/superpowers/specs/2026-05-24-equipment-set-bonus-effect-display-design.md
new file mode 100644
index 0000000..5a34e52
--- /dev/null
+++ b/docs/superpowers/specs/2026-05-24-equipment-set-bonus-effect-display-design.md
@@ -0,0 +1,169 @@
+# IMPROVEMENT-027 — Equipment Set Bonus Values in Effect Display
+
+**Date:** 2026-05-24  
+**Status:** Approved  
+**Area:** Combat / Items / UI
+
+---
+
+## Problem
+
+`SetBonusEffectApplicator` creates one `effect_equipment_set_bonus` effect per active equipment set using `.EnableModifiers(false)`. The client receives the effect token and can display an icon, but no bonus amounts are embedded — the player cannot see what they actually gained.
+
+---
+
+## Goal
+
+Embed the actual `ItemPropertyModifier` values into each per-set effect so the client can display them, using the existing `.EnableModifiers(true).WithPropertyModifiers(...)` builder pattern.
+
+---
+
+## Design
+
+### 1. `EquipmentSetBonusResult`
+
+Add a `ModifiersPerSet` dictionary computed at construction. Keep `Modifiers` as a flat convenience view (computed once, zero-alloc on read). Derive `ActiveSetIds` from dictionary keys.
+
+```csharp
+public sealed class EquipmentSetBonusResult
+{
+    public static readonly EquipmentSetBonusResult Empty =
+        new(new Dictionary<int, IReadOnlyList<ItemPropertyModifier>>());
+
+    public EquipmentSetBonusResult(IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>> modifiersPerSet)
+    {
+        ModifiersPerSet = modifiersPerSet;
+        Modifiers = modifiersPerSet.Values.SelectMany(x => x).ToArray();
+    }
+
+    public IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>> ModifiersPerSet { get; }
+    public IReadOnlyList<ItemPropertyModifier> Modifiers { get; }
+    public IEnumerable<int> ActiveSetIds => ModifiersPerSet.Keys;
+}
+```
+
+The constructor accepts `IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>>`. `Compute()` declares its local dictionary as `Dictionary<int, IReadOnlyList<ItemPropertyModifier>>` and upcasts each `List<T>` to `IReadOnlyList<T>` at assignment — `IReadOnlyDictionary`'s value type parameter is invariant in C#, so the list must be upcast before the dictionary is passed to the constructor.
+
+### 2. `EquipmentSetBonusCalculator.Compute()`
+
+The per-set grouping loop already exists. Change it to build a per-set dictionary instead of a flat list:
+
+```csharp
+var modifiersPerSet = new Dictionary<int, IReadOnlyList<ItemPropertyModifier>>();
+
+foreach (KeyValuePair<int, int> entry in countPerSet)
+{
+    int setId = entry.Key;
+    int count = entry.Value;
+    List<ItemPropertyModifier> setModifiers = null;
+
+    foreach (SetBonusThreshold threshold in _repository.GetThresholds(setId))
+    {
+        if (threshold.RequiredPieces <= count)
+        {
+            setModifiers ??= new List<ItemPropertyModifier>();
+            setModifiers.Add(ItemPropertyModifier.Create(threshold.Field, threshold.Value));
+        }
+    }
+
+    if (setModifiers != null)
+        modifiersPerSet[setId] = setModifiers; // List<T> upcast to IReadOnlyList<T>
+}
+
+if (modifiersPerSet.Count == 0)
+    return EquipmentSetBonusResult.Empty;
+
+return new EquipmentSetBonusResult(modifiersPerSet);
+```
+
+### 3. `SetBonusEffectApplicator.Update()`
+
+Accept `IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>>` instead of `IReadOnlySet<int>`. Enable modifiers and embed per-set values at effect creation:
+
+```csharp
+public void Update(Robot robot, IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>> modifiersPerSet)
+{
+    if (!robot.InZone)
+        return;
+
+    foreach (int setId in _activeTokens.Keys.Except(modifiersPerSet.Keys).ToList())
+    {
+        robot.EffectHandler.RemoveEffectByToken(_activeTokens[setId]);
+        _activeTokens.Remove(setId);
+    }
+
+    foreach (int setId in modifiersPerSet.Keys.Except(_activeTokens.Keys).ToList())
+    {
+        EffectToken token = EffectToken.NewToken();
+        EffectBuilder builder = robot.NewEffectBuilder()
+            .SetType(EffectType.effect_equipment_set_bonus)
+            .EnableModifiers(true)
+            .WithPropertyModifiers(modifiersPerSet[setId])
+            .WithToken(token);
+        robot.ApplyEffect(builder);
+        _activeTokens[setId] = token;
+    }
+}
+```
+
+**Explicit decision:** Effects are only created for *newly* active sets (set-difference check). If a set's bonus values change mid-session (e.g. a second piece crosses a new threshold), the effect is not recreated in the same tick. This is acceptable because bonus recalculation fires on fitting events, which always produces a fresh `EquipmentSetBonusResult` — new thresholds will be reflected on the next fitting change that makes the set newly active. No correctness issue.
+
+### 4. `Robot.cs`
+
+Collapse the two separate fields into one:
+
+```csharp
+// Before
+private IReadOnlyList<ItemPropertyModifier> _setBonusModifiers = Array.Empty<ItemPropertyModifier>();
+private IReadOnlySet<int> _activeSetIds = _emptySetIds;
+
+// After
+private EquipmentSetBonusResult _setBonusResult = EquipmentSetBonusResult.Empty;
+```
+
+`_emptySetIds` static field becomes unused and is removed.
+
+In `Initialize()`:
+```csharp
+EquipmentSetBonusResult result = EquipmentSetBonusCalculator.Compute(Modules.Select(m => m.Definition));
+_setBonusResult = result;
+```
+
+In `OnUpdate()`:
+```csharp
+_setBonusEffectApplicator.Update(this, _setBonusResult.ModifiersPerSet);
+```
+
+In `Robot.Properties.cs` — `GetPropertyModifier()` inner loop:
+```csharp
+foreach (ItemPropertyModifier bonus in _setBonusResult.Modifiers)
+```
+
+---
+
+## Files Changed
+
+| File | Change |
+|---|---|
+| `src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusResult.cs` | Add `ModifiersPerSet`, compute flat `Modifiers` at construction, derive `ActiveSetIds` |
+| `src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusCalculator.cs` | Build per-set dictionary instead of flat list |
+| `src/Perpetuum/Robots/EquipmentSets/SetBonusEffectApplicator.cs` | New signature, `.EnableModifiers(true)`, `.WithPropertyModifiers()` |
+| `src/Perpetuum/Robots/Robot.cs` | Collapse two fields to `_setBonusResult`, remove `_emptySetIds` |
+| `src/Perpetuum/Robots/Robot.Properties.cs` | `_setBonusModifiers` → `_setBonusResult.Modifiers` |
+
+---
+
+## Manual Validation
+
+1. Start the server with a robot that has set pieces fitted meeting at least one threshold.
+2. Log in and open the effect panel or module tooltip for `effect_equipment_set_bonus`.
+3. **Expected:** Bonus stat values are visible in the UI.
+4. **If not visible:** The client is not consuming `PropertyModifiers` for this effect type. Log as a separate client-side investigation — out of scope for this improvement.
+
+---
+
+## Regression Areas
+
+- `GetPropertyModifier()` hot path — flat `Modifiers` list is still iterated; no behavioural change, only field rename
+- Fitting events — recalculation and effect removal/application logic unchanged
+- `EquipmentSetBonusResult.Empty` — still valid sentinel; both `ModifiersPerSet` and `Modifiers` are empty collections
diff --git a/docs/superpowers/specs/2026-05-24-improvement-028-equipment-set-admin-tool-design.md b/docs/superpowers/specs/2026-05-24-improvement-028-equipment-set-admin-tool-design.md
new file mode 100644
index 0000000..99b7c5c
--- /dev/null
+++ b/docs/superpowers/specs/2026-05-24-improvement-028-equipment-set-admin-tool-design.md
@@ -0,0 +1,269 @@
+# IMPROVEMENT-028 Design — Admin Tool Equipment Set Management
+
+**Date:** 2026-05-24
+**Status:** Approved
+**Backlog item:** IMPROVEMENT-028
+
+---
+
+## 1. Goal
+
+Add a dedicated "Equipment Sets" tab to the Admin Tool so operators can create, rename, and delete equipment sets; assign module definitions to sets; and configure per-threshold bonus rows — all without direct database access.
+
+---
+
+## 2. Background
+
+IMPROVEMENT-025 introduced three DB tables:
+
+| Table | Key columns |
+|---|---|
+| `equipment_sets` | `set_id` IDENTITY, `name` UNIQUE NVARCHAR |
+| `equipment_set_members` | `set_id` FK, `definition` FK → entitydefaults |
+| `equipment_set_bonus_thresholds` | `set_id` FK, `required_pieces`, `aggregate_field`, `bonus_value` |
+
+The server's `EquipmentSetRepository` loads all data at startup into an in-memory cache. Changes made via the Admin Tool take effect after a server restart.
+
+---
+
+## 3. Scope
+
+This improvement covers only the Admin Tool UI. No server-side code changes are required.
+
+Out of scope:
+- Entity-centric set assignment (module detail panel in the Entities tab)
+- Server-side cache reload command
+- Validation of `aggregate_field` values against live server state
+
+---
+
+## 4. Tab Placement
+
+New "Equipment Sets" tab added to `MainWindow.xaml` between "Seasons" and "Translations".
+
+---
+
+## 5. Data Layer
+
+### 5.1 New folder: `src/Perpetuum.AdminTool/EquipmentSets/`
+
+**Row types (observable, CommunityToolkit `ObservableObject`):**
+
+- `EquipmentSetRow` — `SetId` (int, 0 = new/pending), `Name` (string)
+- `EquipmentSetMemberRow` — `SetId`, `Definition`, `DefinitionName`, `TranslatedName`
+- `EquipmentSetThresholdRow` — `SetId`, `OriginalRequiredPieces` (tracks DB value for orphan-delete on edit), `RequiredPieces`, `AggregateFieldId` (int), `FieldSystemName` (raw DB name), `FieldDisplay` (translated name or system name fallback), `BonusValue` (double)
+
+**Pick items (not observable, constructed once on load):**
+
+- `SetMemberPickItem` — `Definition`, `DefinitionName`, `TranslatedName`, `Display` (`"1234 — def_mod_x  (X Module)"`, parenthesised translated name omitted when empty)
+- `AggregateFieldPickItem` — `Id`, `Name` (raw DB name, e.g. `armor_max_modifier`), `TranslatedName` (English from translation store using `Name` as key), `Display` (translated name if available, else raw `Name`)
+
+**`EquipmentSetRepository`** — Admin Tool-side DB reads via `SqlConnection`:
+- `LoadAllSetsAsync(ConnectionSettings)` → `List<EquipmentSetRow>`
+- `LoadMembersAsync(ConnectionSettings, int setId)` → `List<EquipmentSetMemberRow>`
+- `LoadThresholdsAsync(ConnectionSettings, int setId)` → `List<EquipmentSetThresholdRow>`
+- `LoadAggregateFieldsAsync(ConnectionSettings)` → `IReadOnlyList<AggregateFieldInfo>` (same query as `EntityRepository.LoadFieldsAsync`; reused to build `AggregateFieldPickItem` list with translations applied)
+
+**`EquipmentSetChanges`** — static class producing `RawSqlChange` objects:
+
+| Method | SQL target |
+|---|---|
+| `BuildInsertSet(string name)` | `INSERT INTO equipment_sets` |
+| `BuildRenameSet(int setId, string newName)` | `UPDATE equipment_sets SET name` |
+| `BuildDeleteSet(int setId, string name)` | cascade DELETE (see §5.3) |
+| `BuildInsertMember(int setId, string setName, int definition)` | `INSERT INTO equipment_set_members` |
+| `BuildDeleteMember(int setId, string setName, int definition)` | `DELETE FROM equipment_set_members` |
+| `BuildUpsertThreshold(int setId, string setName, int requiredPieces, AggregateField field, double value)` | `MERGE INTO equipment_set_bonus_thresholds` |
+| `BuildDeleteThreshold(int setId, string setName, int requiredPieces)` | `DELETE FROM equipment_set_bonus_thresholds` |
+
+### 5.2 Set ID resolution in generated SQL
+
+`EquipmentSetChanges` methods accept both `setId` and `setName`.
+
+- **Existing sets** (`setId > 0`): generated SQL uses the integer `set_id` directly.
+- **New/pending sets** (`setId <= 0`): generated SQL resolves `set_id` via a name subquery:
+
+```sql
+INSERT INTO equipment_set_members (set_id, definition)
+VALUES ((SELECT set_id FROM equipment_sets WHERE name = N'set_new'), 1234);
+```
+
+This allows a new set's INSERT and all its member/threshold INSERTs to be queued in a single batch and committed as one script. The `ChangeQueue` preserves insertion order, so the set INSERT always precedes downstream rows.
+
+### 5.3 Cascade DELETE
+
+```sql
+DELETE FROM equipment_set_bonus_thresholds WHERE set_id = @id;
+DELETE FROM equipment_set_members             WHERE set_id = @id;
+DELETE FROM equipment_sets                    WHERE set_id = @id;
+```
+
+`entitydefaults` is never modified.
+
+### 5.4 Rename constraint
+
+"Rename" is disabled for pending sets (`SetId == 0`). Renaming before commit would break the name-subquery chain in downstream SQL already in the queue.
+
+---
+
+## 6. UI Layout
+
+### 6.1 `EquipmentSetsView.xaml`
+
+```
+┌─────────────────────────────────────────────────────────────────┐
+│ ⚠ Changes take effect after server restart.          [Reload]   │
+├───────────────────┬─────────────────────────────────────────────┤
+│ Sets              │ set_striker                                  │
+│ ───────────────── │ ─────────────────────────────────────────── │
+│ set_striker   ◄── │ Name: [set_striker         ] [Rename]       │
+│ set_heavy         │                                              │
+│                   │ Members                    [Add member]      │
+│                   │ ┌──────┬──────────────┬────────────────┐    │
+│                   │ │ Def  │ DefName      │ Display name   │    │
+│                   │ │ 1234 │ def_mod_x    │ X Module       │    │
+│                   │ │      │              │        [Remove]│    │
+│                   │ └──────┴──────────────┴────────────────┘    │
+│                   │                                              │
+│                   │ Bonus Thresholds           [Add threshold]   │
+│ ─────────────────│ ┌────────┬────────────────┬────────┬──────┐  │
+│ Name: [_______] │ │ Pieces │ Field          │ Value  │      │  │
+│ [Create set]    │ │ 2      │ armor_max_mod  │ 0.05   │ [×]  │  │
+│ [Delete set]    │ │ 4      │ armor_max_mod  │ 0.12   │ [×]  │  │
+└───────────────────┴─────────────────────────────────────────────┘
+```
+
+**Left panel (~220 px):**
+- `ListBox` of `EquipmentSetRow`, showing `Name`
+- TextBox + "Create set" button: validates name uniqueness against in-memory list before queuing INSERT; new row appears greyed/italic until committed
+- "Delete set" button: enabled only when a set is selected; shows confirmation dialog — "This will remove N member(s) and M threshold row(s). Continue?" where N and M come from the in-memory `Members` and `Thresholds` collections (already loaded) — then queues cascade DELETE
+
+**Right panel:**
+- Name TextBox + "Rename" button (disabled for pending sets): queues UPDATE
+- **Members** DataGrid — read-only columns: Definition, DefinitionName, TranslatedName; per-row "Remove" button queuing DELETE; "Add member" button opens `AddSetMemberWindow`
+- **Bonus Thresholds** DataGrid — Required Pieces (editable int), System name (read-only), Display name (read-only), Bonus Value (editable double); per-row remove button queuing DELETE; "Add threshold" opens `AddSetThresholdWindow` (same picker pattern as members)
+
+### 6.2 `AddSetMemberWindow` picker dialog
+
+- Title: "Add module to set"
+- Item list sourced from `LookupCache.Entities`, filtered to:
+  - `Enabled == true`
+  - `Hidden == false`
+  - `CategoryFlags` is `cf_robot_equipment` or any descendant — using the same bitmask check as `PackageItemPickItem.MatchesAnyRoot` / `CategoryFlagsMask`, restricted to the single `cf_robot_equipment` root
+  - Definition not already present in `Members`
+- Search TextBox filtering the above list by `DefinitionName` OR `TranslatedName` (case-insensitive, same logic as `EntitiesViewModel.MatchesFilter`)
+- DataGrid columns: Definition, DefinitionName, TranslatedName
+- Display format: `"1234 — def_mod_x  (X Module)"` where the parenthesised part is the translated name (omitted if empty)
+- OK: queues `BuildInsertMember` and adds row to `Members`; Cancel: dismisses
+
+### 6.3 `AddSetThresholdWindow` picker dialog
+
+- Title: "Add bonus threshold"
+- Item list sourced from `AggregateFieldOptions` (loaded on Reload)
+- Search TextBox filtering by `Name` OR `TranslatedName` (case-insensitive)
+- DataGrid columns: Id, System name (`Name`), Display name (`TranslatedName`)
+- Inputs below the list: Required Pieces (int TextBox), Bonus Value (double TextBox, `UpdateSourceTrigger=LostFocus`)
+- Validation on Add: field must be selected; pieces must be > 0; pieces must not duplicate an existing threshold in the current set
+- OK: queues `BuildUpsertThreshold` and adds row to `Thresholds` with `OriginalRequiredPieces` set; Cancel: dismisses
+
+---
+
+## 7. ViewModels
+
+### 7.1 `EquipmentSetsViewModel`
+
+Located in `src/Perpetuum.AdminTool/ViewModels/EquipmentSetsViewModel.cs`.
+
+Dependencies: `AppSettingsStore`, `ChangeQueue`, `LookupCache`, `TranslationsViewModel`, `EquipmentSetRepository`.
+
+Observable state:
+- `ObservableCollection<EquipmentSetRow> Sets`
+- `EquipmentSetRow? SelectedSet`
+- `ObservableCollection<EquipmentSetMemberRow> Members`
+- `ObservableCollection<EquipmentSetThresholdRow> Thresholds`
+- `IReadOnlyList<AggregateFieldPickItem> AggregateFieldOptions` — built from `LoadAggregateFieldsAsync` on Reload, translated names resolved from `TranslationsViewModel` using `AggregateFieldInfo.Name` as the lookup key, sorted by `Display`
+- `bool IsLoading`, `string StatusMessage`, `bool StatusIsError`
+
+Commands: `ReloadCommand`, `CreateSetCommand`, `DeleteSetCommand`, `RenameSetCommand`, `RemoveMemberCommand`, `RemoveThresholdCommand`.
+
+Regular methods (not relay commands, require a `Window` owner for dialog ownership): `AddMember(Window)`, `AddThreshold(Window)`.
+
+When `SelectedSet` changes:
+- If `SetId > 0`: load members and thresholds from DB asynchronously
+- If `SetId == 0` (new/pending): collections stay empty, right panel is fully interactive
+
+### 7.2 `AddSetMemberViewModel`
+
+Located in `src/Perpetuum.AdminTool/ViewModels/AddSetMemberViewModel.cs`.
+
+Constructor parameters: `LookupCache`, `TranslationsViewModel`, `IReadOnlySet<int> alreadyAssigned`.
+
+State: `ObservableCollection<SetMemberPickItem> Items` (built from `LookupCache.Entities` filtered to enabled, non-hidden, `cf_robot_equipment` descendants, excluding `alreadyAssigned`), `ICollectionView View` (filtered by `FilterText`), `SetMemberPickItem? SelectedItem`.
+
+Translated names are resolved at construction time by looking up each `EntityPickItem.Name` (the `definitionname`) in `TranslationsViewModel.Store` at English (lang 0) — same as `EntitiesViewModel.TranslatedName`. Items with no translation show only the definition name.
+
+Category filter uses `PackageItemPickItem.CategoryFlagsMask` with `CategoryFlags.cf_robot_equipment` as the sole root — `(entityFlags & mask) == (long)cf_robot_equipment`.
+
+### 7.3 `AddSetThresholdViewModel`
+
+Located in `src/Perpetuum.AdminTool/ViewModels/AddSetThresholdViewModel.cs`.
+
+Constructor parameters: `IEnumerable<AggregateFieldPickItem> fields`.
+
+State: `ObservableCollection<AggregateFieldPickItem> Items`, `ICollectionView View` (filtered by `FilterText`), `AggregateFieldPickItem? SelectedField`, `int RequiredPieces`, `double BonusValue`.
+
+Filter searches `Name` and `TranslatedName` case-insensitively. Used-pieces validation (duplicate check) is performed in `AddSetThresholdWindow.OnAddClick`, which receives the `IReadOnlySet<int> usedPieces` from the caller.
+
+### 7.4 `MainViewModel` additions
+
+New property: `EquipmentSetsViewModel EquipmentSets`.
+
+Constructed in `MainViewModel` constructor alongside existing tab VMs, receiving the same `_session.Changes`, `session.Lookups`, and `Translations` instances.
+
+---
+
+## 8. Error Handling
+
+| Scenario | Behaviour |
+|---|---|
+| Duplicate set name on Create | Validate against in-memory `Sets`; show inline `StatusMessage`; do not queue |
+| Duplicate member (definition already assigned) | Validate on picker OK; show inline error in dialog |
+| Duplicate threshold `required_pieces` for same set | Validate on Add; show inline `StatusMessage`; do not queue |
+| Rename to existing name | Validate against in-memory `Sets`; show inline `StatusMessage` |
+| Delete with no selection | "Delete set" button disabled via `CanExecute` |
+| DB load failure | `StatusIsError = true`, `StatusMessage` set; no modal dialogs |
+
+---
+
+## 9. Wiring
+
+`MainWindow.xaml` — new `TabItem`:
+```xml
+<TabItem Header="Equipment Sets">
+    <views:EquipmentSetsView DataContext="{Binding EquipmentSets}"/>
+</TabItem>
+```
+
+No new server request handlers. No DI container changes. No `LookupCache` additions (equipment set data is managed entirely within the new tab).
+
+---
+
+## 10. Manual Validation Steps
+
+1. Create a new set. Verify the row appears in the list (pending state).
+2. Add a member and a threshold to the pending set without committing first.
+3. Commit. Reload. Verify the set, member, and threshold appear correctly.
+4. Rename the set. Commit. Verify the name updates in DB.
+5. Add a second member via the picker. Verify translated names appear, already-assigned definitions are excluded, and the list contains only enabled, non-hidden `cf_robot_equipment` items (no robots, ammo, or materials).
+6. Remove a member. Verify DELETE is queued and row disappears on reload.
+7. Add a threshold via the picker dialog. Verify field system name and display name appear in the grid. Edit Pieces and Bonus Value inline; verify UPSERT is queued.
+8. Delete a set that has members and thresholds. Confirm the cascade warning shows correct counts. Commit. Verify all three tables are cleared for that set. Verify `entitydefaults` is unchanged.
+9. Attempt to create a duplicate set name. Verify inline error and no queue entry.
+10. Attempt to add a duplicate threshold piece count. Verify inline error.
+
+---
+
+## 11. Potential Regressions
+
+- `MainViewModel` constructor: verify the new VM is constructed without errors when `TranslationsViewModel` has no `GameRoot` configured (translations may be empty — this is handled by the nil-check in `TranslatedName`).
+- `ChangeQueue` ordering: a Delete-then-Insert for the same set name in one batch could fail due to FK constraints. This edge case (delete a set, then create a new set with the same name, in one commit) should be documented as unsupported — two separate commits required.
diff --git a/src/Perpetuum.AdminTool/EquipmentSets/AggregateFieldPickItem.cs b/src/Perpetuum.AdminTool/EquipmentSets/AggregateFieldPickItem.cs
new file mode 100644
index 0000000..a355996
--- /dev/null
+++ b/src/Perpetuum.AdminTool/EquipmentSets/AggregateFieldPickItem.cs
@@ -0,0 +1,11 @@
+namespace Perpetuum.AdminTool.EquipmentSets
+{
+    public class AggregateFieldPickItem
+    {
+        public int Id { get; init; }
+        public string Name { get; init; } = "";
+        public string TranslatedName { get; init; } = "";
+
+        public string Display => string.IsNullOrEmpty(TranslatedName) ? Name : TranslatedName;
+    }
+}
diff --git a/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetChanges.cs b/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetChanges.cs
new file mode 100644
index 0000000..469097d
--- /dev/null
+++ b/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetChanges.cs
@@ -0,0 +1,66 @@
+using Perpetuum.AdminTool.Editing;
+
+namespace Perpetuum.AdminTool.EquipmentSets
+{
+    public static class EquipmentSetChanges
+    {
+        // Returns either the literal integer (existing sets) or a subquery (new sets).
+        private static string SetIdExpr(int setId, string setName) =>
+            setId > 0
+                ? setId.ToString()
+                : $"(SELECT set_id FROM equipment_sets WHERE name = {SqlLiteral.Of(setName)})";
+
+        public static IPendingChange BuildInsertSet(string name) =>
+            new RawSqlChange(
+                $"equipment_sets: insert '{name}'",
+                $"INSERT INTO equipment_sets (name) VALUES ({SqlLiteral.Of(name)})");
+
+        public static IPendingChange BuildRenameSet(int setId, string newName) =>
+            new RawSqlChange(
+                $"equipment_sets: rename id {setId} to '{newName}'",
+                $"UPDATE equipment_sets SET name = {SqlLiteral.Of(newName)} WHERE set_id = {setId}");
+
+        public static IPendingChange BuildDeleteSet(int setId, string name) =>
+            new RawSqlChange(
+                $"equipment_sets: cascade delete '{name}' (id {setId})",
+                $"DELETE FROM equipment_set_bonus_thresholds WHERE set_id = {setId};\n" +
+                $"DELETE FROM equipment_set_members             WHERE set_id = {setId};\n" +
+                $"DELETE FROM equipment_sets                    WHERE set_id = {setId}",
+                isDestructive: true);
+
+        public static IPendingChange BuildInsertMember(int setId, string setName, int definition) =>
+            new RawSqlChange(
+                $"equipment_set_members: add definition {definition} to set '{setName}'",
+                $"INSERT INTO equipment_set_members (set_id, definition) " +
+                $"VALUES ({SetIdExpr(setId, setName)}, {definition})");
+
+        public static IPendingChange BuildDeleteMember(int setId, string setName, int definition) =>
+            new RawSqlChange(
+                $"equipment_set_members: remove definition {definition} from set '{setName}'",
+                $"DELETE FROM equipment_set_members " +
+                $"WHERE set_id = {SetIdExpr(setId, setName)} AND definition = {definition}",
+                isDestructive: true);
+
+        public static IPendingChange BuildUpsertThreshold(
+            int setId, string setName, int requiredPieces, int aggregateFieldId, double bonusValue)
+        {
+            var sid = SetIdExpr(setId, setName);
+            var val = SqlLiteral.Of(bonusValue);
+            return new RawSqlChange(
+                $"equipment_set_bonus_thresholds: upsert set '{setName}' pieces {requiredPieces}",
+                $"MERGE INTO equipment_set_bonus_thresholds AS target " +
+                $"USING (SELECT {sid} AS set_id, {requiredPieces} AS required_pieces) AS src " +
+                $"ON target.set_id = src.set_id AND target.required_pieces = src.required_pieces " +
+                $"WHEN MATCHED THEN UPDATE SET aggregate_field = {aggregateFieldId}, bonus_value = {val} " +
+                $"WHEN NOT MATCHED THEN INSERT (set_id, required_pieces, aggregate_field, bonus_value) " +
+                $"VALUES (src.set_id, {requiredPieces}, {aggregateFieldId}, {val})");
+        }
+
+        public static IPendingChange BuildDeleteThreshold(int setId, string setName, int requiredPieces) =>
+            new RawSqlChange(
+                $"equipment_set_bonus_thresholds: delete set '{setName}' pieces {requiredPieces}",
+                $"DELETE FROM equipment_set_bonus_thresholds " +
+                $"WHERE set_id = {SetIdExpr(setId, setName)} AND required_pieces = {requiredPieces}",
+                isDestructive: true);
+    }
+}
diff --git a/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetMemberRow.cs b/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetMemberRow.cs
new file mode 100644
index 0000000..154e0ec
--- /dev/null
+++ b/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetMemberRow.cs
@@ -0,0 +1,10 @@
+namespace Perpetuum.AdminTool.EquipmentSets
+{
+    public class EquipmentSetMemberRow
+    {
+        public int SetId { get; init; }
+        public int Definition { get; init; }
+        public string DefinitionName { get; init; } = "";
+        public string TranslatedName { get; init; } = "";
+    }
+}
diff --git a/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetRepository.cs b/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetRepository.cs
new file mode 100644
index 0000000..a7a1818
--- /dev/null
+++ b/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetRepository.cs
@@ -0,0 +1,108 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
+using Perpetuum.AdminTool.Entities;
+using Perpetuum.AdminTool.Settings;
+
+namespace Perpetuum.AdminTool.EquipmentSets
+{
+    public class EquipmentSetRepository
+    {
+        private readonly ConnectionSettings _connection;
+
+        public EquipmentSetRepository(ConnectionSettings connection)
+        {
+            _connection = connection;
+        }
+
+        public async Task<List<EquipmentSetRow>> LoadAllSetsAsync()
+        {
+            var result = new List<EquipmentSetRow>();
+            await using var cn = new SqlConnection(_connection.BuildConnectionString());
+            await cn.OpenAsync();
+            await using var cmd = cn.CreateCommand();
+            cmd.CommandText = "SELECT set_id, name FROM equipment_sets ORDER BY name";
+            await using var reader = await cmd.ExecuteReaderAsync();
+            while (await reader.ReadAsync())
+                result.Add(new EquipmentSetRow
+                {
+                    SetId = reader.GetInt32(0),
+                    Name  = reader.IsDBNull(1) ? "" : reader.GetString(1),
+                });
+            return result;
+        }
+
+        public async Task<List<EquipmentSetMemberRow>> LoadMembersAsync(int setId)
+        {
+            var result = new List<EquipmentSetMemberRow>();
+            await using var cn = new SqlConnection(_connection.BuildConnectionString());
+            await cn.OpenAsync();
+            await using var cmd = cn.CreateCommand();
+            cmd.CommandText =
+                "SELECT m.definition, ISNULL(e.definitionname, '') " +
+                "FROM equipment_set_members m " +
+                "LEFT JOIN entitydefaults e ON e.definition = m.definition " +
+                "WHERE m.set_id = @setId " +
+                "ORDER BY e.definitionname";
+            cmd.Parameters.AddWithValue("@setId", setId);
+            await using var reader = await cmd.ExecuteReaderAsync();
+            while (await reader.ReadAsync())
+                result.Add(new EquipmentSetMemberRow
+                {
+                    SetId          = setId,
+                    Definition     = reader.GetInt32(0),
+                    DefinitionName = reader.GetString(1),
+                });
+            return result;
+        }
+
+        public async Task<List<EquipmentSetThresholdRow>> LoadThresholdsAsync(int setId)
+        {
+            var result = new List<EquipmentSetThresholdRow>();
+            await using var cn = new SqlConnection(_connection.BuildConnectionString());
+            await cn.OpenAsync();
+            await using var cmd = cn.CreateCommand();
+            cmd.CommandText =
+                "SELECT required_pieces, aggregate_field, bonus_value " +
+                "FROM equipment_set_bonus_thresholds " +
+                "WHERE set_id = @setId " +
+                "ORDER BY required_pieces";
+            cmd.Parameters.AddWithValue("@setId", setId);
+            await using var reader = await cmd.ExecuteReaderAsync();
+            while (await reader.ReadAsync())
+                result.Add(new EquipmentSetThresholdRow
+                {
+                    SetId            = setId,
+                    RequiredPieces   = reader.GetInt32(0),
+                    AggregateFieldId = reader.GetInt32(1),
+                    BonusValue       = reader.GetDouble(2),
+                });
+            return result;
+        }
+
+        public async Task<List<AggregateFieldInfo>> LoadAggregateFieldsAsync()
+        {
+            var result = new List<AggregateFieldInfo>();
+            await using var cn = new SqlConnection(_connection.BuildConnectionString());
+            await cn.OpenAsync();
+            await using var cmd = cn.CreateCommand();
+            cmd.CommandText =
+                "SELECT id, name, formula, measurementunit, measurementmultiplier, " +
+                "measurementoffset, category, digits FROM aggregatefields";
+            await using var reader = await cmd.ExecuteReaderAsync();
+            while (await reader.ReadAsync())
+                result.Add(new AggregateFieldInfo
+                {
+                    Id                    = reader.GetInt32(0),
+                    Name                  = reader.IsDBNull(1) ? "" : reader.GetString(1),
+                    Formula               = reader.IsDBNull(2) ? 0  : reader.GetInt32(2),
+                    MeasurementUnit       = reader.IsDBNull(3) ? "" : reader.GetString(3),
+                    MeasurementMultiplier = reader.IsDBNull(4) ? 0d : reader.GetDouble(4),
+                    MeasurementOffset     = reader.IsDBNull(5) ? 0d : reader.GetDouble(5),
+                    Category              = reader.IsDBNull(6) ? 0  : reader.GetInt32(6),
+                    Digits                = reader.IsDBNull(7) ? 0  : reader.GetInt32(7),
+                });
+            return result;
+        }
+    }
+}
diff --git a/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetRow.cs b/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetRow.cs
new file mode 100644
index 0000000..278367e
--- /dev/null
+++ b/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetRow.cs
@@ -0,0 +1,12 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Perpetuum.AdminTool.EquipmentSets
+{
+    public partial class EquipmentSetRow : ObservableObject
+    {
+        public int SetId { get; set; }
+        [ObservableProperty] private string _name = "";
+
+        public bool IsNew => SetId == 0;
+    }
+}
diff --git a/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetThresholdRow.cs b/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetThresholdRow.cs
new file mode 100644
index 0000000..385e4a4
--- /dev/null
+++ b/src/Perpetuum.AdminTool/EquipmentSets/EquipmentSetThresholdRow.cs
@@ -0,0 +1,16 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace Perpetuum.AdminTool.EquipmentSets
+{
+    public partial class EquipmentSetThresholdRow : ObservableObject
+    {
+        public int SetId { get; init; }
+        public int OriginalRequiredPieces { get; set; } = -1;
+
+        [ObservableProperty] private int _requiredPieces;
+        [ObservableProperty] private int _aggregateFieldId;
+        [ObservableProperty] private string _fieldSystemName = "";
+        [ObservableProperty] private string _fieldDisplay = "";
+        [ObservableProperty] private double _bonusValue;
+    }
+}
diff --git a/src/Perpetuum.AdminTool/EquipmentSets/SetMemberPickItem.cs b/src/Perpetuum.AdminTool/EquipmentSets/SetMemberPickItem.cs
new file mode 100644
index 0000000..c2b043f
--- /dev/null
+++ b/src/Perpetuum.AdminTool/EquipmentSets/SetMemberPickItem.cs
@@ -0,0 +1,13 @@
+namespace Perpetuum.AdminTool.EquipmentSets
+{
+    public class SetMemberPickItem
+    {
+        public int Definition { get; init; }
+        public string DefinitionName { get; init; } = "";
+        public string TranslatedName { get; init; } = "";
+
+        public string Display => string.IsNullOrEmpty(TranslatedName)
+            ? $"{Definition} — {DefinitionName}"
+            : $"{Definition} — {DefinitionName}  ({TranslatedName})";
+    }
+}
diff --git a/src/Perpetuum.AdminTool/Seasons/SeasonRepository.cs b/src/Perpetuum.AdminTool/Seasons/SeasonRepository.cs
index 47e5c23..dcf272b 100644
--- a/src/Perpetuum.AdminTool/Seasons/SeasonRepository.cs
+++ b/src/Perpetuum.AdminTool/Seasons/SeasonRepository.cs
@@ -272,6 +272,109 @@ public async Task<double> LoadAvgPointsPerDayAsync(int seasonId)
             if (v == null || v == System.DBNull.Value) return 0.0;
             return System.Convert.ToDouble(v);
         }
+
+        public async Task<List<TodaysDailyObjectiveRow>> LoadTodaysDailyObjectivesAsync(int seasonId)
+        {
+            await using var cn = new SqlConnection(_connection.BuildConnectionString());
+            await cn.OpenAsync();
+
+            // 1. Load daily_objectives_per_day for the season
+            int? dailyPerDay;
+            await using (var cmd = cn.CreateCommand())
+            {
+                cmd.CommandText = "SELECT daily_objectives_per_day FROM seasons WHERE id = @seasonId";
+                cmd.Parameters.AddWithValue("@seasonId", seasonId);
+                var raw = await cmd.ExecuteScalarAsync();
+                dailyPerDay = raw == null || raw == DBNull.Value ? (int?)null : (int)(short)raw;
+            }
+
+            // 2. Load all is_daily objectives ordered by display_order
+            var daily = new List<(int Id, string Name, SeasonActivityType ActivityType, long TargetValue)>();
+            await using (var cmd = cn.CreateCommand())
+            {
+                cmd.CommandText =
+                    "SELECT id, name, activity_type, target_value " +
+                    "FROM season_objectives " +
+                    "WHERE season_id = @seasonId AND is_daily = 1 " +
+                    "ORDER BY display_order";
+                cmd.Parameters.AddWithValue("@seasonId", seasonId);
+                await using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync())
+                {
+                    daily.Add((
+                        reader.GetInt32(0),
+                        reader.IsDBNull(1) ? "" : reader.GetString(1),
+                        (SeasonActivityType)reader.GetInt32(2),
+                        reader.GetInt64(3)
+                    ));
+                }
+            }
+
+            if (daily.Count == 0)
+                return [];
+
+            // 3. Compute pool using same seeded Fisher-Yates as SeasonService.SelectDailyPool
+            List<(int Id, string Name, SeasonActivityType ActivityType, long TargetValue)> pool;
+            if (!dailyPerDay.HasValue || dailyPerDay.Value >= daily.Count)
+            {
+                pool = daily;
+            }
+            else
+            {
+                var today = DateOnly.FromDateTime(DateTime.UtcNow);
+                // Precedence: * binds tighter than ^ — result is (seasonId * 397) XOR today.DayNumber
+                int seed = seasonId * 397 ^ today.DayNumber;
+                var rng = new Random(seed);
+                var shuffled = daily.ToList();
+                for (int i = shuffled.Count - 1; i > 0; i--)
+                {
+                    int j = rng.Next(i + 1);
+                    (shuffled[i], shuffled[j]) = (shuffled[j], shuffled[i]);
+                }
+                pool = shuffled.Take(dailyPerDay.Value).ToList();
+            }
+
+            if (pool.Count == 0)
+                return [];
+
+            // 4. Query completion counts for pool IDs scoped to today's day_window
+            var ids = pool.Select(o => o.Id).ToList();
+            var idParams = string.Join(",", ids.Select((_, i) => $"@id{i}"));
+            var counts = new Dictionary<int, int>();
+            await using (var cmd = cn.CreateCommand())
+            {
+                cmd.CommandText =
+                    $"SELECT o.id, COUNT(DISTINCT p.character_id) AS completions_today " +
+                    $"FROM season_objectives o " +
+                    $"LEFT JOIN season_objective_progress p " +
+                    $"    ON p.objective_id = o.id " +
+                    $"   AND p.season_id = @seasonId " +
+                    $"   AND p.day_window = CAST(GETUTCDATE() AS date) " +
+                    $"   AND p.completed = 1 " +
+                    $"WHERE o.season_id = @seasonId AND o.id IN ({idParams}) " +
+                    $"GROUP BY o.id";
+                cmd.Parameters.AddWithValue("@seasonId", seasonId);
+                for (int i = 0; i < ids.Count; i++)
+                    cmd.Parameters.AddWithValue($"@id{i}", ids[i]);
+                await using var reader = await cmd.ExecuteReaderAsync();
+                while (await reader.ReadAsync())
+                    counts[reader.GetInt32(0)] = reader.GetInt32(1);
+            }
+
+            // Restore display_order (shuffle randomised pool; daily is ordered by display_order)
+            var displayIndex = daily
+                .Select((o, idx) => (o.Id, idx))
+                .ToDictionary(x => x.Id, x => x.idx);
+
+            return pool
+                .OrderBy(o => displayIndex.GetValueOrDefault(o.Id, int.MaxValue))
+                .Select(o => new TodaysDailyObjectiveRow(
+                    o.Name,
+                    o.ActivityType,
+                    o.TargetValue,
+                    counts.GetValueOrDefault(o.Id, 0)))
+                .ToList();
+        }
     }
 
     public record TierDistributionRow(int TierNumber, string TierName, int ClaimCount);
diff --git a/src/Perpetuum.AdminTool/Seasons/TodaysDailyObjectiveRow.cs b/src/Perpetuum.AdminTool/Seasons/TodaysDailyObjectiveRow.cs
new file mode 100644
index 0000000..11e9408
--- /dev/null
+++ b/src/Perpetuum.AdminTool/Seasons/TodaysDailyObjectiveRow.cs
@@ -0,0 +1,10 @@
+using Perpetuum.Services.Seasons;
+
+namespace Perpetuum.AdminTool.Seasons
+{
+    public record TodaysDailyObjectiveRow(
+        string Name,
+        SeasonActivityType ActivityType,
+        long TargetValue,
+        int CompletionsToday);
+}
diff --git a/src/Perpetuum.AdminTool/ViewModels/AddSetMemberViewModel.cs b/src/Perpetuum.AdminTool/ViewModels/AddSetMemberViewModel.cs
new file mode 100644
index 0000000..1645628
--- /dev/null
+++ b/src/Perpetuum.AdminTool/ViewModels/AddSetMemberViewModel.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows.Data;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Perpetuum.AdminTool.Common;
+using Perpetuum.AdminTool.EquipmentSets;
+using Perpetuum.AdminTool.Packages;
+using Perpetuum.AdminTool.Translations;
+using Perpetuum.ExportedTypes;
+
+namespace Perpetuum.AdminTool.ViewModels
+{
+    public partial class AddSetMemberViewModel : ObservableObject
+    {
+        private static readonly long _equipmentRoot = (long)CategoryFlags.cf_robot_equipment;
+        private static readonly long _equipmentMask = PackageItemPickItem.CategoryFlagsMask(_equipmentRoot);
+        private const int EnglishLangId = 0;
+
+        [ObservableProperty] private string _filterText = "";
+        [ObservableProperty] private SetMemberPickItem? _selectedItem;
+        [ObservableProperty] private string _errorMessage = "";
+
+        public ObservableCollection<SetMemberPickItem> Items { get; } = new();
+        public ICollectionView View { get; }
+
+        public AddSetMemberViewModel(
+            LookupCache lookups,
+            TranslationsViewModel translations,
+            IReadOnlySet<int> alreadyAssigned)
+        {
+            var store = translations.Store;
+            foreach (var e in lookups.Entities)
+            {
+                if (!e.Enabled) continue;
+                if (e.Hidden) continue;
+                if ((e.CategoryFlags & _equipmentMask) != _equipmentRoot) continue;
+                if (alreadyAssigned.Contains(e.Definition)) continue;
+
+                var translated = "";
+                if (store != null)
+                {
+                    var row = store.Rows.FirstOrDefault(r => r.Key == e.Name);
+                    translated = row?[EnglishLangId] ?? "";
+                }
+
+                Items.Add(new SetMemberPickItem
+                {
+                    Definition     = e.Definition,
+                    DefinitionName = e.Name,
+                    TranslatedName = translated,
+                });
+            }
+
+            View = CollectionViewSource.GetDefaultView(Items);
+            View.Filter = MatchesFilter;
+        }
+
+        partial void OnFilterTextChanged(string value) => View.Refresh();
+
+        private bool MatchesFilter(object obj)
+        {
+            if (obj is not SetMemberPickItem item) return false;
+            if (string.IsNullOrWhiteSpace(FilterText)) return true;
+            var f = FilterText.Trim();
+            if (int.TryParse(f, out var id)) return item.Definition == id;
+            return item.DefinitionName.Contains(f, StringComparison.OrdinalIgnoreCase)
+                || item.TranslatedName.Contains(f, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
diff --git a/src/Perpetuum.AdminTool/ViewModels/AddSetThresholdViewModel.cs b/src/Perpetuum.AdminTool/ViewModels/AddSetThresholdViewModel.cs
new file mode 100644
index 0000000..b9b51fa
--- /dev/null
+++ b/src/Perpetuum.AdminTool/ViewModels/AddSetThresholdViewModel.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Windows.Data;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Perpetuum.AdminTool.EquipmentSets;
+
+namespace Perpetuum.AdminTool.ViewModels
+{
+    public partial class AddSetThresholdViewModel : ObservableObject
+    {
+        [ObservableProperty] private string _filterText = "";
+        [ObservableProperty] private AggregateFieldPickItem? _selectedField;
+        [ObservableProperty] private int _requiredPieces;
+        [ObservableProperty] private double _bonusValue;
+        [ObservableProperty] private string _errorMessage = "";
+
+        public ObservableCollection<AggregateFieldPickItem> Items { get; } = new();
+        public ICollectionView View { get; }
+
+        public AddSetThresholdViewModel(System.Collections.Generic.IEnumerable<AggregateFieldPickItem> fields)
+        {
+            foreach (var f in fields)
+                Items.Add(f);
+
+            View = CollectionViewSource.GetDefaultView(Items);
+            View.Filter = MatchesFilter;
+        }
+
+        partial void OnFilterTextChanged(string value) => View.Refresh();
+
+        private bool MatchesFilter(object obj)
+        {
+            if (obj is not AggregateFieldPickItem item) return false;
+            if (string.IsNullOrWhiteSpace(FilterText)) return true;
+            var f = FilterText.Trim();
+            return item.Name.Contains(f, StringComparison.OrdinalIgnoreCase)
+                || item.TranslatedName.Contains(f, StringComparison.OrdinalIgnoreCase);
+        }
+    }
+}
diff --git a/src/Perpetuum.AdminTool/ViewModels/EquipmentSetsViewModel.cs b/src/Perpetuum.AdminTool/ViewModels/EquipmentSetsViewModel.cs
new file mode 100644
index 0000000..5767f45
--- /dev/null
+++ b/src/Perpetuum.AdminTool/ViewModels/EquipmentSetsViewModel.cs
@@ -0,0 +1,341 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using Perpetuum.AdminTool.Common;
+using Perpetuum.AdminTool.Editing;
+using Perpetuum.AdminTool.EquipmentSets;
+using Perpetuum.AdminTool.Translations;
+using Perpetuum.AdminTool.Views;
+
+namespace Perpetuum.AdminTool.ViewModels
+{
+    public partial class EquipmentSetsViewModel : ObservableObject
+    {
+        private readonly EquipmentSetRepository _repo;
+        private readonly ChangeQueue _queue;
+        private readonly LookupCache _lookups;
+        private readonly TranslationsViewModel _translations;
+        private const int EnglishLangId = 0;
+
+        [ObservableProperty] private bool _isLoading;
+        [ObservableProperty] private string _statusMessage = "";
+        [ObservableProperty] private bool _statusIsError;
+        [ObservableProperty] private string _newSetName = "";
+
+        [ObservableProperty]
+        [NotifyPropertyChangedFor(nameof(HasSelection))]
+        [NotifyPropertyChangedFor(nameof(CanRename))]
+        private EquipmentSetRow? _selectedSet;
+
+        public bool HasSelection => SelectedSet != null;
+        public bool CanRename    => SelectedSet is { IsNew: false };
+
+        public ObservableCollection<EquipmentSetRow>          Sets                  { get; } = new();
+        public ObservableCollection<EquipmentSetMemberRow>    Members               { get; } = new();
+        public ObservableCollection<EquipmentSetThresholdRow> Thresholds            { get; } = new();
+        public ObservableCollection<AggregateFieldPickItem>   AggregateFieldOptions { get; } = new();
+
+        public EquipmentSetsViewModel(
+            EquipmentSetRepository repo,
+            ChangeQueue queue,
+            LookupCache lookups,
+            TranslationsViewModel translations)
+        {
+            _repo         = repo;
+            _queue        = queue;
+            _lookups      = lookups;
+            _translations = translations;
+        }
+
+        partial void OnSelectedSetChanged(EquipmentSetRow? value)
+        {
+            _ = LoadSetDetailAsync(value);
+        }
+
+        // ── Reload ───────────────────────────────────────────────────────────
+
+        public async Task ReloadAsync()
+        {
+            IsLoading     = true;
+            StatusMessage = "";
+            StatusIsError = false;
+            try
+            {
+                var sets   = await _repo.LoadAllSetsAsync();
+                var fields = await _repo.LoadAggregateFieldsAsync();
+                var store  = _translations.Store;
+
+                Sets.Clear();
+                foreach (var s in sets) Sets.Add(s);
+
+                AggregateFieldOptions.Clear();
+                foreach (var f in fields
+                    .Select(f =>
+                    {
+                        var translated = "";
+                        if (store != null)
+                        {
+                            var row = store.Rows.FirstOrDefault(r => r.Key == f.Name);
+                            translated = row?[EnglishLangId] ?? "";
+                        }
+                        return new AggregateFieldPickItem { Id = f.Id, Name = f.Name, TranslatedName = translated };
+                    })
+                    .OrderBy(f => f.Display, StringComparer.OrdinalIgnoreCase))
+                {
+                    AggregateFieldOptions.Add(f);
+                }
+
+                var reselect = SelectedSet != null
+                    ? Sets.FirstOrDefault(s => s.SetId == SelectedSet.SetId)
+                    : null;
+                SelectedSet = reselect;
+            }
+            catch (Exception ex)
+            {
+                StatusIsError = true;
+                StatusMessage = $"Reload failed: {ex.Message}";
+            }
+            finally { IsLoading = false; }
+        }
+
+        // ── Set detail load ───────────────────────────────────────────────────
+
+        private async Task LoadSetDetailAsync(EquipmentSetRow? set)
+        {
+            Members.Clear();
+            foreach (var t in Thresholds) t.PropertyChanged -= OnThresholdPropertyChanged;
+            Thresholds.Clear();
+
+            if (set == null || set.IsNew) return;
+
+            IsLoading = true;
+            try
+            {
+                var store      = _translations.Store;
+                var members    = await _repo.LoadMembersAsync(set.SetId);
+                var thresholds = await _repo.LoadThresholdsAsync(set.SetId);
+
+                foreach (var m in members)
+                {
+                    var translated = "";
+                    if (store != null)
+                    {
+                        var row = store.Rows.FirstOrDefault(r => r.Key == m.DefinitionName);
+                        translated = row?[EnglishLangId] ?? "";
+                    }
+                    Members.Add(new EquipmentSetMemberRow
+                    {
+                        SetId          = m.SetId,
+                        Definition     = m.Definition,
+                        DefinitionName = m.DefinitionName,
+                        TranslatedName = translated,
+                    });
+                }
+
+                foreach (var t in thresholds)
+                {
+                    var field = AggregateFieldOptions.FirstOrDefault(f => f.Id == t.AggregateFieldId);
+                    var row = new EquipmentSetThresholdRow
+                    {
+                        SetId                  = t.SetId,
+                        RequiredPieces         = t.RequiredPieces,
+                        OriginalRequiredPieces  = t.RequiredPieces,
+                        AggregateFieldId       = t.AggregateFieldId,
+                        FieldSystemName        = field?.Name ?? t.AggregateFieldId.ToString(),
+                        FieldDisplay           = field?.Display ?? t.AggregateFieldId.ToString(),
+                        BonusValue             = t.BonusValue,
+                    };
+                    row.PropertyChanged += OnThresholdPropertyChanged;
+                    Thresholds.Add(row);
+                }
+            }
+            catch (Exception ex)
+            {
+                StatusIsError = true;
+                StatusMessage = $"Failed to load set detail: {ex.Message}";
+            }
+            finally { IsLoading = false; }
+        }
+
+        // ── Threshold PropertyChanged → auto-UPSERT ───────────────────────────
+
+        private void OnThresholdPropertyChanged(object? sender, PropertyChangedEventArgs e)
+        {
+            if (sender is not EquipmentSetThresholdRow row) return;
+            if (SelectedSet == null) return;
+
+            if (row.RequiredPieces > 0 && row.AggregateFieldId > 0)
+            {
+                if (Thresholds.Any(t => !ReferenceEquals(t, row) && t.RequiredPieces == row.RequiredPieces))
+                {
+                    SetStatus($"A threshold for {row.RequiredPieces} piece(s) already exists.", isError: true);
+                    return;
+                }
+
+                if (e.PropertyName == nameof(EquipmentSetThresholdRow.RequiredPieces)
+                    && row.OriginalRequiredPieces > 0
+                    && row.OriginalRequiredPieces != row.RequiredPieces)
+                {
+                    _queue.Add(EquipmentSetChanges.BuildDeleteThreshold(
+                        SelectedSet.SetId, SelectedSet.Name, row.OriginalRequiredPieces));
+                    row.OriginalRequiredPieces = row.RequiredPieces;
+                }
+
+                _queue.Add(EquipmentSetChanges.BuildUpsertThreshold(
+                    SelectedSet.SetId, SelectedSet.Name,
+                    row.RequiredPieces, row.AggregateFieldId, row.BonusValue));
+            }
+        }
+
+        // ── Create set ────────────────────────────────────────────────────────
+
+        [RelayCommand]
+        private void CreateSet()
+        {
+            var name = NewSetName.Trim();
+            if (string.IsNullOrEmpty(name))
+            {
+                SetStatus("Set name is required.", isError: true);
+                return;
+            }
+            if (Sets.Any(s => string.Equals(s.Name, name, StringComparison.OrdinalIgnoreCase)))
+            {
+                SetStatus($"A set named '{name}' already exists.", isError: true);
+                return;
+            }
+            _queue.Add(EquipmentSetChanges.BuildInsertSet(name));
+            var row = new EquipmentSetRow { SetId = 0, Name = name };
+            Sets.Add(row);
+            SelectedSet = row;
+            NewSetName  = "";
+            SetStatus($"'{name}' queued for insert. Commit to persist.", isError: false);
+        }
+
+        // ── Delete set ────────────────────────────────────────────────────────
+
+        [RelayCommand(CanExecute = nameof(HasSelection))]
+        private void DeleteSet()
+        {
+            if (SelectedSet == null) return;
+            var memberCount    = Members.Count;
+            var thresholdCount = Thresholds.Count;
+            var msg =
+                $"Delete set '{SelectedSet.Name}'?\n\n" +
+                $"This will also remove {memberCount} member(s) and {thresholdCount} threshold row(s).\n\n" +
+                "Continue?";
+            if (MessageBox.Show(msg, "Delete set", MessageBoxButton.YesNo, MessageBoxImage.Warning, MessageBoxResult.No)
+                != MessageBoxResult.Yes) return;
+
+            _queue.Add(EquipmentSetChanges.BuildDeleteSet(SelectedSet.SetId, SelectedSet.Name));
+            Sets.Remove(SelectedSet);
+            SelectedSet = null;
+        }
+
+        // ── Rename set ────────────────────────────────────────────────────────
+
+        [RelayCommand(CanExecute = nameof(CanRename))]
+        private void RenameSet()
+        {
+            if (SelectedSet == null) return;
+            var newName = SelectedSet.Name.Trim();
+            if (string.IsNullOrEmpty(newName))
+            {
+                SetStatus("New name is required.", isError: true);
+                return;
+            }
+            if (Sets.Any(s => !ReferenceEquals(s, SelectedSet) &&
+                              string.Equals(s.Name, newName, StringComparison.OrdinalIgnoreCase)))
+            {
+                SetStatus($"A set named '{newName}' already exists.", isError: true);
+                return;
+            }
+            _queue.Add(EquipmentSetChanges.BuildRenameSet(SelectedSet.SetId, newName));
+            SelectedSet.Name = newName;
+            SetStatus($"Rename to '{newName}' queued.", isError: false);
+        }
+
+        // ── Add member ────────────────────────────────────────────────────────
+
+        public void AddMember(Window owner)
+        {
+            if (SelectedSet == null) return;
+            var assigned = Members.Select(m => m.Definition).ToHashSet();
+            var vm  = new AddSetMemberViewModel(_lookups, _translations, assigned);
+            var win = new AddSetMemberWindow(vm) { Owner = owner };
+            if (win.ShowDialog() != true || vm.SelectedItem == null) return;
+
+            var item = vm.SelectedItem;
+            _queue.Add(EquipmentSetChanges.BuildInsertMember(SelectedSet.SetId, SelectedSet.Name, item.Definition));
+            Members.Add(new EquipmentSetMemberRow
+            {
+                SetId          = SelectedSet.SetId,
+                Definition     = item.Definition,
+                DefinitionName = item.DefinitionName,
+                TranslatedName = item.TranslatedName,
+            });
+        }
+
+        // ── Remove member ─────────────────────────────────────────────────────
+
+        [RelayCommand]
+        private void RemoveMember(EquipmentSetMemberRow row)
+        {
+            if (SelectedSet == null) return;
+            _queue.Add(EquipmentSetChanges.BuildDeleteMember(SelectedSet.SetId, SelectedSet.Name, row.Definition));
+            Members.Remove(row);
+        }
+
+        // ── Add threshold ─────────────────────────────────────────────────────
+
+        public void AddThreshold(Window owner)
+        {
+            if (SelectedSet == null) return;
+            var usedPieces = Thresholds.Select(t => t.RequiredPieces).ToHashSet();
+            var vm  = new AddSetThresholdViewModel(AggregateFieldOptions);
+            var win = new AddSetThresholdWindow(vm, usedPieces) { Owner = owner };
+            if (win.ShowDialog() != true || vm.SelectedField == null) return;
+
+            var row = new EquipmentSetThresholdRow
+            {
+                SetId                  = SelectedSet.SetId,
+                RequiredPieces         = vm.RequiredPieces,
+                OriginalRequiredPieces = vm.RequiredPieces,
+                AggregateFieldId       = vm.SelectedField.Id,
+                FieldSystemName        = vm.SelectedField.Name,
+                FieldDisplay           = vm.SelectedField.Display,
+                BonusValue             = vm.BonusValue,
+            };
+            row.PropertyChanged += OnThresholdPropertyChanged;
+            _queue.Add(EquipmentSetChanges.BuildUpsertThreshold(
+                SelectedSet.SetId, SelectedSet.Name,
+                row.RequiredPieces, row.AggregateFieldId, row.BonusValue));
+            Thresholds.Add(row);
+        }
+
+        // ── Remove threshold ──────────────────────────────────────────────────
+
+        [RelayCommand]
+        private void RemoveThreshold(EquipmentSetThresholdRow row)
+        {
+            if (SelectedSet != null && row.RequiredPieces > 0 && row.AggregateFieldId > 0)
+                _queue.Add(EquipmentSetChanges.BuildDeleteThreshold(
+                    SelectedSet.SetId, SelectedSet.Name, row.RequiredPieces));
+            row.PropertyChanged -= OnThresholdPropertyChanged;
+            Thresholds.Remove(row);
+        }
+
+        // ── Helpers ───────────────────────────────────────────────────────────
+
+        private void SetStatus(string message, bool isError)
+        {
+            StatusMessage = message;
+            StatusIsError = isError;
+        }
+    }
+}
diff --git a/src/Perpetuum.AdminTool/ViewModels/MainViewModel.cs b/src/Perpetuum.AdminTool/ViewModels/MainViewModel.cs
index 36b7b09..d0a5bfa 100644
--- a/src/Perpetuum.AdminTool/ViewModels/MainViewModel.cs
+++ b/src/Perpetuum.AdminTool/ViewModels/MainViewModel.cs
@@ -8,6 +8,7 @@
 using Perpetuum.AdminTool.Common;
 using Perpetuum.AdminTool.Editing;
 using Perpetuum.AdminTool.Packages;
+using Perpetuum.AdminTool.EquipmentSets;
 using Perpetuum.AdminTool.Seasons;
 using Perpetuum.AdminTool.Settings;
 using Perpetuum.AdminTool.Views;
@@ -36,6 +37,7 @@ public partial class MainViewModel : ObservableObject
         public PresencesViewModel Presences { get; }
         public FlocksViewModel Flocks { get; }
         public SeasonsViewModel Seasons { get; }
+        public EquipmentSetsViewModel EquipmentSets { get; }
 
         public MainViewModel(AppSettingsStore store, AppSession session)
         {
@@ -57,6 +59,11 @@ public MainViewModel(AppSettingsStore store, AppSession session)
                 session.Lookups,
                 store.Settings.Connection,
                 Translations);
+            EquipmentSets = new EquipmentSetsViewModel(
+                new EquipmentSetRepository(store.Settings.Connection),
+                session.Changes,
+                session.Lookups,
+                Translations);
             UpdateStatus();
 
             _ = InitializeLookupsAsync();
diff --git a/src/Perpetuum.AdminTool/ViewModels/SeasonStatisticsViewModel.cs b/src/Perpetuum.AdminTool/ViewModels/SeasonStatisticsViewModel.cs
index a36c6f4..6624bf5 100644
--- a/src/Perpetuum.AdminTool/ViewModels/SeasonStatisticsViewModel.cs
+++ b/src/Perpetuum.AdminTool/ViewModels/SeasonStatisticsViewModel.cs
@@ -20,6 +20,8 @@ public partial class SeasonStatisticsViewModel : ObservableObject
         public ObservableCollection<TierDistributionRow> TierDistribution { get; } = new();
         public ObservableCollection<LeaderboardEntryRow> Top10 { get; } = new();
         public ObservableCollection<ObjectiveCompletionRow> ObjectiveCompletion { get; } = new();
+        public ObservableCollection<TodaysDailyObjectiveRow> TodaysDailyObjectives { get; } = new();
+        [ObservableProperty] private bool _hasTodaysDailyObjectives;
 
         public SeasonStatisticsViewModel(SeasonRepository repo)
         {
@@ -46,6 +48,11 @@ public async Task LoadAsync(int seasonId)
 
                 ObjectiveCompletion.Clear();
                 foreach (var r in await _repo.LoadObjectiveCompletionAsync(seasonId)) ObjectiveCompletion.Add(r);
+
+                TodaysDailyObjectives.Clear();
+                foreach (var r in await _repo.LoadTodaysDailyObjectivesAsync(seasonId))
+                    TodaysDailyObjectives.Add(r);
+                HasTodaysDailyObjectives = TodaysDailyObjectives.Count > 0;
             }
             finally { IsLoading = false; }
         }
diff --git a/src/Perpetuum.AdminTool/Views/AddSetMemberWindow.xaml b/src/Perpetuum.AdminTool/Views/AddSetMemberWindow.xaml
new file mode 100644
index 0000000..9eba42a
--- /dev/null
+++ b/src/Perpetuum.AdminTool/Views/AddSetMemberWindow.xaml
@@ -0,0 +1,38 @@
+<Window x:Class="Perpetuum.AdminTool.Views.AddSetMemberWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Add module to set"
+        Width="560" Height="480"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="CanResizeWithGrip">
+    <DockPanel Margin="10">
+        <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal"
+                    HorizontalAlignment="Right" Margin="0,8,0,0">
+            <TextBlock VerticalAlignment="Center" Foreground="DarkRed" Margin="0,0,12,0"
+                       Text="{Binding ErrorMessage}"/>
+            <Button Content="Add" Padding="14,4" Margin="0,0,8,0" IsDefault="True" Click="OnAddClick"/>
+            <Button Content="Cancel" Padding="10,4" IsCancel="True" Click="OnCancelClick"/>
+        </StackPanel>
+
+        <TextBox DockPanel.Dock="Top"
+                 Text="{Binding FilterText, UpdateSourceTrigger=PropertyChanged, Delay=200}"
+                 Margin="0,0,0,6"/>
+
+        <DataGrid ItemsSource="{Binding View}"
+                  SelectedItem="{Binding SelectedItem}"
+                  AutoGenerateColumns="False"
+                  CanUserAddRows="False"
+                  CanUserDeleteRows="False"
+                  IsReadOnly="True"
+                  SelectionMode="Single"
+                  SelectionUnit="FullRow"
+                  HeadersVisibility="Column"
+                  GridLinesVisibility="Horizontal">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Def" Binding="{Binding Definition}" Width="60"/>
+                <DataGridTextColumn Header="Definition name" Binding="{Binding DefinitionName}" Width="220"/>
+                <DataGridTextColumn Header="Display name" Binding="{Binding TranslatedName}" Width="*"/>
+            </DataGrid.Columns>
+        </DataGrid>
+    </DockPanel>
+</Window>
diff --git a/src/Perpetuum.AdminTool/Views/AddSetMemberWindow.xaml.cs b/src/Perpetuum.AdminTool/Views/AddSetMemberWindow.xaml.cs
new file mode 100644
index 0000000..50d2ff9
--- /dev/null
+++ b/src/Perpetuum.AdminTool/Views/AddSetMemberWindow.xaml.cs
@@ -0,0 +1,27 @@
+using System.Windows;
+using Perpetuum.AdminTool.ViewModels;
+
+namespace Perpetuum.AdminTool.Views
+{
+    public partial class AddSetMemberWindow : Window
+    {
+        public AddSetMemberWindow(AddSetMemberViewModel vm)
+        {
+            InitializeComponent();
+            DataContext = vm;
+        }
+
+        private void OnAddClick(object sender, RoutedEventArgs e)
+        {
+            var vm = (AddSetMemberViewModel)DataContext;
+            if (vm.SelectedItem == null)
+            {
+                vm.ErrorMessage = "Select a module first.";
+                return;
+            }
+            DialogResult = true;
+        }
+
+        private void OnCancelClick(object sender, RoutedEventArgs e) => DialogResult = false;
+    }
+}
diff --git a/src/Perpetuum.AdminTool/Views/AddSetThresholdWindow.xaml b/src/Perpetuum.AdminTool/Views/AddSetThresholdWindow.xaml
new file mode 100644
index 0000000..06e5874
--- /dev/null
+++ b/src/Perpetuum.AdminTool/Views/AddSetThresholdWindow.xaml
@@ -0,0 +1,58 @@
+<Window x:Class="Perpetuum.AdminTool.Views.AddSetThresholdWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        Title="Add bonus threshold"
+        Width="580" Height="520"
+        WindowStartupLocation="CenterOwner"
+        ResizeMode="CanResizeWithGrip">
+    <DockPanel Margin="10">
+
+        <!-- Bottom: inputs + buttons -->
+        <StackPanel DockPanel.Dock="Bottom" Margin="0,10,0,0">
+            <Grid Margin="0,0,0,8">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="80"/>
+                    <ColumnDefinition Width="20"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="*"/>
+                </Grid.ColumnDefinitions>
+                <TextBlock Grid.Column="0" Text="Required pieces:" VerticalAlignment="Center" Margin="0,0,6,0"/>
+                <TextBox   Grid.Column="1" Text="{Binding RequiredPieces, UpdateSourceTrigger=PropertyChanged}"/>
+                <TextBlock Grid.Column="3" Text="Bonus value:" VerticalAlignment="Center" Margin="0,0,6,0"/>
+                <TextBox   Grid.Column="4" Text="{Binding BonusValue, UpdateSourceTrigger=LostFocus}"/>
+            </Grid>
+            <DockPanel>
+                <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
+                    <Button Content="Add" Padding="14,4" Margin="0,0,8,0" IsDefault="True" Click="OnAddClick"/>
+                    <Button Content="Cancel" Padding="10,4" IsCancel="True" Click="OnCancelClick"/>
+                </StackPanel>
+                <TextBlock VerticalAlignment="Center" Foreground="DarkRed" Text="{Binding ErrorMessage}"/>
+            </DockPanel>
+        </StackPanel>
+
+        <!-- Search box -->
+        <TextBox DockPanel.Dock="Top"
+                 Text="{Binding FilterText, UpdateSourceTrigger=PropertyChanged, Delay=200}"
+                 Margin="0,0,0,6"/>
+
+        <!-- Field list -->
+        <DataGrid ItemsSource="{Binding View}"
+                  SelectedItem="{Binding SelectedField}"
+                  AutoGenerateColumns="False"
+                  CanUserAddRows="False"
+                  CanUserDeleteRows="False"
+                  IsReadOnly="True"
+                  SelectionMode="Single"
+                  SelectionUnit="FullRow"
+                  HeadersVisibility="Column"
+                  GridLinesVisibility="Horizontal">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Id"           Binding="{Binding Id}"            Width="50"/>
+                <DataGridTextColumn Header="System name"  Binding="{Binding Name}"          Width="220"/>
+                <DataGridTextColumn Header="Display name" Binding="{Binding TranslatedName}" Width="*"/>
+            </DataGrid.Columns>
+        </DataGrid>
+
+    </DockPanel>
+</Window>
diff --git a/src/Perpetuum.AdminTool/Views/AddSetThresholdWindow.xaml.cs b/src/Perpetuum.AdminTool/Views/AddSetThresholdWindow.xaml.cs
new file mode 100644
index 0000000..03ca975
--- /dev/null
+++ b/src/Perpetuum.AdminTool/Views/AddSetThresholdWindow.xaml.cs
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Windows;
+using Perpetuum.AdminTool.ViewModels;
+
+namespace Perpetuum.AdminTool.Views
+{
+    public partial class AddSetThresholdWindow : Window
+    {
+        private readonly IReadOnlySet<int> _usedPieces;
+
+        public AddSetThresholdWindow(AddSetThresholdViewModel vm, IReadOnlySet<int> usedPieces)
+        {
+            InitializeComponent();
+            DataContext  = vm;
+            _usedPieces  = usedPieces;
+        }
+
+        private void OnAddClick(object sender, RoutedEventArgs e)
+        {
+            var vm = (AddSetThresholdViewModel)DataContext;
+            if (vm.SelectedField == null)
+            {
+                vm.ErrorMessage = "Select an aggregate field first.";
+                return;
+            }
+            if (vm.RequiredPieces <= 0)
+            {
+                vm.ErrorMessage = "Required pieces must be greater than zero.";
+                return;
+            }
+            if (_usedPieces.Contains(vm.RequiredPieces))
+            {
+                vm.ErrorMessage = $"A threshold for {vm.RequiredPieces} piece(s) already exists.";
+                return;
+            }
+            DialogResult = true;
+        }
+
+        private void OnCancelClick(object sender, RoutedEventArgs e) => DialogResult = false;
+    }
+}
diff --git a/src/Perpetuum.AdminTool/Views/EquipmentSetsView.xaml b/src/Perpetuum.AdminTool/Views/EquipmentSetsView.xaml
new file mode 100644
index 0000000..21c3bb8
--- /dev/null
+++ b/src/Perpetuum.AdminTool/Views/EquipmentSetsView.xaml
@@ -0,0 +1,177 @@
+<UserControl x:Class="Perpetuum.AdminTool.Views.EquipmentSetsView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:common="clr-namespace:Perpetuum.AdminTool.Common"
+             xmlns:vm="clr-namespace:Perpetuum.AdminTool.ViewModels"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d"
+             d:DataContext="{d:DesignInstance Type=vm:EquipmentSetsViewModel}">
+
+    <UserControl.Resources>
+        <common:BindingProxy x:Key="VmProxy" Data="{Binding}"/>
+        <BooleanToVisibilityConverter x:Key="BoolToVis"/>
+    </UserControl.Resources>
+
+    <DockPanel>
+
+        <!-- Top info bar -->
+        <Border DockPanel.Dock="Top" Background="#FFF8E1" Padding="8,6"
+                BorderBrush="#FFD54F" BorderThickness="0,0,0,1">
+            <DockPanel>
+                <Button DockPanel.Dock="Right" Content="Reload" Padding="10,2"
+                        Click="OnReloadClick"
+                        IsEnabled="{Binding IsLoading, Converter={x:Static common:InverseBoolConverter.Instance}}"/>
+                <TextBlock VerticalAlignment="Center" Foreground="#795548"
+                           Text="&#9888;  Changes take effect after server restart."/>
+            </DockPanel>
+        </Border>
+
+        <!-- Status message -->
+        <Border DockPanel.Dock="Top" Padding="8,4" Background="#F8F8F8"
+                BorderBrush="#DDD" BorderThickness="0,0,0,1">
+            <TextBlock Text="{Binding StatusMessage}">
+                <TextBlock.Style>
+                    <Style TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="DimGray"/>
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding StatusIsError}" Value="True">
+                                <Setter Property="Foreground" Value="DarkRed"/>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBlock.Style>
+            </TextBlock>
+        </Border>
+
+        <!-- Body: left + right panels -->
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="220" MinWidth="120"/>
+                <ColumnDefinition Width="5"/>
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <!-- Left: sets list -->
+            <DockPanel Grid.Column="0" Margin="6">
+                <!-- Create / Delete at bottom -->
+                <StackPanel DockPanel.Dock="Bottom" Margin="0,6,0,0">
+                    <DockPanel Margin="0,0,0,4">
+                        <Button DockPanel.Dock="Right" Content="Create" Padding="8,2"
+                                Margin="4,0,0,0" Command="{Binding CreateSetCommand}"/>
+                        <TextBox Text="{Binding NewSetName, UpdateSourceTrigger=PropertyChanged}"
+                                 ToolTip="New set name"/>
+                    </DockPanel>
+                    <Button Content="Delete set" Padding="8,2" Foreground="DarkRed"
+                            Command="{Binding DeleteSetCommand}"/>
+                </StackPanel>
+
+                <ListBox ItemsSource="{Binding Sets}"
+                         SelectedItem="{Binding SelectedSet}"
+                         DisplayMemberPath="Name"/>
+            </DockPanel>
+
+            <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" Background="#DDD"/>
+
+            <!-- Right: set detail (visible when a set is selected) -->
+            <ScrollViewer Grid.Column="2" VerticalScrollBarVisibility="Auto"
+                          Visibility="{Binding HasSelection, Converter={StaticResource BoolToVis}}">
+                <StackPanel Margin="10">
+
+                    <!-- Name + Rename -->
+                    <TextBlock Text="Set name" FontWeight="Bold" Margin="0,0,0,4"/>
+                    <DockPanel Margin="0,0,0,16">
+                        <Button DockPanel.Dock="Right" Content="Rename" Padding="8,2"
+                                Margin="6,0,0,0"
+                                Command="{Binding RenameSetCommand}"/>
+                        <TextBox Text="{Binding SelectedSet.Name, UpdateSourceTrigger=PropertyChanged}"
+                                 IsReadOnly="{Binding SelectedSet.IsNew}"/>
+                    </DockPanel>
+
+                    <!-- Members -->
+                    <DockPanel Margin="0,0,0,4">
+                        <Button DockPanel.Dock="Right" Content="Add member" Padding="8,2"
+                                Click="OnAddMemberClick"/>
+                        <TextBlock Text="Members" FontWeight="Bold" VerticalAlignment="Center"/>
+                    </DockPanel>
+                    <DataGrid ItemsSource="{Binding Members}"
+                              AutoGenerateColumns="False"
+                              CanUserAddRows="False"
+                              CanUserDeleteRows="False"
+                              IsReadOnly="True"
+                              HeadersVisibility="Column"
+                              GridLinesVisibility="Horizontal"
+                              MaxHeight="200"
+                              Margin="0,0,0,16">
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Header="Def" Binding="{Binding Definition}" Width="60"/>
+                            <DataGridTextColumn Header="Definition name" Binding="{Binding DefinitionName}" Width="200"/>
+                            <DataGridTextColumn Header="Display name" Binding="{Binding TranslatedName}" Width="*"/>
+                            <DataGridTemplateColumn Width="70">
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <Button Content="Remove" Padding="4,1" Foreground="DarkRed"
+                                                Command="{Binding Source={StaticResource VmProxy}, Path=Data.RemoveMemberCommand}"
+                                                CommandParameter="{Binding}"/>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn>
+                        </DataGrid.Columns>
+                    </DataGrid>
+
+                    <!-- Bonus Thresholds -->
+                    <DockPanel Margin="0,0,0,4">
+                        <Button DockPanel.Dock="Right" Content="Add threshold" Padding="8,2"
+                                Click="OnAddThresholdClick"/>
+                        <TextBlock Text="Bonus Thresholds" FontWeight="Bold" VerticalAlignment="Center"/>
+                    </DockPanel>
+                    <DataGrid ItemsSource="{Binding Thresholds}"
+                              AutoGenerateColumns="False"
+                              CanUserAddRows="False"
+                              CanUserDeleteRows="False"
+                              HeadersVisibility="Column"
+                              GridLinesVisibility="Horizontal"
+                              Margin="0,0,0,4">
+                        <DataGrid.Columns>
+                            <DataGridTextColumn Header="Pieces" Width="60"
+                                                Binding="{Binding RequiredPieces, UpdateSourceTrigger=LostFocus}"/>
+                            <DataGridTextColumn Header="System name"  Width="180" IsReadOnly="True"
+                                                Binding="{Binding FieldSystemName}"/>
+                            <DataGridTextColumn Header="Display name" Width="*"   IsReadOnly="True"
+                                                Binding="{Binding FieldDisplay}"/>
+                            <DataGridTextColumn Header="Bonus value" Width="100"
+                                                Binding="{Binding BonusValue, UpdateSourceTrigger=LostFocus}"/>
+                            <DataGridTemplateColumn Width="50">
+                                <DataGridTemplateColumn.CellTemplate>
+                                    <DataTemplate>
+                                        <Button Content="&#xD7;" Padding="4,1" Foreground="DarkRed"
+                                                Command="{Binding Source={StaticResource VmProxy}, Path=Data.RemoveThresholdCommand}"
+                                                CommandParameter="{Binding}"/>
+                                    </DataTemplate>
+                                </DataGridTemplateColumn.CellTemplate>
+                            </DataGridTemplateColumn>
+                        </DataGrid.Columns>
+                    </DataGrid>
+
+                </StackPanel>
+            </ScrollViewer>
+
+            <!-- Placeholder when nothing selected -->
+            <TextBlock Grid.Column="2" Text="Select a set to view details."
+                       HorizontalAlignment="Center" VerticalAlignment="Center"
+                       Foreground="DimGray">
+                <TextBlock.Style>
+                    <Style TargetType="TextBlock">
+                        <Setter Property="Visibility" Value="Visible"/>
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding HasSelection}" Value="True">
+                                <Setter Property="Visibility" Value="Collapsed"/>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </TextBlock.Style>
+            </TextBlock>
+
+        </Grid>
+    </DockPanel>
+</UserControl>
diff --git a/src/Perpetuum.AdminTool/Views/EquipmentSetsView.xaml.cs b/src/Perpetuum.AdminTool/Views/EquipmentSetsView.xaml.cs
new file mode 100644
index 0000000..f9e4556
--- /dev/null
+++ b/src/Perpetuum.AdminTool/Views/EquipmentSetsView.xaml.cs
@@ -0,0 +1,39 @@
+using System.Windows;
+using System.Windows.Controls;
+using Perpetuum.AdminTool.ViewModels;
+
+namespace Perpetuum.AdminTool.Views
+{
+    public partial class EquipmentSetsView : UserControl
+    {
+        public EquipmentSetsView()
+        {
+            InitializeComponent();
+            Loaded += OnFirstLoaded;
+        }
+
+        private async void OnFirstLoaded(object sender, RoutedEventArgs e)
+        {
+            Loaded -= OnFirstLoaded;
+            if (Vm.Sets.Count == 0)
+                await Vm.ReloadAsync();
+        }
+
+        private EquipmentSetsViewModel Vm => (EquipmentSetsViewModel)DataContext;
+
+        private async void OnReloadClick(object sender, RoutedEventArgs e)
+        {
+            await Vm.ReloadAsync();
+        }
+
+        private void OnAddMemberClick(object sender, RoutedEventArgs e)
+        {
+            Vm.AddMember(Window.GetWindow(this)!);
+        }
+
+        private void OnAddThresholdClick(object sender, RoutedEventArgs e)
+        {
+            Vm.AddThreshold(Window.GetWindow(this)!);
+        }
+    }
+}
diff --git a/src/Perpetuum.AdminTool/Views/MainWindow.xaml b/src/Perpetuum.AdminTool/Views/MainWindow.xaml
index a307d90..1d25bb8 100644
--- a/src/Perpetuum.AdminTool/Views/MainWindow.xaml
+++ b/src/Perpetuum.AdminTool/Views/MainWindow.xaml
@@ -66,6 +66,9 @@
             <TabItem Header="Seasons">
                 <views:SeasonsView DataContext="{Binding Seasons}"/>
             </TabItem>
+            <TabItem Header="Equipment Sets">
+                <views:EquipmentSetsView DataContext="{Binding EquipmentSets}"/>
+            </TabItem>
             <TabItem Header="Translations">
                 <views:TranslationsView DataContext="{Binding Translations}"/>
             </TabItem>
diff --git a/src/Perpetuum.AdminTool/Views/SeasonDetailView.xaml b/src/Perpetuum.AdminTool/Views/SeasonDetailView.xaml
index 69156c7..3f1bfee 100644
--- a/src/Perpetuum.AdminTool/Views/SeasonDetailView.xaml
+++ b/src/Perpetuum.AdminTool/Views/SeasonDetailView.xaml
@@ -452,6 +452,21 @@
                                     <DataGridTextColumn Header="Completed" Binding="{Binding CompletedCount}" Width="120"/>
                                 </DataGrid.Columns>
                             </DataGrid>
+
+                            <StackPanel Visibility="{Binding HasTodaysDailyObjectives, Converter={StaticResource BoolToVis}}"
+                                        Margin="0,16,0,0">
+                                <TextBlock Text="Today's Daily Objectives" FontSize="13" FontWeight="Bold" Margin="0,0,0,4"/>
+                                <DataGrid ItemsSource="{Binding TodaysDailyObjectives}" AutoGenerateColumns="False"
+                                          IsReadOnly="True" HeadersVisibility="Column" GridLinesVisibility="Horizontal"
+                                          MaxHeight="240">
+                                    <DataGrid.Columns>
+                                        <DataGridTextColumn Header="Objective" Binding="{Binding Name}" Width="*"/>
+                                        <DataGridTextColumn Header="Activity Type" Binding="{Binding ActivityType}" Width="160"/>
+                                        <DataGridTextColumn Header="Target" Binding="{Binding TargetValue}" Width="80"/>
+                                        <DataGridTextColumn Header="Completed Today" Binding="{Binding CompletionsToday}" Width="130"/>
+                                    </DataGrid.Columns>
+                                </DataGrid>
+                            </StackPanel>
                         </StackPanel>
                     </ScrollViewer>
                 </DockPanel>
diff --git a/src/Perpetuum.Bootstrapper/Modules/EffectsModule.cs b/src/Perpetuum.Bootstrapper/Modules/EffectsModule.cs
index e28a33b..2134b3e 100644
--- a/src/Perpetuum.Bootstrapper/Modules/EffectsModule.cs
+++ b/src/Perpetuum.Bootstrapper/Modules/EffectsModule.cs
@@ -107,6 +107,9 @@ protected override void Load(ContainerBuilder builder)
             _ = builder.RegisterType<AuraEffect>().Keyed<Effect>(EffectType.effect_field_eccm);
             _ = builder.RegisterType<AuraEffect>().Keyed<Effect>(EffectType.effect_field_reactor_stabilizer);
 
+            // Equipment set bonus display effect
+            _ = builder.RegisterType<Effect>().Keyed<Effect>(EffectType.effect_equipment_set_bonus);
+
             _ = builder.Register<EffectFactory>(x =>
             {
                 IComponentContext ctx = x.Resolve<IComponentContext>();
diff --git a/src/Perpetuum.Bootstrapper/Modules/EntitiesModule.cs b/src/Perpetuum.Bootstrapper/Modules/EntitiesModule.cs
index 58a5fd4..ff263c8 100644
--- a/src/Perpetuum.Bootstrapper/Modules/EntitiesModule.cs
+++ b/src/Perpetuum.Bootstrapper/Modules/EntitiesModule.cs
@@ -19,6 +19,7 @@
 using Perpetuum.Modules.Weapons;
 using Perpetuum.Players;
 using Perpetuum.Robots;
+using Perpetuum.Robots.EquipmentSets;
 using Perpetuum.Services.ItemShop;
 using Perpetuum.Services.Looting;
 using Perpetuum.Services.MarketEngine;
@@ -753,6 +754,15 @@ private void InitItems(ContainerBuilder builder)
         {
             _ = builder.RegisterType<ItemDeployerHelper>();
             _ = builder.RegisterType<DefaultPropertyModifierReader>().AsSelf().OnActivated(e => e.Instance.Init()).SingleInstance();
+
+            builder.RegisterType<EquipmentSetRepository>()
+                .As<IEquipmentSetRepository>()
+                .SingleInstance()
+                .OnActivated(e => e.Instance.Init());
+
+            builder.RegisterType<EquipmentSetBonusCalculator>()
+                .As<IEquipmentSetBonusCalculator>()
+                .SingleInstance();
         }
 
     }
diff --git a/src/Perpetuum.ExportedTypes/EffectType.cs b/src/Perpetuum.ExportedTypes/EffectType.cs
index 11371b1..edfbb3e 100644
--- a/src/Perpetuum.ExportedTypes/EffectType.cs
+++ b/src/Perpetuum.ExportedTypes/EffectType.cs
@@ -139,5 +139,6 @@ public enum EffectType
         effect_field_stealth = 136,
         effect_field_eccm = 137,
         effect_field_reactor_stabilizer = 138,
+        effect_equipment_set_bonus = 139,
     }
 }
diff --git a/src/Perpetuum.RequestHandlers/Markets/MarketBuyItem.cs b/src/Perpetuum.RequestHandlers/Markets/MarketBuyItem.cs
index 132349e..704ba27 100644
--- a/src/Perpetuum.RequestHandlers/Markets/MarketBuyItem.cs
+++ b/src/Perpetuum.RequestHandlers/Markets/MarketBuyItem.cs
@@ -4,6 +4,7 @@
 using Perpetuum.Data;
 using Perpetuum.Host.Requests;
 using Perpetuum.Services.MarketEngine;
+using Perpetuum.Services.Seasons;
 
 namespace Perpetuum.RequestHandlers.Markets
 {
@@ -100,6 +101,10 @@ public void HandleRequest(IRequest request)
                     //pay out
                     market.PayOutToSeller(seller, sellOrder.useCorporationWallet, resultItem.Definition, sellOrder.price, boughtQuantity, TransactionType.marketSell, sellOrder.IsAffectsAverage(), forCorporation);
 
+                    SeasonServiceLocator.Instance?.RecordActivity(buyer.Id, SeasonActivityType.NicSpent,
+                        new ActivityEvent((long)(sellOrder.price * boughtQuantity), CounterpartyAccountId: seller.AccountId));
+                    SeasonServiceLocator.Instance?.RecordActivity(seller.Id, SeasonActivityType.NicEarned,
+                        new ActivityEvent((long)(sellOrder.price * boughtQuantity), CounterpartyAccountId: buyer.AccountId));
 
                     Market.SendMarketItemBoughtMessage(buyer,resultItem);
 
@@ -116,6 +121,9 @@ public void HandleRequest(IRequest request)
                         //infinite quantity case
                         _marketHelper.CashIn(buyer, useCorporationWallet, sellOrder.price, sellOrder.itemDefinition, quantity, TransactionType.marketBuy);
 
+                        SeasonServiceLocator.Instance?.RecordActivity(buyer.Id, SeasonActivityType.NicSpent,
+                            new ActivityEvent((long)(sellOrder.price * quantity)));
+
                         var boughtItem = publicContainer.CreateAndAddItem(sellOrder.itemDefinition, false, item =>
                         {
                             item.Owner = buyer.Eid;
@@ -154,6 +162,9 @@ public void HandleRequest(IRequest request)
 
                         _marketHelper.CashIn(buyer, useCorporationWallet, sellOrder.price, sellOrder.itemDefinition, boughtQuantity, TransactionType.marketBuy);
 
+                        SeasonServiceLocator.Instance?.RecordActivity(buyer.Id, SeasonActivityType.NicSpent,
+                            new ActivityEvent((long)(sellOrder.price * boughtQuantity)));
+
                         //average price
                         _marketHandler.InsertAveragePrice(market, sellOrder.itemDefinition, boughtQuantity * sellOrder.price, boughtQuantity);
                         market.AddCentralBank(TransactionType.marketBuy, boughtQuantity * sellOrder.price); //vendor income
diff --git a/src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusCalculator.cs b/src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusCalculator.cs
new file mode 100644
index 0000000..ffb1153
--- /dev/null
+++ b/src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusCalculator.cs
@@ -0,0 +1,60 @@
+using System.Collections.Generic;
+using Perpetuum.Items;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public class EquipmentSetBonusCalculator : IEquipmentSetBonusCalculator
+    {
+        private readonly IEquipmentSetRepository _repository;
+
+        public EquipmentSetBonusCalculator(IEquipmentSetRepository repository)
+        {
+            _repository = repository;
+        }
+
+        public EquipmentSetBonusResult Compute(IEnumerable<int> fittedDefinitions)
+        {
+            if (fittedDefinitions == null)
+                return EquipmentSetBonusResult.Empty;
+
+            var countPerSet = new Dictionary<int, int>();
+            foreach (int def in fittedDefinitions)
+            {
+                foreach (int setId in _repository.GetSetIdsForDefinition(def))
+                {
+                    countPerSet.TryGetValue(setId, out int current);
+                    countPerSet[setId] = current + 1;
+                }
+            }
+
+            if (countPerSet.Count == 0)
+                return EquipmentSetBonusResult.Empty;
+
+            var modifiersPerSet = new Dictionary<int, IReadOnlyList<ItemPropertyModifier>>();
+
+            foreach (KeyValuePair<int, int> entry in countPerSet)
+            {
+                int setId = entry.Key;
+                int count = entry.Value;
+                List<ItemPropertyModifier> setModifiers = null;
+
+                foreach (SetBonusThreshold threshold in _repository.GetThresholds(setId))
+                {
+                    if (threshold.RequiredPieces <= count)
+                    {
+                        setModifiers ??= new List<ItemPropertyModifier>();
+                        setModifiers.Add(ItemPropertyModifier.Create(threshold.Field, threshold.Value));
+                    }
+                }
+
+                if (setModifiers != null)
+                    modifiersPerSet[setId] = setModifiers; // List<T> upcast to IReadOnlyList<T>
+            }
+
+            if (modifiersPerSet.Count == 0)
+                return EquipmentSetBonusResult.Empty;
+
+            return new EquipmentSetBonusResult(modifiersPerSet);
+        }
+    }
+}
diff --git a/src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusResult.cs b/src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusResult.cs
new file mode 100644
index 0000000..81eacf2
--- /dev/null
+++ b/src/Perpetuum/Robots/EquipmentSets/EquipmentSetBonusResult.cs
@@ -0,0 +1,25 @@
+using Perpetuum.Items;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public sealed class EquipmentSetBonusResult
+    {
+        private static readonly IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>> _emptyDict =
+            new ReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>>(
+                new Dictionary<int, IReadOnlyList<ItemPropertyModifier>>());
+
+        public static readonly EquipmentSetBonusResult Empty = new(_emptyDict);
+
+        public EquipmentSetBonusResult(IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>> modifiersPerSet)
+        {
+            ModifiersPerSet = modifiersPerSet;
+            Modifiers = modifiersPerSet.Values.SelectMany(x => x).ToArray();
+        }
+
+        public IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>> ModifiersPerSet { get; }
+        public IReadOnlyList<ItemPropertyModifier> Modifiers { get; }
+    }
+}
diff --git a/src/Perpetuum/Robots/EquipmentSets/EquipmentSetRepository.cs b/src/Perpetuum/Robots/EquipmentSets/EquipmentSetRepository.cs
new file mode 100644
index 0000000..1dad6a4
--- /dev/null
+++ b/src/Perpetuum/Robots/EquipmentSets/EquipmentSetRepository.cs
@@ -0,0 +1,43 @@
+using Perpetuum.Data;
+using Perpetuum.ExportedTypes;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public class EquipmentSetRepository : IEquipmentSetRepository
+    {
+        private ILookup<int, int> _definitionToSetIds;
+        private ILookup<int, SetBonusThreshold> _setIdToThresholds;
+
+        public void Init()
+        {
+            _definitionToSetIds = Db.Query()
+                .CommandText("SELECT set_id, definition FROM equipment_set_members")
+                .Execute()
+                .ToLookup(
+                    r => r.GetValue<int>("definition"),
+                    r => r.GetValue<int>("set_id"));
+
+            _setIdToThresholds = Db.Query()
+                .CommandText("SELECT set_id, required_pieces, aggregate_field, bonus_value FROM equipment_set_bonus_thresholds ORDER BY set_id, required_pieces")
+                .Execute()
+                .ToLookup(
+                    r => r.GetValue<int>("set_id"),
+                    r => new SetBonusThreshold(
+                        r.GetValue<int>("required_pieces"),
+                        (AggregateField)r.GetValue<int>("aggregate_field"),
+                        r.GetValue<double>("bonus_value")));
+        }
+
+        public IEnumerable<int> GetSetIdsForDefinition(int definition)
+        {
+            return _definitionToSetIds[definition];
+        }
+
+        public IEnumerable<SetBonusThreshold> GetThresholds(int setId)
+        {
+            return _setIdToThresholds[setId];
+        }
+    }
+}
diff --git a/src/Perpetuum/Robots/EquipmentSets/IEquipmentSetBonusCalculator.cs b/src/Perpetuum/Robots/EquipmentSets/IEquipmentSetBonusCalculator.cs
new file mode 100644
index 0000000..4a68c31
--- /dev/null
+++ b/src/Perpetuum/Robots/EquipmentSets/IEquipmentSetBonusCalculator.cs
@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public interface IEquipmentSetBonusCalculator
+    {
+        EquipmentSetBonusResult Compute(IEnumerable<int> fittedDefinitions);
+    }
+}
diff --git a/src/Perpetuum/Robots/EquipmentSets/IEquipmentSetRepository.cs b/src/Perpetuum/Robots/EquipmentSets/IEquipmentSetRepository.cs
new file mode 100644
index 0000000..a923292
--- /dev/null
+++ b/src/Perpetuum/Robots/EquipmentSets/IEquipmentSetRepository.cs
@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public interface IEquipmentSetRepository
+    {
+        void Init();
+
+        /// <summary>Returns all set IDs the given module definition belongs to.</summary>
+        IEnumerable<int> GetSetIdsForDefinition(int definition);
+
+        /// <summary>Returns all threshold rows for the given set, ordered by required_pieces.</summary>
+        IEnumerable<SetBonusThreshold> GetThresholds(int setId);
+    }
+}
diff --git a/src/Perpetuum/Robots/EquipmentSets/SetBonusEffectApplicator.cs b/src/Perpetuum/Robots/EquipmentSets/SetBonusEffectApplicator.cs
new file mode 100644
index 0000000..687c899
--- /dev/null
+++ b/src/Perpetuum/Robots/EquipmentSets/SetBonusEffectApplicator.cs
@@ -0,0 +1,56 @@
+using System.Collections.Generic;
+using System.Linq;
+using Perpetuum.ExportedTypes;
+using Perpetuum.Items;
+using Perpetuum.Zones.Effects;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public class SetBonusEffectApplicator
+    {
+        private readonly Dictionary<int, (EffectToken Token, int ModifierCount)> _activeTokens = new();
+
+        public void Update(Robot robot, IReadOnlyDictionary<int, IReadOnlyList<ItemPropertyModifier>> modifiersPerSet)
+        {
+            if (!robot.InZone)
+                return;
+
+            // Remove effects for sets no longer active
+            foreach (int setId in _activeTokens.Keys.Except(modifiersPerSet.Keys).ToList())
+            {
+                robot.EffectHandler.RemoveEffectByToken(_activeTokens[setId].Token);
+                _activeTokens.Remove(setId);
+            }
+
+            // Update effects whose modifier count changed (e.g. new threshold crossed)
+            foreach (int setId in _activeTokens.Keys.Intersect(modifiersPerSet.Keys).ToList())
+            {
+                int newCount = modifiersPerSet[setId].Count;
+                if (_activeTokens[setId].ModifierCount == newCount)
+                    continue;
+
+                robot.EffectHandler.RemoveEffectByToken(_activeTokens[setId].Token);
+                _activeTokens.Remove(setId);
+                ApplySetEffect(robot, setId, modifiersPerSet[setId]);
+            }
+
+            // Apply effects for newly active sets
+            foreach (int setId in modifiersPerSet.Keys.Except(_activeTokens.Keys).ToList())
+            {
+                ApplySetEffect(robot, setId, modifiersPerSet[setId]);
+            }
+        }
+
+        private void ApplySetEffect(Robot robot, int setId, IReadOnlyList<ItemPropertyModifier> modifiers)
+        {
+            EffectToken token = EffectToken.NewToken();
+            EffectBuilder builder = robot.NewEffectBuilder()
+                .SetType(EffectType.effect_equipment_set_bonus)
+                .EnableModifiers(true)
+                .WithPropertyModifiers(modifiers)
+                .WithToken(token);
+            robot.ApplyEffect(builder);
+            _activeTokens[setId] = (token, modifiers.Count);
+        }
+    }
+}
diff --git a/src/Perpetuum/Robots/EquipmentSets/SetBonusThreshold.cs b/src/Perpetuum/Robots/EquipmentSets/SetBonusThreshold.cs
new file mode 100644
index 0000000..7a7d274
--- /dev/null
+++ b/src/Perpetuum/Robots/EquipmentSets/SetBonusThreshold.cs
@@ -0,0 +1,18 @@
+using Perpetuum.ExportedTypes;
+
+namespace Perpetuum.Robots.EquipmentSets
+{
+    public readonly struct SetBonusThreshold
+    {
+        public SetBonusThreshold(int requiredPieces, AggregateField field, double value)
+        {
+            RequiredPieces = requiredPieces;
+            Field = field;
+            Value = value;
+        }
+
+        public int RequiredPieces { get; }
+        public AggregateField Field { get; }
+        public double Value { get; }
+    }
+}
diff --git a/src/Perpetuum/Robots/Robot.Properties.cs b/src/Perpetuum/Robots/Robot.Properties.cs
index 8a2d491..62bb25a 100644
--- a/src/Perpetuum/Robots/Robot.Properties.cs
+++ b/src/Perpetuum/Robots/Robot.Properties.cs
@@ -131,6 +131,12 @@ public override ItemPropertyModifier GetPropertyModifier(AggregateField field)
                 m.Modify(ref modifier);
             }
 
+            foreach (ItemPropertyModifier bonus in _setBonusResult.Modifiers)
+            {
+                if (bonus.Field == field)
+                    bonus.Modify(ref modifier);
+            }
+
             return modifier;
         }
 
diff --git a/src/Perpetuum/Robots/Robot.cs b/src/Perpetuum/Robots/Robot.cs
index 8f4fccd..ac7fd35 100644
--- a/src/Perpetuum/Robots/Robot.cs
+++ b/src/Perpetuum/Robots/Robot.cs
@@ -1,3 +1,5 @@
+using System.Linq;
+
 using Perpetuum.Accounting.Characters;
 using Perpetuum.Builders;
 using Perpetuum.Containers;
@@ -8,6 +10,7 @@
 using Perpetuum.Items.Templates;
 using Perpetuum.Modules;
 using Perpetuum.Players;
+using Perpetuum.Robots.EquipmentSets;
 using Perpetuum.Services.ExtensionService;
 using Perpetuum.Services.Insurance;
 using Perpetuum.Timers;
@@ -30,6 +33,10 @@ public abstract partial class Robot : Unit, IUsableItem
         private readonly IntervalTimer overheatCooldownTimer;
         private const double HeatDissipation = 1.75;
 
+        // Safe: Initialize() is called docked (no zone update) or at zone entry (before zone participation).
+        private EquipmentSetBonusResult _setBonusResult = EquipmentSetBonusResult.Empty;
+        private readonly SetBonusEffectApplicator _setBonusEffectApplicator = new SetBonusEffectApplicator();
+
         protected Robot()
         {
             InitLockHander();
@@ -44,6 +51,8 @@ protected Robot()
 
         public InsuranceHelper InsuranceHelper { protected get; set; }
 
+        public IEquipmentSetBonusCalculator EquipmentSetBonusCalculator { private get; set; }
+
         public RobotTemplate Template { get; set; }
 
         public bool IsSelected => RobotHelper.IsSelected(this);
@@ -123,6 +132,10 @@ public void IncreaseHeatLevelByValue(EffectType effectType, double value)
         public override void Initialize()
         {
             InitComponents();
+            if (EquipmentSetBonusCalculator != null)
+            {
+                _setBonusResult = EquipmentSetBonusCalculator.Compute(Modules.Select(m => m.Definition));
+            }
             base.Initialize();
         }
 
@@ -350,6 +363,8 @@ protected override void OnUpdate(TimeSpan time)
                 robotComponent.Update(time);
             }
 
+            _setBonusEffectApplicator.Update(this, _setBonusResult.ModifiersPerSet);
+
             if (overheatCooldownTimer.Passed)
             {
                 OverheatHandler.Decrease(HeatDissipation);
diff --git a/src/Perpetuum/Services/Seasons/SeasonRepository.cs b/src/Perpetuum/Services/Seasons/SeasonRepository.cs
index 3035e52..94320ca 100644
--- a/src/Perpetuum/Services/Seasons/SeasonRepository.cs
+++ b/src/Perpetuum/Services/Seasons/SeasonRepository.cs
@@ -55,7 +55,7 @@ public List<SeasonObjective> GetObjectives(int seasonId)
         {
             return Db.Query("SELECT id, season_id, name, description, activity_type, " +
                             "target_value, bonus_points, display_order, is_daily, package_id, target_definition_id " +
-                            "FROM season_objectives WHERE season_id = @seasonId")
+                            "FROM season_objectives WHERE season_id = @seasonId ORDER BY display_order")
                      .SetParameter("@seasonId", seasonId)
                      .Execute()
                      .Select(r => new SeasonObjective
diff --git a/src/Perpetuum/Services/Seasons/SeasonService.cs b/src/Perpetuum/Services/Seasons/SeasonService.cs
index a22d806..515e63a 100644
--- a/src/Perpetuum/Services/Seasons/SeasonService.cs
+++ b/src/Perpetuum/Services/Seasons/SeasonService.cs
@@ -151,8 +151,17 @@ internal void RefreshCache()
             }
             else if (previous?.Id != season.Id || _dailyPool.Date == DateOnly.MinValue)
             {
+                // Fires on cold boot AND on the first RefreshCache after a season is activated via admin command.
+                bool isFirstLoad = _dailyPool.Date == DateOnly.MinValue;
                 var today = DateOnly.FromDateTime(DateTime.UtcNow);
                 _dailyPool = new DailyPool(SelectDailyPool(season, _activeObjectives, today), today);
+                if (isFirstLoad)
+                {
+                    int totalDaily = _activeObjectives.Count(o => o.IsDaily);
+                    var poolObjs = _activeObjectives.Where(o => _dailyPool.Ids.Contains(o.Id)).ToList();
+                    if (poolObjs.Count > 0)
+                        AnnounceDailyPool(poolObjs, totalDaily);
+                }
             }
 
             if (_lastNotifiedSeasonId != season.Id)
@@ -189,7 +198,7 @@ public void RecordActivity(int characterId, SeasonActivityType activityType, Act
 
             if (evt.CounterpartyAccountId.HasValue)
             {
-                var myIp    = GetMostRecentSessionIp(Character.Get(characterId).AccountId);
+                var myIp = GetMostRecentSessionIp(Character.Get(characterId).AccountId);
                 var theirIp = GetMostRecentSessionIp(evt.CounterpartyAccountId.Value);
                 if (myIp != null && theirIp != null &&
                     string.Equals(myIp, theirIp, StringComparison.OrdinalIgnoreCase))
@@ -416,7 +425,7 @@ private void AnnounceDailyPool(IReadOnlyList<SeasonObjective> pool, int totalDai
             sb.AppendLine();
             sb.AppendLine($"Today's daily objectives ({pool.Count} of {totalDailyCount}):");
             foreach (var obj in pool)
-                sb.AppendLine($"  — {obj.Name}");
+                sb.AppendLine($"  — {obj.Name}: {obj.Description}");
             sb.AppendLine();
             sb.AppendLine("Complete them for bonus season points and rewards!");
             _channelManager.Value.Announcement(SeasonChannelName, _announcer.Value, sb.ToString());
@@ -587,28 +596,28 @@ private static string Translate(string key, Dictionary<string, object>? dict)
 
         private static string ActivityTypeName(SeasonActivityType type) => type switch
         {
-            SeasonActivityType.NpcKill               => "NPC Kill",
-            SeasonActivityType.PvpKill               => "PvP Kill",
-            SeasonActivityType.MissionComplete       => "Mission Completed",
-            SeasonActivityType.MineralMined          => "Mineral Mined",
-            SeasonActivityType.EpSpent               => "EP Spent",
-            SeasonActivityType.NicEarned             => "NIC Earned",
-            SeasonActivityType.NicSpent              => "NIC Spent",
-            SeasonActivityType.IntrusionPoint        => "Intrusion SAP",
-            SeasonActivityType.Prototyping           => "Prototyping",
-            SeasonActivityType.ReverseEngineering    => "Reverse Engineering",
-            SeasonActivityType.Production            => "Production",
-            SeasonActivityType.ArtifactFound         => "Artifact Found",
-            SeasonActivityType.EpEarned              => "EP Earned",
-            SeasonActivityType.DamageDone            => "Damage Done",
-            SeasonActivityType.DamageReceived        => "Damage Received",
-            SeasonActivityType.ArmorRestored         => "Armor Restored",
-            SeasonActivityType.EnergyDrainDealt      => "Energy Drained (Dealt)",
-            SeasonActivityType.EnergyDrainReceived   => "Energy Drained (Received)",
-            SeasonActivityType.EnergyTransferDealt   => "Energy Transferred (Dealt)",
+            SeasonActivityType.NpcKill => "NPC Kill",
+            SeasonActivityType.PvpKill => "PvP Kill",
+            SeasonActivityType.MissionComplete => "Mission Completed",
+            SeasonActivityType.MineralMined => "Mineral Mined",
+            SeasonActivityType.EpSpent => "EP Spent",
+            SeasonActivityType.NicEarned => "NIC Earned",
+            SeasonActivityType.NicSpent => "NIC Spent",
+            SeasonActivityType.IntrusionPoint => "Intrusion SAP",
+            SeasonActivityType.Prototyping => "Prototyping",
+            SeasonActivityType.ReverseEngineering => "Reverse Engineering",
+            SeasonActivityType.Production => "Production",
+            SeasonActivityType.ArtifactFound => "Artifact Found",
+            SeasonActivityType.EpEarned => "EP Earned",
+            SeasonActivityType.DamageDone => "Damage Done",
+            SeasonActivityType.DamageReceived => "Damage Received",
+            SeasonActivityType.ArmorRestored => "Armor Restored",
+            SeasonActivityType.EnergyDrainDealt => "Energy Drained (Dealt)",
+            SeasonActivityType.EnergyDrainReceived => "Energy Drained (Received)",
+            SeasonActivityType.EnergyTransferDealt => "Energy Transferred (Dealt)",
             SeasonActivityType.EnergyTransferReceived => "Energy Transferred (Received)",
-            SeasonActivityType.PlantHarvested        => "Plant Harvested",
-            _                                         => type.ToString(),
+            SeasonActivityType.PlantHarvested => "Plant Harvested",
+            _ => type.ToString(),
         };
     }
 }
diff --git a/src/Perpetuum/Zones/NpcSystem/AI/FleeAI.cs b/src/Perpetuum/Zones/NpcSystem/AI/FleeAI.cs
index 8b8d523..79d3e71 100644
--- a/src/Perpetuum/Zones/NpcSystem/AI/FleeAI.cs
+++ b/src/Perpetuum/Zones/NpcSystem/AI/FleeAI.cs
@@ -11,6 +11,7 @@ public class FleeAI : BaseAI
     {
         private const int FallbackRetreatDistance = 60;
         private const int PassableSearchRadius = 10;
+        private const double FleeSpeedMultiplier = 0.50;
 
         private readonly PathFinder pathFinder;
         private PathMovement movement;
@@ -25,7 +26,7 @@ public FleeAI(SmartCreature smartCreature) : base(smartCreature)
 
         public override void Enter()
         {
-            smartCreature.CurrentSpeed = 0.75;
+            smartCreature.CurrentSpeed = FleeSpeedMultiplier;
             moduleActivators.AddRange(smartCreature.ActiveModules
                 .OfType<ArmorRepairModule>()
                 .Select(m => new ModuleActivator(m)));
@@ -64,8 +65,8 @@ public override void Update(TimeSpan time)
                 else
                 {
                     // WaypointMovement.Start resets CurrentSpeed to 1.0 on each new waypoint;
-                    // re-apply the 75% cap so the NPC actually moves slower while fleeing.
-                    smartCreature.CurrentSpeed = 0.75;
+                    // re-apply the 50% cap every tick so the NPC actually moves slower while fleeing.
+                    smartCreature.CurrentSpeed = FleeSpeedMultiplier;
                 }
             }
 
diff --git a/tools/query-graph.ps1 b/tools/query-graph.ps1
new file mode 100644
index 0000000..abe44f3
--- /dev/null
+++ b/tools/query-graph.ps1
@@ -0,0 +1,83 @@
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory=$true, Position=0)]
+    [string]$ClassName,
+
+    [Parameter(Mandatory=$false)]
+    [ValidateSet('in', 'out', 'both', 'community')]
+    [string]$Direction = 'both'
+)
+
+$graphPath = [System.IO.Path]::GetFullPath((Join-Path $PSScriptRoot '..\docs\graph\graph.json'))
+
+if (-not (Test-Path $graphPath)) {
+    Write-Host "graph.json not found at: $graphPath" -ForegroundColor Yellow
+    Write-Host "Build Perpetuum.Server once to generate it:"
+    Write-Host "  dotnet build src/Perpetuum.Server/Perpetuum.Server.csproj -c Release -p:Platform=x64"
+    exit 0
+}
+
+Write-Host "Loading graph..." -ForegroundColor DarkGray
+$g = Get-Content $graphPath -Raw | ConvertFrom-Json
+
+$nodeIndex = @{}
+$g.nodes | ForEach-Object { $nodeIndex[$_.id] = $_ }
+
+$matchedNodes = @($g.nodes | Where-Object { $_.label -like "*$ClassName*" -and $_.label -like '*.cs' -and $_.id -notlike 'file:*' })
+
+if ($matchedNodes.Count -eq 0) {
+    Write-Host "No node found matching '$ClassName'"
+    exit 0
+}
+
+if ($matchedNodes.Count -gt 1) {
+    Write-Host "$($matchedNodes.Count) nodes match '$ClassName'. Use a more specific name:" -ForegroundColor Yellow
+    $matchedNodes | ForEach-Object { Write-Host "  $($_.label)  ($($_.file_path))" }
+    exit 0
+}
+
+$node = $matchedNodes[0]
+Write-Host ""
+Write-Host "Node: $($node.label)  [community $($node.community)]" -ForegroundColor Cyan
+Write-Host "File: $($node.file_path)"
+Write-Host ""
+
+if ($Direction -eq 'in' -or $Direction -eq 'both') {
+    $inEdges = @($g.edges | Where-Object { $_.target -eq $node.id })
+    Write-Host "=== Inbound ($($inEdges.Count)): who depends on this ===" -ForegroundColor Green
+    if ($inEdges.Count -eq 0) {
+        Write-Host "  (none)"
+    } else {
+        foreach ($edge in $inEdges) {
+            $srcNode = $nodeIndex[$edge.source]
+            $srcLabel = if ($srcNode) { $srcNode.label } else { $edge.source }
+            Write-Host "  [$($edge.relationship)]  $srcLabel"
+        }
+    }
+    Write-Host ""
+}
+
+if ($Direction -eq 'out' -or $Direction -eq 'both') {
+    $outEdges = @($g.edges | Where-Object { $_.source -eq $node.id })
+    Write-Host "=== Outbound ($($outEdges.Count)): what this depends on ===" -ForegroundColor Green
+    if ($outEdges.Count -eq 0) {
+        Write-Host "  (none)"
+    } else {
+        foreach ($edge in $outEdges) {
+            $tgtNode = $nodeIndex[$edge.target]
+            $tgtLabel = if ($tgtNode) { $tgtNode.label } else { $edge.target }
+            Write-Host "  [$($edge.relationship)]  $tgtLabel"
+        }
+    }
+    Write-Host ""
+}
+
+if ($Direction -eq 'community') {
+    $communityNodes = @($g.nodes | Where-Object { $_.community -eq $node.community -and $_.id -ne $node.id -and $_.id -notlike 'file:*' -and $_.label -like '*.cs' } | Sort-Object label)
+    Write-Host "=== Community $($node.community) ($($communityNodes.Count + 1) members) ===" -ForegroundColor Green
+    Write-Host "  [self]  $($node.label)"
+    foreach ($member in $communityNodes) {
+        Write-Host "  [$($member.type)]  $($member.label)  ($($member.file_path))"
+    }
+    Write-Host ""
+}