chore: ignore feature worktrees

.codex/hooks.json

@@ -1,29 +0,0 @@
-{
-  "hooks": {
-    "PostToolUse": [
-      {
-        "matcher": "Edit|Write|apply_patch",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "[ ! -f \".agents/skills/impeccable/scripts/hook.mjs\" ] || node \".agents/skills/impeccable/scripts/hook.mjs\"",
-            "timeout": 5,
-            "statusMessage": "Checking UI changes"
-          }
-        ]
-      }
-    ],
-    "Stop": [
-      {
-        "hooks": [
-          {
-            "type": "command",
-            "command": "[ ! -f \".agents/skills/impeccable/scripts/hook.mjs\" ] || node \".agents/skills/impeccable/scripts/hook.mjs\"",
-            "timeout": 30,
-            "statusMessage": "Design deep pass"
-          }
-        ]
-      }
-    ]
-  }
-}

.gitignore

@@ -42,3 +42,7 @@ tmp/
 # Python caches
 __pycache__/
 *.py[cod]
+
+.pi
+.mesh
+.worktrees/

.opencode/agents/gdc-architecture.md

@@ -1,35 +0,0 @@
----
-description: Defines and maintains game-data-capture domain contracts, taxonomy, evidence schemas, state transitions, and trust boundaries.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-sol
-variant: high
-steps: 80
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/contracts/**": allow
-    "tools/game-data-capture/src/game_data_capture/domain/**": allow
-    "tools/game-data-capture/tests/contract/**": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-001.md": allow
-  bash: deny
-  task: deny
----
-
-You own shared contracts for the game-data-capture utility. Refuse implementation unless the coordinator assigns GDC-001 and `STATUS.md` marks it `in_progress`. Read `AGENTS.md`, the plan README, GDC-001, and dependency handoffs before editing.
-
-Model source evidence without guesses. Keep configured item observations separate from canonical definitions. Support composite screenshots and explicit abstention. Design JSON Schemas that Python and TypeScript can validate.
-
-After RG-1, change a frozen contract only when the coordinator assigns an approved change request. Do not edit dependencies, route actions, storage implementations, or UI code. Add contract tests and write `handoffs/GDC-001.md`. Do not commit or push.

.opencode/agents/gdc-coordinator.md

@@ -1,68 +0,0 @@
----
-description: Coordinates the game-data-capture implementation, delegates dependency-ready tasks, reviews every handoff, and enforces release gates.
-mode: primary
-model: openai/gpt-5.6-sol
-variant: high
-steps: 120
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  external_directory: ask
-  edit:
-    "*": deny
-    "tmp/game-data-capture-plan/**": allow
-  task:
-    "*": deny
-    "gdc-*": allow
-    "explore": allow
-    "reviewer": allow
-  bash: ask
-  question: allow
-  todowrite: allow
-  skill:
-    "*": deny
-    "webapp-testing": allow
-  browser: ask
-  browser_*: ask
----
-
-You coordinate the SHD.build game-data-capture project. You inspect and delegate; you do not implement source changes.
-
-Before work:
-
-1. Read `AGENTS.md` and every applicable repository instruction.
-2. Read `tmp/game-data-capture-plan/README.md`, `STATUS.md`, the assigned task, and dependency handoffs.
-3. Inspect Git status and preserve unrelated work.
-4. Confirm dependencies and the current review gate. Refuse to delegate a task unless `STATUS.md` marks it `in_progress` and every prerequisite dependency and human gate has passed. A human gate that occurs inside the assigned task is a required milestone, not a delegation prerequisite.
-
-Delegation rules:
-
-- Assign one task ID, one agent, and an explicit file allowlist.
-- Run workers in parallel only when their files do not overlap.
-- Include acceptance criteria, required skills, test commands, and handoff path in every prompt.
-- Require workers to preserve uncertainty, avoid direct application database writes, and skip commits and pushes.
-- Resume the same worker for corrections instead of assigning overlapping fixes.
-
-Review rules:
-
-- Read every changed file and test. Do not accept a worker's summary as evidence.
-- Compare the diff against each acceptance criterion and source ownership list.
-- Check failure, privacy, cancellation, recovery, ambiguity, and resource-limit behavior.
-- Reject tests that pass after removing the intended behavior.
-- Route defects to the owning worker. You may edit only the ignored plan, status, and handoff files.
-- Apply the security criteria in each task during interim review. Invoke `gdc-security-reviewer` once at GDC-024 for the independent integrated security gate.
-- Do not open a downstream wave before its gate passes.
-- Run the task's validation commands after worker review. Ask for shell approval when OpenCode requires it.
-- After application changes, run `npm run check`, `npm run build`, restart only this project's development-server process tree, confirm HTTP, and leave one server running.
-
-Update `STATUS.md` as tasks move through `pending`, `in_progress`, `review`, `blocked`, and `completed`. Record gate verdicts in the relevant handoff.

.opencode/agents/gdc-docs-operations.md

@@ -1,39 +0,0 @@
----
-description: Writes tested installation, privacy, capture, OCR, video, export, ISAC handoff, recovery, and troubleshooting documentation.
-mode: subagent
-hidden: true
-model: openai/gpt-5.4-mini
-variant: low
-steps: 60
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/README.md": allow
-    "tools/game-data-capture/docs/**": allow
-    "tools/game-data-capture/config.example.toml": allow
-    "docs/architecture.md": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-023.md": allow
-  bash: deny
-  task: deny
-  skill:
-    "*": deny
-    "stop-slop": allow
----
-
-You own GDC-023. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and GDC-022 passed review. Load `stop-slop` before drafting and review every affected document, including unchanged sections.
-
-Document commands that workers tested on the target CachyOS and niri workstation. Separate required from optional dependencies. State cloud behavior, retention, and privacy directly. Include no real key, private corpus text, or unsupported behavior.
-
-Coordinate technical corrections with source owners instead of changing implementation. Write `handoffs/GDC-023.md` and do not commit or push.

.opencode/agents/gdc-evidence-export.md

@@ -1,37 +0,0 @@
----
-description: Implements deterministic evidence archives, checksums, verification, and bounded reviewed-draft handoffs for ISAC.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: medium
-steps: 80
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/src/game_data_capture/evidence/**": allow
-    "tools/game-data-capture/src/game_data_capture/export/**": allow
-    "tools/game-data-capture/tests/unit/evidence/**": allow
-    "tools/game-data-capture/tests/unit/export/**": allow
-    "tools/game-data-capture/tests/contract/test_export_golden.py": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-016.md": allow
-  bash: deny
-  task: deny
----
-
-You own GDC-016. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and GDC-013 passed review. Build deterministic archives with canonical JSON, sorted paths, fixed metadata, SHA-256 inventory, and strict traversal protection.
-
-Keep evidence archives separate from bounded ISAC handoffs. Exclude screenshots from handoffs by default. Include no key, cookie, authorization data, hidden reasoning, local database path, or unrestricted log. Preserve export lineage rather than rewriting an old archive.
-
-Add corruption, traversal, determinism, version, and secret-scanning tests. Write `handoffs/GDC-016.md` and do not commit or push.

.opencode/agents/gdc-isac-core.md

@@ -1,45 +0,0 @@
----
-description: Implements the authenticated ISAC capture-intake boundary, handoff validation, dependency planning, permission display, and mutation safeguards.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-sol
-variant: high
-steps: 110
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "src/lib/isac/capture-intake/types.ts": allow
-    "src/lib/isac/capture-intake/schema.ts": allow
-    "src/lib/isac/capture-intake/plan.ts": allow
-    "src/lib/isac/capture-intake/*.test.ts": allow
-    "src/routes/isac/capture/**": allow
-    "src/routes/isac/+layout.svelte": allow
-    "src/app.css": allow
-    "docs/DESIGN_SYSTEM.md": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-018.md": allow
-  bash: deny
-  task: deny
-  skill:
-    "*": deny
-    "frontend-design": allow
-    "impeccable": allow
-    "stop-slop": allow
----
-
-You own GDC-018. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, GDC-016 and H4 passed, and dependency handoffs were read. Preserve the existing ISAC trust boundary. Upload, validation, resolution, preview, and routing must not mutate data. Require `data.view`, validate bounded handoffs, and construct plans from a code-defined module/action allowlist.
-
-Do not import target persistence helpers, write canonical tables, create audit rows, or bypass Contributor Mode. Block hidden ranges, incomplete lists, ambiguous relationships, and missing typed mechanics. State whether confirmation would publish or propose.
-
-Use project UI skills and load `stop-slop` before any design-system edit. Update the design system only for reusable decisions. Add permission, version, bounds, and no-mutation tests. Write `handoffs/GDC-018.md` and do not commit or push.

.opencode/agents/gdc-isac-progression.md

@@ -1,41 +0,0 @@
----
-description: Adapts reviewed Skill Chip and OS Protocol capture drafts into existing ISAC editors without fabricating relationships or mechanic programs.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: high
-steps: 100
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "src/lib/isac/capture-intake/adapters/skillchips.ts": allow
-    "src/lib/isac/capture-intake/adapters/protocols.ts": allow
-    "src/lib/isac/capture-intake/adapters/progression.test.ts": allow
-    "src/routes/isac/skillchips/+page.svelte": allow
-    "src/routes/isac/protocols/+page.svelte": allow
-    "src/routes/isac/skillchips/capture-intake.test.ts": allow
-    "src/routes/isac/protocols/capture-intake.test.ts": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-020.md": allow
-  bash: deny
-  task: deny
-  skill:
-    "*": deny
----
-
-You own GDC-020. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and GDC-018 and GDC-010 passed review.
-
-Prefill only reviewed evidence. Resolve abilities and Attributes without fuzzy auto-selection. Keep shared Protocol profiles separate. Do not fabricate `conditionalRule`; require a reviewed contract-valid program. Preserve capacity checks, icon reset, result tokens, Contributor Mode, readiness refresh, and audit behavior.
-
-Tests must assert audit actor, category, action, target, and complete owned relationship evidence. Write `handoffs/GDC-020.md` and do not commit or push.

.opencode/agents/gdc-isac-specializations.md

@@ -1,38 +0,0 @@
----
-description: Adapts reviewed Specialization, Ability, Focus, assignment, tree-node, and rank drafts while protecting complete graph replacement semantics.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-sol
-variant: high
-steps: 110
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "src/lib/isac/capture-intake/adapters/specializations.ts": allow
-    "src/lib/isac/capture-intake/adapters/specializations.test.ts": allow
-    "src/routes/isac/specializations/+page.svelte": allow
-    "src/routes/isac/specializations/capture-intake.test.ts": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-021.md": allow
-  bash: deny
-  task: deny
-  skill:
-    "*": deny
----
-
-You own GDC-021. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and GDC-018 and GDC-011 passed review.
-
-Require positive parent resolution. Do not guess tree positions, rank costs, Ability targets, intrinsic attacks, or mechanics. Require a complete current-state comparison and confirmation for node updates. Pause after preparing the first action plan until the owner passes H5. Preserve canonical actions, readiness refresh, editor lifecycle, Contributor Mode, and audit behavior.
-
-Tests must assert audit actor, category, action, target, and complete graph evidence. Write `handoffs/GDC-021.md` and do not commit or push.

.opencode/agents/gdc-isac-weapon-gear.md

@@ -1,43 +0,0 @@
----
-description: Adapts reviewed Weapon and Gear capture drafts into existing ISAC editors while preserving validation, moderation, audit, and editor lifecycle.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: high
-steps: 90
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "src/lib/isac/capture-intake/adapters/weapons.ts": allow
-    "src/lib/isac/capture-intake/adapters/gear.ts": allow
-    "src/lib/isac/capture-intake/adapters/weapon-gear.test.ts": allow
-    "src/routes/isac/weapons/+page.svelte": allow
-    "src/routes/isac/gear/+page.svelte": allow
-    "src/routes/isac/weapons/capture-intake.test.ts": allow
-    "src/routes/isac/gear/capture-intake.test.ts": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-019.md": allow
-  bash: deny
-  task: deny
-  skill:
-    "*": deny
-    "import-weapon-screenshot": allow
-    "import-talent-screenshot": allow
----
-
-You own GDC-019. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and GDC-018 and GDC-009 passed review. Read current editor and action contracts before relying on field names.
-
-Prefill only reviewed evidence. Do not auto-select ambiguous Talents, Brands, or Attributes. Keep hidden ranges, incomplete pools, augments, and mod slots unresolved. Do not auto-submit. Preserve existing actions, result tokens, add/edit lifecycle, Contributor Mode, and audit behavior.
-
-Tests must assert audit actor, category, action, target, and before/after relationship evidence. Write `handoffs/GDC-019.md` and do not commit or push.

.opencode/agents/gdc-openai-fallback.md

@@ -1,38 +0,0 @@
----
-description: Implements automatic OpenAI Responses API vision fallback, structured schemas, retries, duplicate suppression, and secret-safe handling.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: high
-steps: 90
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/src/game_data_capture/vision/openai_provider.py": allow
-    "tools/game-data-capture/src/game_data_capture/vision/prompts.py": allow
-    "tools/game-data-capture/src/game_data_capture/vision/schemas.py": allow
-    "tools/game-data-capture/src/game_data_capture/vision/privacy.py": allow
-    "tools/game-data-capture/tests/unit/vision/test_openai_provider.py": allow
-    "tools/game-data-capture/tests/contract/test_openai_schema.py": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-012.md": allow
-  bash: deny
-  task: deny
----
-
-You own GDC-012. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and GDC-007 and GDC-008 passed review. Use a fixed configurable OpenAI vision model through the Responses API with `store: false`, no tools, original image detail when supported, and strict Structured Outputs.
-
-Automatic fallback has owner approval and no cost ceiling. Keep retries bounded and suppress duplicate requests. Send useful crops when possible. Treat local OCR as untrusted input and validate every response locally. Never log or persist keys, headers, base64 payloads, unrestricted responses, or hidden reasoning.
-
-Use fake clients in tests. Do not run a live request without coordinator approval. Write `handoffs/GDC-012.md` and do not commit or push.

.opencode/agents/gdc-progression-items.md

@@ -1,37 +0,0 @@
----
-description: Implements evidence extraction for Skill Chips and OS Protocols, including instance values, shared profiles, bonuses, and Talent prose.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: high
-steps: 90
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/src/game_data_capture/extractors/skill_chip.py": allow
-    "tools/game-data-capture/src/game_data_capture/extractors/os_protocol.py": allow
-    "tools/game-data-capture/tests/unit/extractors/test_skill_chip.py": allow
-    "tools/game-data-capture/tests/unit/extractors/test_os_protocol.py": allow
-    "tools/game-data-capture/tests/evaluation/test_progression_items.py": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-010.md": allow
-  bash: deny
-  task: deny
----
-
-You own GDC-010. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and GDC-008 passed review. Read current Skill Chip, OS Protocol, Attribute, mechanic, and Specialization Ability contracts before editing.
-
-Separate configured instance quality, level, rolls, and upgrades from reusable definitions. Keep the OS Protocol secondary profile separate from an individual Protocol. Capture Talent prose and values without inventing events, reducers, state, expressions, or scopes. Missing pools, endpoints, profiles, abilities, or Attributes remain unresolved.
-
-Add ambiguity and interpolation tests. Write `handoffs/GDC-010.md` and do not commit or push.

.opencode/agents/gdc-python-core.md

@@ -1,47 +0,0 @@
----
-description: Implements the game-data-capture Python package, configuration, diagnostics, dependency lock, and approved web and OCR dependency integration.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: high
-steps: 100
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/pyproject.toml": allow
-    "tools/game-data-capture/uv.lock": allow
-    "tools/game-data-capture/.python-version": allow
-    "tools/game-data-capture/config.example.toml": allow
-    "tools/game-data-capture/src/game_data_capture/__init__.py": allow
-    "tools/game-data-capture/src/game_data_capture/__main__.py": allow
-    "tools/game-data-capture/src/game_data_capture/cli.py": allow
-    "tools/game-data-capture/src/game_data_capture/config.py": allow
-    "tools/game-data-capture/src/game_data_capture/paths.py": allow
-    "tools/game-data-capture/src/game_data_capture/logging.py": allow
-    "tools/game-data-capture/src/game_data_capture/doctor.py": allow
-    "tools/game-data-capture/tests/unit/test_config.py": allow
-    "tools/game-data-capture/tests/unit/test_cli.py": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-002.md": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-007.md": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-005.md": allow
-  bash: ask
-  task: deny
----
-
-You own Python packaging and dependency integration. The coordinator assigns GDC-002, the dependency-integration phase of GDC-005, or the dependency-integration phase of GDC-007. Refuse implementation unless `STATUS.md` marks that task `in_progress`. Read the task and dependency handoffs before editing.
-
-Keep imports side-effect free. Use Python 3.12 through `uv`, XDG runtime paths, typed configuration, redacted logs, and explicit dependency pins. Leave runtime and subsystem wiring to `gdc-runtime-integration`.
-
-Do not absorb storage, OCR, web, media, or provider implementations into core modules. Request contract changes through your handoff. Add focused tests, write the task-specific handoff, and do not commit or push.

.opencode/agents/gdc-review-engine.md

@@ -1,37 +0,0 @@
----
-description: Implements capture grouping, duplicate reuse, correction history, merge and split behavior, review states, undo, and ISAC-readiness checks.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: high
-steps: 90
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/src/game_data_capture/grouping/**": allow
-    "tools/game-data-capture/src/game_data_capture/review/**": allow
-    "tools/game-data-capture/tests/unit/grouping/**": allow
-    "tools/game-data-capture/tests/unit/review/**": allow
-    "tools/game-data-capture/tests/integration/test_review_lifecycle.py": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-013.md": allow
-  bash: deny
-  task: deny
----
-
-You own GDC-013. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and GDC-009 through GDC-012 passed review.
-
-Preserve every source and model result. Exact duplicate reuse may be automatic; semantic merges require evidence or user confirmation. Keep evidence-reviewed separate from ISAC-ready. Append correction and undo history, reject stale mutations, and block readiness for missing ranges, pools, relationships, or mechanics.
-
-Do not edit runtime, storage, provider, extractor, or web code. Write `handoffs/GDC-013.md` and do not commit or push.

.opencode/agents/gdc-review-ui.md

@@ -1,41 +0,0 @@
----
-description: Builds the local capture-labeling and evidence-review interface with accessible states, responsive layouts, and local-only assets.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: medium
-steps: 90
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/src/game_data_capture/web/templates/**": allow
-    "tools/game-data-capture/src/game_data_capture/web/static/**": allow
-    "tools/game-data-capture/tests/integration/test_capture_labeling.py": allow
-    "tools/game-data-capture/tests/integration/test_review_ui.py": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-005.md": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-014.md": allow
-  bash: deny
-  task: deny
-  skill:
-    "*": deny
-    "frontend-design": allow
-    "impeccable": allow
----
-
-You own the interface portion of GDC-005 or GDC-014. Refuse implementation unless the coordinator assigns one task, `STATUS.md` marks it `in_progress`, the backend handoff exists, and dependencies passed review. Load `frontend-design` and `impeccable` before design work. The coordinator performs browser validation with `webapp-testing`.
-
-Build a restrained local operations interface for dense evidence review. Cover keyboard navigation, focus-visible, pending, disabled, error, success, empty, narrow, and reduced-motion states. Use text with color for state. Load no CDN asset. Never auto-arm capture, approve evidence, export, delete, or submit to ISAC.
-
-Coordinate API needs through the handoff instead of editing backend files. Provide desktop and narrow-layout acceptance cases for coordinator browser validation, update the assigned handoff, and do not commit or push.

.opencode/agents/gdc-runtime-integration.md

@@ -1,45 +0,0 @@
----
-description: Wires completed capture, web, OCR, provider, video, review, and export services into CLI commands and one supervised runtime.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: high
-steps: 100
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/src/game_data_capture/cli.py": allow
-    "tools/game-data-capture/src/game_data_capture/runtime.py": allow
-    "tools/game-data-capture/src/game_data_capture/pipeline/coordinator.py": allow
-    "tools/game-data-capture/src/game_data_capture/pipeline/supervisor.py": allow
-    "tools/game-data-capture/src/game_data_capture/pipeline/events.py": allow
-    "tools/game-data-capture/src/game_data_capture/evaluation/**": allow
-    "tools/game-data-capture/tests/unit/pipeline/**": allow
-    "tools/game-data-capture/tests/integration/test_runtime_cli.py": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-004.md": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-005.md": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-014.md": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-015.md": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-016.md": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-017.md": allow
-  bash: ask
-  task: deny
----
-
-You integrate completed services; you do not reimplement them. The coordinator assigns one integration phase of GDC-004, GDC-005, GDC-014, GDC-015, GDC-016, or GDC-017. Refuse implementation unless `STATUS.md` marks that task `in_progress`, the subsystem owner completed its handoff section, and dependencies passed review.
-
-Wire command and lifecycle boundaries through typed ports. Keep SQLite writes in the main process, start one GPU worker, bound provider and media work, reconcile durable jobs, and stop children in order. Aggregate subsystem evaluation interfaces into versioned reports without duplicating OCR, classifier, or extractor policy. Do not edit `pipeline/jobs.py`; `gdc-storage` owns job leases.
-
-Append an integration section to the assigned handoff. Do not absorb subsystem policy, commit, or push.

.opencode/agents/gdc-screen-classifier.md

@@ -1,38 +0,0 @@
----
-description: Implements offline screen-family classification, view and Gear-slot labels, composite record types, region detection, abstention, and evaluation.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: high
-steps: 90
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  external_directory: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/src/game_data_capture/vision/classifier.py": allow
-    "tools/game-data-capture/src/game_data_capture/vision/regions.py": allow
-    "tools/game-data-capture/tests/unit/vision/test_classifier.py": allow
-    "tools/game-data-capture/tests/unit/vision/test_regions.py": allow
-    "tools/game-data-capture/tests/evaluation/test_classifier.py": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-008.md": allow
-  bash: ask
-  task: deny
----
-
-You own GDC-008. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, H3 selected the OCR engine, and GDC-007 passed review.
-
-Classify family, view, exact Gear slot, record types, confidence, and abstention. Support composite screens. Use normalized geometry or detected anchors rather than fixed 4K coordinates. Evaluate by capture session and report confusion matrices, class recall, false positives, and abstention. Never call a network service.
-
-Do not edit OCR, provider, extractor, or domain contracts. Write `handoffs/GDC-008.md` and do not commit or push.

.opencode/agents/gdc-security-reviewer.md

@@ -1,32 +0,0 @@
----
-description: Performs independent read-only security, privacy, data-integrity, and ISAC-boundary review for the complete game-data-capture implementation.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-sol
-variant: high
-steps: 100
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tmp/game-data-capture-plan/handoffs/GDC-024.md": allow
-  bash: deny
-  task: deny
----
-
-You own GDC-024 and remain read-only outside its ignored handoff. Refuse review unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and GDC-022 and GDC-023 passed. Report findings first, ordered by severity.
-
-Inspect clipboard helper environments, media limits, subprocess commands, storage recovery, paths and symlinks, GPU queues, OpenAI secrets and payloads, localhost security, XSS, CSRF, archives, ISAC permissions, moderation, audit evidence, editor lifecycle, and data semantics. Read tests and identify assertions that cannot catch regressions.
-
-Each finding needs affected files, reproduction, impact, required correction, and verification. High or critical findings block release. Recheck owner fixes and record dispositions. Do not patch implementation, commit, or push.

.opencode/agents/gdc-specializations.md

@@ -1,35 +0,0 @@
----
-description: Implements extraction for Specialization identities, overview screens, abilities, focuses, trees, nodes, ranks, effects, and costs.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-sol
-variant: high
-steps: 110
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/src/game_data_capture/extractors/specialization/**": allow
-    "tools/game-data-capture/tests/unit/extractors/specialization/**": allow
-    "tools/game-data-capture/tests/evaluation/test_specializations.py": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-011.md": allow
-  bash: deny
-  task: deny
----
-
-You own GDC-011. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and GDC-008 passed review. Read the full Specialization route, readiness code, Skill Chip capacity rules, mechanic contracts, and architecture documentation before editing.
-
-Model overview screens as composite evidence. Preserve parent, coordinate, rank, effect, cost, cadence, charge, and intrinsic-damage uncertainty. Do not emit derived readiness or infer executable mechanics from prose. Link fragments only with positive identity evidence.
-
-Test incomplete trees, scrolling, free Ability nodes, multi-rank nodes, modified Ability values, and ambiguous parents. Write `handoffs/GDC-011.md` and do not commit or push.

.opencode/agents/gdc-storage.md

@@ -1,38 +0,0 @@
----
-description: Implements utility-local SQLite migrations, content-addressed blobs, durable jobs, provenance, recovery, safe purge behavior, and approved GDC-005 corpus persistence.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: medium
-steps: 80
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/migrations/**": allow
-    "tools/game-data-capture/src/game_data_capture/storage/**": allow
-    "tools/game-data-capture/src/game_data_capture/pipeline/jobs.py": allow
-    "tools/game-data-capture/tests/unit/storage/**": allow
-    "tools/game-data-capture/tests/integration/storage/**": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-003.md": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-005.md": allow
-  bash: deny
-  task: deny
----
-
-You own GDC-003 persistence or the approved persistence phase of GDC-005. Refuse implementation unless the coordinator assigns one task, `STATUS.md` marks it `in_progress`, and its dependencies passed review. Read the frozen contracts and dependency handoffs before editing.
-
-Keep the utility database separate from SHD.build. Use checksummed additive migrations, foreign keys, WAL, atomic blob installation, compare-and-swap transitions, and recoverable leases. Model capture occurrences separately from blob identity. Test crashes at transaction and filesystem boundaries.
-
-For GDC-005, implement only the reviewed durable corpus-port operations described in its task and handoff. Do not edit domain contracts, pipeline policy, routes, or application database code. Write the assigned task handoff and do not commit or push.

.opencode/agents/gdc-test-engineer.md

@@ -1,37 +0,0 @@
----
-description: Adds cross-subsystem integration, contract, recovery, synthetic-media, secret-scanning, and ISAC workflow tests without editing production code.
-mode: subagent
-hidden: true
-model: openai/gpt-5.3-codex-spark
-variant: medium
-steps: 90
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/tests/integration/test_end_to_end.py": allow
-    "tools/game-data-capture/tests/integration/test_crash_recovery.py": allow
-    "tools/game-data-capture/tests/integration/test_secret_exclusion.py": allow
-    "tools/game-data-capture/tests/fixtures/e2e/**": allow
-    "src/lib/isac/capture-intake/end-to-end.test.ts": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-022.md": allow
-  bash: deny
-  task: deny
----
-
-You own GDC-022. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and every dependency passed review. Add tests only after subsystem contracts and implementations exist. Do not repair production code; report each failure to its owner.
-
-Use synthetic or approved fixtures. Keep proprietary screenshots and private corpus data out of Git. Test end-to-end state, restart recovery, provider failures, media bounds, numeric disagreements, secret exclusion, manager publication, Contributor Mode proposals, and canonical readback. Assert audit actor, category, action, target, and before/after relationship evidence. Ensure tests fail when intended behavior is removed.
-
-Write `handoffs/GDC-022.md` and do not commit or push.

.opencode/agents/gdc-video-import.md

@@ -1,36 +0,0 @@
----
-description: Implements bounded FFmpeg and ffprobe video ingestion, tiled stability analysis, sharp-frame selection, lineage, cancellation, and recovery.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: medium
-steps: 90
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/src/game_data_capture/video/**": allow
-    "tools/game-data-capture/tests/unit/video/**": allow
-    "tools/game-data-capture/tests/integration/test_video_import.py": allow
-    "tools/game-data-capture/tests/fixtures/video/**": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-015.md": allow
-  bash: ask
-  task: deny
----
-
-You own GDC-015. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and GDC-008 and GDC-013 passed review.
-
-Run FFmpeg and ffprobe with argument arrays, private paths, limits, timeouts, bounded stderr, cancellation, and process-group cleanup. Extract no audio. Use tiled motion so animated backgrounds do not hide stable UI. Preserve parent hashes, timestamps, metrics, commands, and policy versions.
-
-Do not edit web routes, runtime integration, OCR, or storage. Use generated media fixtures. Write `handoffs/GDC-015.md` and do not commit or push.

.opencode/agents/gdc-vision-ocr.md

@@ -1,39 +0,0 @@
----
-description: Benchmarks local GPU OCR and implements preprocessing, the persistent OCR worker, confidence calibration, and OCR evaluation.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: high
-steps: 100
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  external_directory: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/src/game_data_capture/ocr/**": allow
-    "tools/game-data-capture/src/game_data_capture/vision/preprocess.py": allow
-    "tools/game-data-capture/tests/unit/ocr/**": allow
-    "tools/game-data-capture/tests/unit/vision/test_preprocess.py": allow
-    "tools/game-data-capture/tests/gpu/**": allow
-    "tools/game-data-capture/tests/evaluation/test_ocr.py": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-007.md": allow
-  bash: ask
-  task: deny
----
-
-You own the OCR phase of GDC-007. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and H2 passed. Do not select an OCR engine or threshold before the private corpus passes H2.
-
-Measure exact numbers, labels, transcript accuracy, latency, VRAM, CUDA provider, model hashes, and confidence calibration. Keep raw OCR separate from normalized values. Never call a network service from local OCR.
-
-Return dependency pin requests to `gdc-python-core`; do not edit lock files. Write the OCR section of `handoffs/GDC-007.md` and do not commit or push.

.opencode/agents/gdc-wayland-media.md

@@ -1,35 +0,0 @@
----
-description: Implements niri and Wayland clipboard image intake, private spooling, and watcher process supervision.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: medium
-steps: 90
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/src/game_data_capture/ingest/**": allow
-    "tools/game-data-capture/tests/unit/ingest/**": allow
-    "tools/game-data-capture/tests/integration/test_clipboard_watch.py": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-004.md": allow
-  bash: ask
-  task: deny
----
-
-You own GDC-004. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and its dependencies passed review. Use the existing niri focused-window shortcut and `wl-paste`; do not automate game input.
-
-Run child processes without a shell. Bound bytes, dimensions, stderr, queues, retries, and shutdown. Keep the clipboard helper small and remove OpenAI secrets from its environment. Request coordinator approval for live clipboard or compositor commands; never read clipboard text.
-
-Do not edit storage, OCR, provider, video, or web code. Add failure tests, write `handoffs/GDC-004.md`, and do not commit or push.

.opencode/agents/gdc-weapon-gear.md

@@ -1,40 +0,0 @@
----
-description: Implements evidence-preserving extraction for weapons and Gear across Mask, Gloves, Backpack, Body Armor, Holster, and Knee Pads.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: medium
-steps: 90
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/src/game_data_capture/extractors/weapon.py": allow
-    "tools/game-data-capture/src/game_data_capture/extractors/gear.py": allow
-    "tools/game-data-capture/tests/unit/extractors/test_weapon.py": allow
-    "tools/game-data-capture/tests/unit/extractors/test_gear.py": allow
-    "tools/game-data-capture/tests/evaluation/test_weapon_gear.py": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-009.md": allow
-  bash: deny
-  task: deny
-  skill:
-    "*": deny
-    "import-weapon-screenshot": allow
----
-
-You own GDC-009. Refuse implementation unless the coordinator assigns it, `STATUS.md` marks it `in_progress`, and GDC-008 passed review. Read the current Weapon and Gear actions, scaling documentation, and weapon screenshot import skill before editing.
-
-Preserve displayed values as observations until evidence establishes canonical endpoints. Treat weapon Talent grids as complete unordered sets and mark cropped lists incomplete. Use exact Gear slot rules. Do not guess Talent, Brand, or Attribute IDs, hidden ranges, native tiers, mod slots, or compatibility pools.
-
-Add per-slot and per-view regression tests. Write `handoffs/GDC-009.md` and do not commit or push.

.opencode/agents/gdc-web-service.md

@@ -1,39 +0,0 @@
----
-description: Implements the loopback FastAPI service, authenticated local sessions, capture and review APIs, request bounds, and browser security.
-mode: subagent
-hidden: true
-model: openai/gpt-5.6-terra
-variant: high
-steps: 100
-permission:
-  "*": deny
-  read:
-    "*": allow
-    "*.env": deny
-    "*.env.*": deny
-    "*.env.example": allow
-    "data/**": deny
-    "**/data/**": deny
-    "**/*.db": deny
-    "**/*.db-*": deny
-  glob: allow
-  grep: ask
-  edit:
-    "*": deny
-    "tools/game-data-capture/src/game_data_capture/web/*.py": allow
-    "tools/game-data-capture/src/game_data_capture/web/routes/**": allow
-    "tools/game-data-capture/tests/unit/web/**": allow
-    "tools/game-data-capture/tests/integration/test_capture_labeling.py": allow
-    "tools/game-data-capture/tests/integration/test_web_security.py": allow
-    "tools/game-data-capture/tests/integration/test_review_ui.py": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-005.md": allow
-    "tmp/game-data-capture-plan/handoffs/GDC-014.md": allow
-  bash: deny
-  task: deny
----
-
-You own the backend portion of GDC-005 or GDC-014. Refuse implementation unless the coordinator assigns one task, `STATUS.md` marks it `in_progress`, and its dependencies passed review. Bind only to loopback and defend against DNS rebinding, cross-origin mutation, CSRF, XSS, path traversal, oversized uploads, and unauthorized artifacts.
-
-Use opaque IDs and escaped text. Keep paths, keys, cookies, database internals, and unrestricted OCR/provider content out of responses. Do not embed SQL in routes or duplicate domain policy.
-
-Coordinate route contracts with `gdc-review-ui`, but do not edit templates or static assets. Add failure-path tests, update the assigned handoff, and do not commit or push.

AGENTS.md

@@ -69,11 +69,27 @@ The `.agents/skills/` directory contains repo-specific skill files. Key skills:
 
 Use `skill` tool to load one when the task matches.
 
+## Agent skills
+
+### Issue tracker
+
+Track issues in this repository's Gitea Issues using `tea`. See
+`docs/agents/issue-tracker.md`.
+
+### Triage labels
+
+Use the five canonical triage labels without overrides. See
+`docs/agents/triage-labels.md`.
+
+### Domain docs
+
+Use the single-context domain documentation layout. See `docs/agents/domain.md`.
+
 ## Verify commands
 
 Run in order after source changes:
 
-```
+```bash
 npm run check        # svelte-kit sync + svelte-check (typecheck)
 npm run build        # secretless Vite production build
 ```
@@ -115,21 +131,39 @@ need database state use the embedded Turso engine.
 - **ISAC namespace**: `/isac` is the admin console; `/admin` redirects there
   via 308.
 
+## Long-running development processes
+
+Use the installed `pi-background-tasks` extension's `bg_run` tool for
+development servers, watchers, and other persistent commands. Do not use
+foreground shell sessions, `nohup`, `&`, or process-tree/PID discovery when a
+tracked task exists.
+
+- Use `isAgent: false` and a concise, descriptive task name.
+- Retain the returned task ID and output path. Inspect a task with `bg_status`
+  and read its output with `bg_logs`.
+- Stop a task with `bg_kill <task-id>`. To restart it, start a new `bg_run` task
+  and retain its new task ID and output path; do not search for and kill
+  processes.
+- Do not leave duplicate tracked tasks for the same development service.
+
 ## Development server lifecycle
 
 After changing source code, styles, configuration, dependencies, or routes,
 restart the development server before handing work back.
 
-1. Inspect running processes and stop only this project's development-server
-   process tree.
-2. Start one hidden `npm run dev` process from the repository root. Do not leave
-   duplicate project development servers running.
-3. Confirm the server accepts an HTTP request before completing the task.
-4. Leave the verified development server running so the project owner can review
-   the changes.
+1. Start `npm run dev` from the repository root with `bg_run`, using
+   `isAgent: false` and a descriptive task name. Retain its task ID and output
+   path.
+2. Before starting a replacement, stop the existing tracked development-server
+   task with `bg_kill <task-id>` so only one server runs.
+3. Confirm the task logs show the server started, then confirm it accepts an
+   HTTP request before completing the task.
+4. Leave the verified tracked task running so the project owner can review the
+   changes.
 
 Database maintenance may require the server to remain stopped while the embedded
-database is locked. Restart and verify the server after maintenance completes.
+database is locked. Stop its tracked task first, then restart and verify it
+after maintenance completes.
 
 ## SHD design-system maintenance
 
@@ -245,7 +279,7 @@ database. The command refuses to merge into a populated database.
 
 ## Development database maintenance
 
-1. Stop only this project's development-server process tree.
+1. Stop this project's tracked development-server task with `bg_kill <task-id>`.
 2. Run and verify `npm run db:backup`. Retain and report the backup path.
 3. Apply the migration or maintenance operation. Verify schema state, record
    counts, and critical entities.

CONTEXT.md

@@ -0,0 +1,271 @@
+# SHD.build Domain
+
+SHD.build is an independent community intelligence platform for _The Division
+Resurgence_. This glossary defines the language used for player planning, shared
+content, Game Data, governance, equipment, progression, and modeled mechanics.
+
+## Product and people
+
+**SHD.build**: The community platform described by this glossary. Always
+capitalize `SHD` and write the product name as `SHD.build`. _Avoid_: SHD Build,
+SHD Builder
+
+**Agent**: Any person using SHD.build, whether anonymous or authenticated.
+_Avoid_: User, visitor, player when referring to product access
+
+**Anonymous Agent**: An Agent who is not signed in to SHD.build. _Avoid_:
+Visitor, guest
+
+**Registered Agent**: An Agent with an SHD.build account. _Avoid_: Registered
+user, member
+
+**Modeling Session**: An interactive agentic work session that prepares one
+Mechanic Program at a time for a Registered Agent to confirm in chat before the
+session submits it through an existing ISAC action. _Avoid_: Agent, Modeling
+Client, bulk job
+
+**Contributor**: A Registered Agent who has accepted the contributor guidelines
+and may submit proposed Game Data changes for review. _Avoid_: Editor when the
+Agent cannot change Canonical Game Data directly
+
+**Operator**: A Registered Agent performing an authorized task in ISAC.
+Contributor, reviewer, moderator, and administrator authority remain distinct
+from this situational term. _Avoid_: Admin as a generic name for anyone using
+ISAC
+
+**Oversight**: The human review function for proposed Game Data, moderated
+Community Content, and identity assets. Use the qualified names Data Oversight,
+Community Oversight, Guide Oversight, and Avatar Oversight when the review area
+matters. _Avoid_: Moderation as a name for every review function
+
+## Planning and shared content
+
+**Builder**: The planning tool an Agent uses to configure a Loadout and inspect
+supported calculations. _Avoid_: Build when referring to the tool
+
+**Loadout**: A complete planned character configuration, including selected
+Equipment, progression choices, and combat assumptions. A Loadout may exist
+without becoming a saved Build. _Avoid_: Build when persistence, ownership, or
+sharing matters
+
+**Loadout Draft**: An editable Loadout that has not become a saved Build.
+Anonymous and Registered Agents may both work with drafts. _Avoid_: Build draft
+
+**Build**: A saved, owned, and shareable planning artifact whose central content
+is a Loadout. A Build may be Private, Unlisted, or Public and may derive from
+another Build. _Avoid_: Loadout when persistence, ownership, or sharing matters
+
+**Guide**: A revisioned long-form community article that may include snapshots
+of one or more Builds. A Guide is prose-led content rather than a Loadout
+container. _Avoid_: Build guide when referring to every Guide
+
+**News Article**: A revisioned editorial or syndicated article published through
+the News channel. _Avoid_: Guide, post
+
+**Article Revision**: An immutable edition of a Guide or News Article. Editors
+select one revision for publication while later revisions may await review.
+_Avoid_: Version when referring to published article history
+
+**Community Content**: Agent-authored comments, profile biographies, custom
+avatars, and Guides governed by the shared moderation lifecycle. _Avoid_:
+User-generated content, UGC
+
+**Community Note**: A visible comment that Community Oversight pins to a Public
+Database discussion. It remains Community Content and follows the same removal
+rules as other comments. _Avoid_: Official correction, staff note
+
+**Content Report**: An Agent's request for Oversight to review visible Community
+Content, with no immediate change to the content's visibility. _Avoid_: Takedown
+request
+
+**Public Database**: The Agent-facing reference view of Canonical Game Data.
+_Avoid_: Database when the term could mean application storage
+
+## Game Data and governance
+
+**Game Data**: Community-maintained structured facts about _The Division
+Resurgence_ used by the Public Database, Builder, Builds, and contribution
+workflow. _Avoid_: Source data, builder data, reference data
+
+**Canonical Game Data**: The authoritative, approved body of Game Data. _Avoid_:
+Live data, production data
+
+**Canonical Record**: One authoritative record within Canonical Game Data.
+_Avoid_: Approved proposal
+
+**Contribution Proposal**: A pending request from a Contributor to create or
+change Canonical Game Data. Approval still requires the proposed change to
+satisfy the canonical rules for its record family. _Avoid_: Draft record,
+pending record
+
+**ISAC**: The operational console for Game Data, contribution review, community
+governance, identity and access management, audit history, and system
+operations. _Avoid_: Admin panel, calculation engine
+
+**Registry**: An ISAC workspace containing one family of related records and its
+management controls. _Avoid_: Table, list page
+
+**Audit Event**: An immutable account of a consequential operation or review
+decision, including the actor, target, and change evidence. _Avoid_: Audit-log
+row, activity log
+
+**Compensating Reversion**: A new operation that restores an earlier state while
+preserving the original Audit Event and recording the reversal. _Avoid_:
+Rollback, undo when either implies rewriting history
+
+## Equipment and progression
+
+**Equipment**: The items and enhancements selected for a Loadout, including
+Weapons, Gear, Weapon Mods, Gear Mods, Skill Chips, and an OS Protocol. _Avoid_:
+Item when the equipment relationship matters
+
+**Gear**: Equippable protective equipment assigned to a character slot. Gear may
+provide core values, Attributes, a Brand Set, a Talent, and augmentation
+capacity. _Avoid_: Armor as a collective name for all Gear
+
+**Body Armor**: The canonical name for the equippable torso Gear slot. _Avoid_:
+Vest
+
+**Weapon**: An equippable firearm with a Weapon Category, damage and handling
+properties, progression values, and applicable Talents and Mods. _Avoid_: Gun
+when referring to the modeled record
+
+**Weapon Category**: The classification that groups Weapons as Shotgun, Rifle,
+MMR, AR, LMG, or SMG. _Avoid_: Weapon type, weapon family
+
+**Weapon Mod**: An enhancement fitted to a compatible Weapon slot. Regular and
+Exotic Weapon Mods follow different selection rules. _Avoid_: Attachment
+
+**Gear Mod**: An enhancement fitted to Gear according to the Gear's available
+mod capacity. _Avoid_: Tactical Augment
+
+**Tactical Augment**: A numbered augmentation position recorded on selected Gear
+in a Loadout. _Avoid_: Gear Mod
+
+**Attribute**: A named measurable game property with defined units and
+calculation meaning. _Avoid_: Stat when referring to the canonical Attribute
+catalog
+
+**Core Attribute**: One of the three primary character alignments: Firepower,
+Toughness, or Engineering. _Avoid_: Main stat, primary stat
+
+**Brand Set**: A Gear identity whose bonuses depend on how many pieces from that
+set the Loadout equips. _Avoid_: Gear set
+
+**Quality**: The item classification Standard, Specialized, Superior, or
+High-end. Quality governs available or scaled properties for applicable
+Equipment. _Avoid_: Rarity
+
+**Exotic**: A special scope used by certain Weapons, Talents, and Weapon Mods.
+Exotic is not a fifth Quality. _Avoid_: Exotic quality
+
+**Item Level**: An Equipment progression coordinate used to resolve
+level-dependent values. _Avoid_: Tier, Quality
+
+**Equipment Tier**: The T0, T1, or T2 progression band that controls Equipment
+capabilities and values. _Avoid_: Talent Tier, Item Level
+
+**Talent Tier**: The Tier I or Tier II value variant of a Talent. _Avoid_:
+Equipment Tier, T1, T2 when the distinction could be unclear
+
+**Reference Level**: The Item Level at which an observed value or range applies.
+_Avoid_: Base level
+
+**Hidden Base**: A level-independent value inferred from observed Equipment
+values and the game's progression rules. _Avoid_: Displayed Value, Raw Value
+
+**Raw Value**: A calculated value before the presentation rules that reproduce
+the game's displayed number. _Avoid_: Hidden Base, Displayed Value
+
+**Displayed Value**: The player-visible number produced after applying the
+game's presentation rules to a Raw Value. _Avoid_: Raw Value
+
+**OS Protocol**: A single equipped progression item with a Quality, Core
+Attribute alignment, primary effect, inherited secondary profile, and
+upgradeable Talent. _Avoid_: Protocol when the operating-system meaning could be
+inferred
+
+**Skill**: A selectable combat capability associated with a Specialization.
+Skills may own Skill Chip Sets and may have explicit compatibility relationships
+with another Skill. _Avoid_: Ability or Specialization Ability for the
+selectable game concept
+
+**Signature Skill**: A Specialization's defining Skill, distinguished from its
+other selectable Skills. _Avoid_: Signature ability
+
+**Skill Chip**: An Equipment selection that modifies the Skill occupying its
+Loadout position. Skill Chips belong to a Skill Chip Set and may provide
+primary, secondary, and set effects. _Avoid_: Chip when the equipment family is
+unclear
+
+**Skill Chip Set**: A reusable Skill Chip definition associated with a Skill,
+including its set bonus and optional Talent. An explicit compatibility
+relationship may let another Skill equip the set. _Avoid_: Skill set
+
+**Specialization**: A character progression identity containing Focuses, Skills,
+and progression choices. _Avoid_: Class
+
+**Focus**: A path within a Specialization aligned to one Core Attribute and
+defining a selection of Skills and progression choices. _Avoid_: Subclass,
+specialization path
+
+**Talent**: A named conditional behavior owned by its source, such as a Weapon,
+Gear item, OS Protocol, or Skill Chip Set. Different Talent sources may use
+different progression variants. _Avoid_: Perk, passive
+
+## Modeled mechanics
+
+**Mechanic Program**: The structured, source-owned description of a Talent or
+other conditional behavior. It captures the conditions, state changes, and
+outcomes needed to evaluate that behavior. _Avoid_: Script, Trigger record
+
+**Event**: An observed occurrence on a combat timeline that a Mechanic Program
+may inspect. _Avoid_: Trigger when referring to the occurrence itself
+
+**Trigger Condition**: The criteria that an Event must satisfy before a mechanic
+can proceed toward Activation. A Trigger Condition is part of a Mechanic
+Program, not a standalone Game Data record. _Avoid_: Trigger as an entity
+
+**Activation**: A successful mechanic occurrence after its Event, conditions,
+chance, and Cooldown requirements resolve. _Avoid_: Proc when precision matters
+
+**Cooldown**: The period after a successful Activation during which the same
+mechanic cannot activate again. A failed chance does not begin the Cooldown.
+_Avoid_: Delay
+
+**Mechanic State**: A value retained across Events for one mechanic, such as a
+flag, count, stack, duration, mark, or resource. _Avoid_: Runtime state when
+discussing game behavior
+
+**Outcome**: The effect emitted by an activated mechanic, such as an Attribute
+change, damage, restoration, resource change, or marker. _Avoid_: Effect when
+the source Talent and emitted result could be confused
+
+**Combat Profile**: The encounter assumptions and observed rates used to project
+a Loadout's combat performance. _Avoid_: Simulation when no event simulation
+occurs
+
+**Scenario Input**: An explicit encounter assumption required to evaluate a
+mechanic whose result cannot be determined from the Loadout alone. _Avoid_:
+Guess, default assumption
+
+**Ready**: The mechanic readiness state indicating that typed Game Data can
+evaluate the mechanic without additional Scenario Inputs. _Avoid_: Complete
+
+**Requires Assumptions**: The mechanic readiness state indicating that
+evaluation needs one or more explicit Scenario Inputs. _Avoid_: Ready,
+unsupported
+
+**Captured Only**: The mechanic readiness state indicating that SHD.build
+preserves the authored behavior but cannot calculate it. _Avoid_: Unsupported
+when the behavior has still been recorded
+
+**Extra Health**: Temporary Health granted in addition to an Agent's normal
+Health. Each grant remains distinct from later changes to the current Extra
+Health total. _Avoid_: Health, healing, bonus armor
+
+**Hit Taken**: A hit received by an Agent, including one absorbed by Extra
+Health. A Hit Taken does not require normal Health loss. _Avoid_: Taking Damage
+
+**Taking Damage**: A loss of an Agent's normal Health. A hit absorbed by Extra
+Health does not count as Taking Damage. _Avoid_: Hit Taken

database/schema.sql

@@ -769,15 +769,12 @@ CREATE TABLE IF NOT EXISTS stat_attributes (
 	weapon_min REAL,
 	weapon_max REAL,
 	weapon_reference_level INTEGER NOT NULL DEFAULT 50 CHECK(weapon_reference_level BETWEEN 1 AND 50),
-	skill_chip_min REAL,
-	skill_chip_max REAL,
 	cap_value REAL,
 	active INTEGER NOT NULL DEFAULT 1,
 	created_at TEXT NOT NULL,
 	updated_at TEXT NOT NULL,
 	CHECK((gear_min IS NULL AND gear_max IS NULL) OR (gear_min IS NOT NULL AND gear_max IS NOT NULL AND gear_min <= gear_max)),
 	CHECK((weapon_min IS NULL AND weapon_max IS NULL) OR (weapon_min IS NOT NULL AND weapon_max IS NOT NULL AND weapon_min <= weapon_max)),
-	CHECK((skill_chip_min IS NULL AND skill_chip_max IS NULL) OR (skill_chip_min IS NOT NULL AND skill_chip_max IS NOT NULL AND skill_chip_min <= skill_chip_max)),
 	CHECK(cap_value IS NULL OR cap_value >= 0)
 );
 CREATE UNIQUE INDEX IF NOT EXISTS stat_attributes_name_unit_nocase_idx ON stat_attributes(name COLLATE NOCASE, unit);
@@ -906,6 +903,7 @@ CREATE TABLE IF NOT EXISTS conditional_effect_outcomes (
 	delivery_mode TEXT NOT NULL DEFAULT 'instant' CHECK(delivery_mode IN ('instant','continuous')),
 	delivery_duration_seconds REAL CHECK(delivery_duration_seconds IS NULL OR delivery_duration_seconds>0),
 	targeting_json TEXT,
+	probability_percent REAL CHECK(probability_percent IS NULL OR (probability_percent>=0 AND probability_percent<=100)),
 	min_state_value REAL,
 	max_state_value REAL,
 	description_slot INTEGER CHECK(description_slot IS NULL OR description_slot>=1),
@@ -1168,14 +1166,30 @@ CREATE TABLE IF NOT EXISTS skill_chip_two_piece_bonuses (
 	CHECK(max_value >= min_value)
 );
 CREATE TABLE IF NOT EXISTS skill_chip_primary_options (
-	skill_chip_set_id TEXT NOT NULL REFERENCES skill_chip_sets(id) ON DELETE CASCADE,
-	stat_attribute_id TEXT NOT NULL REFERENCES stat_attributes(id),
-	PRIMARY KEY(skill_chip_set_id, stat_attribute_id)
+	stat_attribute_id TEXT PRIMARY KEY REFERENCES stat_attributes(id)
+);
+CREATE TABLE IF NOT EXISTS skill_chip_primary_quality_values (
+	stat_attribute_id TEXT NOT NULL,
+	quality TEXT NOT NULL CHECK(quality IN ('Standard','Specialized','Superior','High-end')),
+	min_value REAL NOT NULL,
+	max_value REAL NOT NULL,
+	PRIMARY KEY(stat_attribute_id,quality),
+	FOREIGN KEY(stat_attribute_id) REFERENCES skill_chip_primary_options(stat_attribute_id) ON DELETE CASCADE,
+	CHECK(max_value>=min_value),
+	CHECK(min_value>=0)
 );
 CREATE TABLE IF NOT EXISTS skill_chip_secondary_options (
-	skill_chip_set_id TEXT NOT NULL REFERENCES skill_chip_sets(id) ON DELETE CASCADE,
-	stat_attribute_id TEXT NOT NULL REFERENCES stat_attributes(id),
-	PRIMARY KEY(skill_chip_set_id, stat_attribute_id)
+	stat_attribute_id TEXT PRIMARY KEY REFERENCES stat_attributes(id)
+);
+CREATE TABLE IF NOT EXISTS skill_chip_secondary_quality_values (
+	stat_attribute_id TEXT NOT NULL,
+	quality TEXT NOT NULL CHECK(quality IN ('Specialized','Superior','High-end')),
+	min_value REAL NOT NULL,
+	max_value REAL NOT NULL,
+	PRIMARY KEY(stat_attribute_id,quality),
+	FOREIGN KEY(stat_attribute_id) REFERENCES skill_chip_secondary_options(stat_attribute_id) ON DELETE CASCADE,
+	CHECK(max_value>=min_value),
+	CHECK(min_value>=0)
 );
 CREATE TABLE IF NOT EXISTS skill_chip_talents (
 	id TEXT PRIMARY KEY,
@@ -1232,19 +1246,21 @@ CREATE TABLE IF NOT EXISTS weapon_mod_quality_values (
 	CHECK(primary_level_20_max>=primary_level_1_max)
 );
 CREATE TABLE IF NOT EXISTS weapon_mod_secondary_options (
-	weapon_mod_id TEXT NOT NULL REFERENCES weapon_mods(id) ON DELETE CASCADE,
-	stat_attribute_id TEXT NOT NULL REFERENCES stat_attributes(id),
-	PRIMARY KEY(weapon_mod_id,stat_attribute_id)
+	stat_attribute_id TEXT PRIMARY KEY REFERENCES stat_attributes(id)
 );
 CREATE TABLE IF NOT EXISTS weapon_mod_secondary_quality_values (
-	weapon_mod_id TEXT NOT NULL,
 	stat_attribute_id TEXT NOT NULL,
-	quality TEXT NOT NULL CHECK(quality IN ('Standard','Specialized','Superior','High-end')),
-	min_value REAL NOT NULL,
-	max_value REAL NOT NULL,
-	PRIMARY KEY(weapon_mod_id,stat_attribute_id,quality),
-	FOREIGN KEY(weapon_mod_id,stat_attribute_id) REFERENCES weapon_mod_secondary_options(weapon_mod_id,stat_attribute_id) ON DELETE CASCADE,
-	CHECK(max_value>=min_value)
+	quality TEXT NOT NULL CHECK(quality IN ('Specialized','Superior','High-end')),
+	level_1_min REAL NOT NULL,
+	level_1_max REAL NOT NULL,
+	level_20_min REAL NOT NULL,
+	level_20_max REAL NOT NULL,
+	PRIMARY KEY(stat_attribute_id,quality),
+	FOREIGN KEY(stat_attribute_id) REFERENCES weapon_mod_secondary_options(stat_attribute_id) ON DELETE CASCADE,
+	CHECK(level_1_max>=level_1_min),
+	CHECK(level_20_max>=level_20_min),
+	CHECK(level_20_min>=level_1_min),
+	CHECK(level_20_max>=level_1_max)
 );
 CREATE TABLE IF NOT EXISTS weapon_mod_exotic_attributes (
 	id TEXT PRIMARY KEY,
@@ -1292,19 +1308,21 @@ CREATE TABLE IF NOT EXISTS gear_mod_quality_values (
 	CHECK(primary_level_20_max>=primary_level_1_max)
 );
 CREATE TABLE IF NOT EXISTS gear_mod_secondary_options (
-	gear_mod_id TEXT NOT NULL REFERENCES gear_mods(id) ON DELETE CASCADE,
-	stat_attribute_id TEXT NOT NULL REFERENCES stat_attributes(id),
-	PRIMARY KEY(gear_mod_id,stat_attribute_id)
+	stat_attribute_id TEXT PRIMARY KEY REFERENCES stat_attributes(id)
 );
 CREATE TABLE IF NOT EXISTS gear_mod_secondary_quality_values (
-	gear_mod_id TEXT NOT NULL,
 	stat_attribute_id TEXT NOT NULL,
-	quality TEXT NOT NULL CHECK(quality IN ('Standard','Specialized','Superior','High-end')),
-	min_value REAL NOT NULL,
-	max_value REAL NOT NULL,
-	PRIMARY KEY(gear_mod_id,stat_attribute_id,quality),
-	FOREIGN KEY(gear_mod_id,stat_attribute_id) REFERENCES gear_mod_secondary_options(gear_mod_id,stat_attribute_id) ON DELETE CASCADE,
-	CHECK(max_value>=min_value)
+	quality TEXT NOT NULL CHECK(quality IN ('Specialized','Superior','High-end')),
+	level_1_min REAL NOT NULL,
+	level_1_max REAL NOT NULL,
+	level_20_min REAL NOT NULL,
+	level_20_max REAL NOT NULL,
+	PRIMARY KEY(stat_attribute_id,quality),
+	FOREIGN KEY(stat_attribute_id) REFERENCES gear_mod_secondary_options(stat_attribute_id) ON DELETE CASCADE,
+	CHECK(level_1_max>=level_1_min),
+	CHECK(level_20_max>=level_20_min),
+	CHECK(level_20_min>=level_1_min),
+	CHECK(level_20_max>=level_1_max)
 );
 CREATE TABLE IF NOT EXISTS specialization_progression_config (
 	id TEXT PRIMARY KEY CHECK(id='default'),
@@ -1404,6 +1422,17 @@ CREATE TABLE IF NOT EXISTS specialization_ability_attacks (
 	CHECK(charge_policy<>'none' OR charge_count=1)
 );
 CREATE INDEX IF NOT EXISTS specialization_abilities_specialization_idx ON specialization_abilities(specialization_id,name);
+CREATE TABLE IF NOT EXISTS specialization_ability_skill_chip_links (
+	ability_id TEXT NOT NULL REFERENCES specialization_abilities(id) ON DELETE CASCADE,
+	compatible_ability_id TEXT NOT NULL REFERENCES specialization_abilities(id) ON DELETE CASCADE,
+	PRIMARY KEY(ability_id,compatible_ability_id),
+	CHECK(ability_id<compatible_ability_id)
+);
+CREATE INDEX IF NOT EXISTS specialization_ability_skill_chip_links_compatible_idx
+	ON specialization_ability_skill_chip_links(compatible_ability_id,ability_id);
+-- db-migrate.mjs installs insert/update triggers for active same-specialization
+-- endpoints and one-pair-per-ability enforcement. Trigger bodies cannot live in
+-- this semicolon-delimited schema file.
 CREATE TABLE IF NOT EXISTS specialization_ability_effects (
 	id TEXT PRIMARY KEY,
 	ability_id TEXT NOT NULL REFERENCES specialization_abilities(id) ON DELETE CASCADE,
@@ -1628,7 +1657,7 @@ INSERT OR IGNORE INTO calculation_stages(id,revision_id,stage_key,label,operator
 INSERT OR IGNORE INTO calculation_stages(id,revision_id,stage_key,label,operator,display_order,locked_position)
 	VALUES('calculation-stage-cycle-1','calculation-revision-1','firing_cycle','Firing cycle','firing_cycle',9,'last');
 CREATE TABLE IF NOT EXISTS game_data_icons (
-	entity_type TEXT NOT NULL CHECK(entity_type IN ('talent', 'brand_set', 'os_protocol', 'skill_chip', 'specialization', 'specialization_ability', 'specialization_node')),
+	entity_type TEXT NOT NULL CHECK(entity_type IN ('talent', 'brand_set', 'os_protocol', 'skill_chip', 'specialization', 'specialization_ability', 'specialization_node', 'weapon_mod_slot')),
 	entity_id TEXT NOT NULL,
 	storage_key TEXT NOT NULL UNIQUE,
 	byte_size INTEGER NOT NULL CHECK(byte_size > 0),

deploy/compose.production.yml

@@ -3,7 +3,7 @@ name: shd-build-production
 services:
   app:
     image: ${SHD_IMAGE:-shd-build-production:local}
-    restart: unless-stopped
+    restart: always
     init: true
     environment:
       INFISICAL_PROJECT_ID: 2ee94b27-e599-4194-9797-3372d42e53f6
@@ -42,7 +42,7 @@ services:
 
   scheduler:
     image: ${SHD_IMAGE:-shd-build-production:local}
-    restart: unless-stopped
+    restart: always
     init: true
     command:
       - scheduler

deploy/runtime-start.test.ts

@@ -142,6 +142,10 @@ describe('container runtime startup', () => {
         { key: 'APP_ORIGIN', value: 'https://exported.invalid' },
         { key: 'DISCORD_CLIENT_ID', value: 'exported-discord-client' },
         { key: 'DISCORD_CLIENT_SECRET', value: 'exported-discord-secret' },
+        {
+          key: 'MFA_TOTP_ENCRYPTION_KEYS',
+          value: 'totp-encryption-keyring',
+        },
       ]),
       writeExport(sharedExport, [
         { key: 'SCHEDULER_TOKEN', value: schedulerToken },
@@ -220,6 +224,7 @@ describe('container runtime startup', () => {
       APP_ORIGIN: 'https://stage.shd.build',
       DISCORD_CLIENT_ID: 'exported-discord-client',
       DISCORD_CLIENT_SECRET: 'exported-discord-secret',
+      MFA_TOTP_ENCRYPTION_KEYS: 'totp-encryption-keyring',
       ORIGIN: 'https://stage.shd.build',
       PASSKEY_RP_ID: 'shd.build',
       SCHEDULER_TOKEN: schedulerToken,

docs/DESIGN_SYSTEM.md

@@ -341,17 +341,36 @@ squeezed beside long module headings on mobile.
 ### Command Grid builder
 
 The production builder uses Command Grid as its loadout workbench. Keep the
-entire build visible in a dense matrix while one connected editor configures the
-selected cell. The full-width Specialization and Focus cell is the root choice.
-Its three supplied abilities appear directly below it, followed by two weapons,
-six gear positions, and one full-width OS Protocol.
+entire build visible in a compact matrix while one connected editor configures
+the selected cell. The editor uses two lanes when its container has enough
+width. Equipment identity and base values occupy the first lane; allocations,
+rolls, Talents, and upgrades occupy the second. The lanes stack when either
+would become too narrow. The full-width Specialization and Focus cell is the
+root choice. Its three supplied abilities appear directly below it, followed by
+two weapons, six gear positions, and one full-width OS Protocol.
 
-Matrix cells summarize selected Talent names, Attribute names and values, Brand
-Sets, or Skill Chips. Do not replace those choices with configuration counts.
-Selecting an ability opens its three attached Skill Chip positions. Selecting
-equipment opens the searchable real-data catalog and its compatible
-configuration controls. Do not display a prototype option that the current
-loadout schema cannot save.
+Matrix cells show the slot and equipped item at rest. The selected cell reveals
+its compact Talent, Attribute, Brand Set, or Skill Chip summary. This
+progressive disclosure keeps the matrix scannable without replacing configured
+choices with counts. Selecting an ability opens its three attached Skill Chip
+positions. Selecting equipment opens the searchable real-data catalog and its
+compatible configuration controls. Large Talent pools show the selected Talent
+at rest and open their search grid through an explicit Change action. Do not
+display a prototype option that the current loadout schema cannot save.
+
+Builder cells use one leading icon track. Specializations, abilities, Skill
+Chips, and OS Protocols use registered artwork; weapons and gear use static
+category or slot fallbacks when no item artwork exists. Skill Chip slots keep
+the icon beside the set name and quality so empty and configured slots share one
+scan path. Visible builder labels stay short; full validation text remains
+available through the cell's accessible name or title.
+
+Each equipped gear or weapon Talent exposes two adjacent icon choices for Tier I
+and Tier II. Both choices reuse the Talent artwork; Tier II applies a restrained
+warm recolor so players can distinguish the pair before reading the labels.
+Every tile retains `T1` or `T2`, its full tier name, and selected or unavailable
+text. Disable Tier II when the canonical Talent has no authored Tier II data.
+Weapon equipment tier and Talent tier are independent selections.
 
 Equipment readiness belongs at the point of resolution. Mark an incomplete
 matrix cell with a compact red text indicator and status rail, then let the cell
@@ -361,20 +380,19 @@ and Skill DPS, encounter assumptions, activation profiles, rotations, and
 simulation as `COMING SOON`; they do not report calculation-profile blockers as
 current player errors.
 
-The builder uses three workbench columns on wide screens, moves the live summary
-below the matrix and editor at intermediate widths, and stacks all three regions
-on narrow screens. Every grid track and editor child must accept content
-shrinkage. At 560px and below, stack attribute picker/value pairs and section
-headings; keep the command actions in two equal columns. Validation markers use
-short visible labels while their full messages remain available to assistive
-technology and pointer users.
+The builder uses two primary workbench columns on wide screens: the compact
+matrix and the two-lane editor. The live summary spans both columns below them.
+Narrow screens stack the matrix, editor, and summary. Every grid track and
+editor child must accept content shrinkage. At 560px and below, stack Attribute
+picker/value pairs and section headings; keep the command actions in two equal
+columns. Validation markers use short visible labels while their full messages
+remain available to assistive technology and pointer users.
 
 Use `--shd-builder-canvas` for recessed equipment fields. Use
 `--shd-builder-selection` with `--shd-builder-selection-border` for the selected
 cell. Preserve button semantics, `aria-pressed`, focus-visible outlines, pressed
-feedback, and textual readiness states. At narrower desktop widths, keep the
-matrix and editor together and move live results below them. On mobile, stack
-the matrix, editor, and live results in that order.
+feedback, and textual readiness states. On mobile, stack the matrix, editor, and
+live results in that order.
 
 The command header contains the required build name, local and account save
 actions, account visibility, and optional sharing notes. Sharing notes include a
@@ -1572,13 +1590,42 @@ an icon in every option.
 
 ### Skill Chip data console
 
-Skill Chip editing uses the dense ISAC staged-definition pattern: identity and
-icon, 2-piece numeric bonus, mutually exclusive primary and secondary roll
-pools, then 3-piece talent. Superior blue and High-end yellow identify the
-supported qualities; reserve orange for actions and the current interactive
-state. A four-step segmented preview shows the linear zero-to-three High-end
-interpolation without duplicate values. At narrow widths, stack roll-pool and
-talent columns, use a two-by-two preview grid, and retain 44-pixel targets.
+Place two shared configuration cards above the Skill Chip definition registry.
+The `SHARED PRIMARY PROFILE` card contains the fixed Skill Duration, Skill
+Radius, Skill Cooldown Recovery, and Skill Intensity rows, with direct minimum
+and maximum fields for Standard, Specialized, Superior, and High-end. Its
+summary shows the configured count for each quality and the `NOT YET DEFINED`
+calculation state. The `SHARED SECONDARY POOL` card contains repeatable
+searchable Attribute rows with direct minimum and maximum fields for
+Specialized, Superior, and High-end. Its summary shows each quality's fixed
+capacity and the shared option count. Each card opens its own editor and closes
+that editor after a successful save. Validation keeps the affected editor open
+with its values intact. Successful saves append
+`game_data/skill_chip_primary_profile.updated` or
+`game_data/skill_chip_secondary_pool.updated`.
+
+State the fixed secondary capacities in the pool card and editor: Standard zero,
+Specialized one, Superior two, and High-end two. Skill Chip fields never show an
+item-level control or level-based preview. Quality labels use the global green,
+blue, purple, and yellow treatments; orange remains reserved for actions and
+selection. On narrow screens, profile summaries stack, endpoint matrices scroll
+inside their cards, and actions retain 44-pixel targets.
+
+Definition editors follow the dense staged pattern: ability assignment, identity
+and icon, one per-set 2-piece bonus, then the optional 3-piece Talent. Place the
+Talent assignment control before one disclosure that contains the entire Talent
+workspace: identity, description, quality-mix preview, and
+`MechanicProgramEditor`. The disclosure summary shows the configured Talent name
+or `TALENT WORKSPACE`, the quality-scaled outcome count, and an explicit
+`EXPAND` or `COLLAPSE` action. Existing Talents start collapsed when an operator
+opens a definition. Assigning a Talent or receiving a Talent validation error
+opens the workspace. Native disclosure semantics expose the expanded state, keep
+draft state mounted while collapsed, and provide a 44-pixel mobile target.
+
+Every equipped chip quality counts toward the two-piece threshold. The set-bonus
+preview uses four steps for zero through three equipped High-end chips and the
+formula `minimum + (maximum − minimum) × h / 3`; only High-end chips increase
+`h`. Do not duplicate calculated values as editable fields.
 
 ### ISAC record identity controls
 
@@ -1808,6 +1855,15 @@ same `weaponBaseRange` curve as the builder; never label the configured base
 endpoints as level-50 values. Weapon Talent 1 and Talent 2 pools use separate
 clickable icon rails and the standard Talent quick view.
 
+Show each weapon's named Mod slots and slot pictograms between its performance
+facts and Talent pools. Native T0 weapons display the complete T1/T2 slot set.
+Mark the slot that is absent at T0 with the blue information state and an
+explicit `T1+` label so the unlock does not rely on color alone. Other slots use
+the neutral telemetry treatment. If ISAC has no slot data, show
+`MOD SLOT DATA NOT CONFIGURED`. Do not show the weapon-category bonus count as
+`BASE BONUSES`; that identical count does not help players compare weapon
+definitions.
+
 Record cards may end with contextual actions that connect related public
 registries. Actions use the compact orange tactical-button treatment and encode
 their destination filter in the URL. Brand cards provide a “find Gear” action
@@ -1970,18 +2026,26 @@ mode with weapon icons and retained accessible names. Show configured versus
 required slot counts in text. Disabled tiers remain visibly unavailable and must
 not submit slot assignments.
 
-Quality-scaled registry editors use a compact matrix when the same numeric shape
-repeats across all four quality levels. Apply global quality colors only to the
-quality labels, retain textual quality names, and keep numeric fields neutral.
-On narrow screens the matrix may scroll horizontally while its surrounding
-editor and previews stack.
+Regular Weapon Mod definitions use a compact Level 1 and Level 20 primary-range
+matrix for Standard, Specialized, Superior, and High-end quality. Apply global
+quality colors only to the quality labels, retain textual quality names, and
+keep numeric fields neutral. On narrow screens the matrix may scroll
+horizontally while its surrounding editor and previews stack. Primary core type
+remains builder-selected and appears as the three always-available core icons
+rather than a persisted ISAC choice. Individual regular Weapon Mod editors also
+retain triggerless Mod Effects with one or two Attribute references and fixed
+per-quality values.
 
-When two item slots draw from the same canonical option pool, edit that pool
-once rather than rendering two duplicated selectors. Weapon Mods use a
-repeatable secondary-attribute row: one searchable attribute reference plus four
-quality range pairs. Show that the builder selects two distinct options from the
-pool. Primary core type is likewise builder-selected and is displayed as the
-three always-available core icons rather than a persisted ISAC choice.
+Configure one global secondary Attribute pool above the Weapon Mod registry.
+Each repeatable row contains one searchable Attribute reference and Level 1 and
+Level 20 minimum and maximum fields for Specialized, Superior, and High-end.
+Values between those endpoints use linear interpolation. Do not render Standard
+range fields because Standard has no secondary slot. State the fixed capacity in
+the pool editor and builder: Standard zero, Specialized one, Superior two, and
+High-end two. The builder requires distinct selections. Individual Weapon Mod
+editors must not repeat or submit pool data. A successful pool save uses the
+standard shared-profile lifecycle and creates the dedicated
+`game_data/weapon_mod_secondary_pool.updated` audit event.
 
 Exotic Weapon Mod status is a separate single-icon toggle using the exotic icon
 and the standard pressed, focus-visible, and selected states. Selecting it must
@@ -1993,12 +2057,20 @@ state panel visible so the change in data semantics is unmistakable.
 
 ### Gear Mod registry
 
-Gear Mods reuse the compact quality matrix, level preview, and pooled
-secondary-attribute rows established by Weapon Mods. Do not render exotic,
+Gear Mods reuse the compact Level 1 and Level 20 primary-range matrix and level
+preview established by regular Weapon Mods. Do not render exotic,
 weapon-category, slot-type, or Mod Effect controls in this simpler editor.
 Present the five primary options as an always-visible informational band because
-the actual primary is selected on the build instance, not persisted on the
-canonical definition.
+the build instance selects the primary; the canonical definition does not store
+that selection.
+
+Configure the Gear Mod family’s global secondary Attribute pool above the
+registry, separate from individual Gear Mod editors. Use the same three-quality
+endpoint rows, linear interpolation, and distinct-selection rule as the Weapon
+Mod pool. Capacity is zero for Standard, one for Specialized, and two each for
+Superior and High-end. Individual Gear Mod edits must not repeat or submit this
+pool. A successful pool save creates the dedicated
+`game_data/gear_mod_secondary_pool.updated` audit event.
 
 Use explicit textual tier capacity wherever Gear tier is summarized:
 `1 MOD SLOT` for T0 and `2 MOD SLOTS` for T1/T2. On narrow screens the identity
@@ -2229,6 +2301,13 @@ active abilities, each ability has exactly three active Skill Chip definitions,
 tree rows are contiguous, at least one paid node exists, and the tree uses the
 configured available point total.
 
+The ability editor may pair the open ability with one active ability from the
+same specialization for Skill Chip sharing. Present this as an explicit optional
+relationship, exclude the current ability, and disable abilities that already
+belong to another pair. Do not infer compatibility from names or Focus
+membership. Saving either side updates the shared pair and includes it in the
+ability audit snapshot. Archiving either ability clears the pair.
+
 Compose focus identity from uploaded specialization artwork and the canonical
 Firepower, Toughness, or Engineering icon. Keep the specialization art primary
 and place the attribute mark in a smaller corner badge. Mirror ability slots 1
@@ -2311,9 +2390,11 @@ display `ADVANCED`, and stay visible in the generated script. State rows expose
 label, agent or target scope, initial value, bounds, best-case value, and
 optional expiry. A state change that writes a target pool uses a `STATE OWNER`
 segmented control with `EVENT TARGET` and `EVENT ACTOR`; the selected owner
-remains visible in the generated script. Outcome rows expose kind, target scope,
-Attribute or resource when applicable, value basis, state scaling, phase, and
-every source-specific value column. The Value Model control supports static
+remains visible in the generated script. The `DERIVED VALUE` operation writes
+the branch reducer's numeric result into the selected pool and displays that
+link as a text readout instead of a numeric input. Outcome rows expose kind,
+target scope, Attribute or resource when applicable, value basis, state scaling,
+phase, and every source-specific value column. The Value Model control supports
 values, live Attribute totals, percentage-normalized Attribute values, event
 fields, reducer output, source-defined scenario controls, and OS Protocol
 upgrade scaling where the source permits it. Selecting either Attribute model
@@ -2325,6 +2406,25 @@ applied to the stored value. Restoration outcomes also expose an `INSTANT` or
 field and describes the configured value as the total delivered across that
 duration; switching back to instant clears the duration.
 
+Selecting `DERIVE A SCALAR VALUE` exposes a `DERIVED VALUE SOURCE`
+`SegmentedChoice`. `STATIC` shows the numeric value input. `EVENT FIELD` shows
+the numeric fields registered for the branch event, including the proximity
+snapshot's allied-Agent count; it never asks the author to type a field path.
+Keep an existing expression that falls outside these manual patterns visible as
+disabled `ADVANCED` data. The source and field controls retain `SegmentedChoice`
+radio semantics, visible legends, arrow-key operation, focus-visible treatment,
+and text labels.
+
+Target-scoped direct-damage outcomes offer `HIT-TARGET EXPLOSION` in the Area
+Targeting control. Selecting it creates an event-target-centered enemy area with
+a five-meter starting radius, reveals the required radius field, and shows a
+text readout for the center, valid-target policy, inclusive boundary, and
+runtime evidence requirement. Only `ON EVENT` and `AFTER EVENT` remain available
+for this mode; selecting it from another phase moves the outcome to
+`AFTER EVENT`. Changing the outcome kind or target scope clears an incompatible
+area definition. Keep `ENEMIES IN RADIUS · LEGACY` visible for saved descriptive
+radius metadata, but do not present that mode as calculated explosion fan-out.
+
 Action Family recipes are optional authoring starters. Present the recipe
 catalog as a searchable assignment with only the parameters required by the
 selected family. `ADD RECIPE BRANCH` copies typed branches into the current
@@ -2332,13 +2432,15 @@ source program, where authors may edit its exposed branch, state, and outcome
 controls. The recipe label records provenance only. `REPLACE PROGRAM` requires
 an inline confirmation that states all existing branches will be discarded.
 
-Builder Controls define source-specific scenario assumptions for the planned
-player simulation. ISAC authors choose toggle, slider, or numeric input and
-provide a label, Agent guidance, default value, best-case value, and numeric
-bounds when applicable. The current player UI does not render these controls or
-read their saved values. It uses an explicit `COMING SOON` panel for the future
-advanced scenario surface. The authored contract still requires the runtime to
-report `REQUIRES ASSUMPTIONS` when a required cadence or environmental value is
+Builder Controls define source-specific scenario assumptions for player
+simulation. ISAC authors choose toggle, slider, or numeric input and provide a
+label, Agent guidance, default value, best-case value, and numeric bounds when
+applicable. The calculation timeline builder can consume values supplied for
+these controls, including `allies-within-30m-with-agent-granted-buff`. Current
+Builder and shared Build pages do not render the controls or let players change
+those values. They use an explicit `COMING SOON` panel for the future advanced
+scenario surface. The authored contract still requires the runtime to report
+`REQUIRES ASSUMPTIONS` when a required cadence or environmental value is
 missing; the editor and runtime never invent a cadence.
 
 Use `--shd-model-surface` and `--shd-model-border` for mechanic programs,
@@ -2389,7 +2491,10 @@ The panel presents five explicit states:
   polite live region, and disables repeat actions.
 - `CLARIFICATION REQUIRED` lists each focused question with its reason and
   bounded answer control. The author may answer, revise the source text, or
-  return to manual authoring.
+  return to manual authoring. For an unresolved numbered numeric placeholder,
+  show a required clarification for every source value column whose number is
+  missing. Do not prefill, infer, or suggest a percentage. Keep
+  `APPLY TO EDITOR` unavailable until the author answers each required variant.
 - `CAPABILITY GAP` names the unsupported behavior and displays the developer
   handoff, supported approximation, and optional workaround in separate labeled
   blocks. Do not present a capability gap as validation failure.
@@ -2413,6 +2518,13 @@ applying the draft would replace configured branches, pools, controls, or
 outcomes. The standard ISAC save lifecycle begins only after the author reviews
 and saves the resulting form.
 
+An applied AI draft stores each clarified number in the corresponding
+human-facing outcome-variant value. A scaling expression may retain the
+draft-only `variant_value` reference so later saves preserve the link to that
+displayed value. The runtime adapter resolves the reference separately for each
+variant. Show the value and generated formula in the ordinary review controls;
+do not require an author to inspect or edit raw JSON.
+
 Use text labels with status colors. Orange marks Generate, Answer, and Apply
 actions. Blue identifies modeled information, yellow marks assumptions or
 unsupported coverage, and red marks request or validation failures. Never use
@@ -2511,10 +2623,11 @@ conditional Talent outcomes, weapon and Skill DPS, encounter assumptions,
 activation profiles, rotations, and simulation behind explicit `COMING SOON`
 panels.
 
-Loadout schema version 4 retains `maximum`, `custom`, conditional state,
-encounter-assumption, and per-ability activation fields for compatibility. The
-current player UI ignores those fields. When player simulation ships, one
-required two-option `SegmentedChoice` will use these visible labels:
+Loadout schema version 6 retains `maximum`, `custom`, conditional state,
+encounter-assumption, and per-ability activation fields. Version 4 is obsolete
+prototype data rather than a compatibility format. The current player UI ignores
+the simulation fields. When player simulation ships, one required two-option
+`SegmentedChoice` will use these visible labels:
 
 - `MAXIMUM POTENTIAL` calculates a configured ceiling. It applies conditional
   effects at peak state and treats selected abilities as firing on cooldown
@@ -2565,8 +2678,17 @@ The builder presents Specialization and Focus as the first loadout decision. The
 Focus sets the primary Attribute, progression tree, and three ordered abilities.
 Its identity combines Specialization artwork and the primary Attribute mark.
 Each ability panel contains three fixed Skill Chip positions. A chip picker
-shows definitions assigned to that ability and excludes definitions assigned
-elsewhere.
+shows the ability's three definitions. When ISAC explicitly pairs that ability
+with one compatible ability, the picker also shows the partner's three
+definitions and labels shared entries. The relationship is bidirectional and
+does not apply to other abilities in the same specialization. Players still
+equip three chips in each ability panel. Skill Chips have no item-level control.
+The editor uses the shared quality profiles for direct rolls. It labels the four
+ability-scoped primary values `NOT YET DEFINED` and excludes them from current
+Agent and combat totals. Shared-chip primary values and 3-piece Talent outcomes
+target the ability represented by the panel. Secondary capacity is Standard
+zero, Specialized one, Superior two, and High-end two; each equipped chip uses
+distinct selections from the shared pool.
 
 The focus tree groups nodes by row and uses segmented rank controls. Disabled
 ranks remain visible with their lock state. The builder permits a row after the
@@ -2581,11 +2703,11 @@ enabled ability. Future Skill result cards will show activation count,
 single-target DPS, total-target DPS, and a combined summary. They will state
 that Skills can critically hit and multi-shot but cannot headshot.
 
-Saved loadouts store focus, node ranks, nine Skill Chips, conditional modes,
+Version 5 loadouts store focus, node ranks, nine Skill Chips, conditional modes,
 encounter assumptions, and per-ability activation profiles. The builder accepts
-only the current complete structure for compatibility. Current player pages
-ignore the simulation fields. Invalid local drafts are discarded; invalid server
-records are removed through a backed-up database migration.
+only the current complete structure. Current player pages ignore the simulation
+fields. The builder discards version 4 local drafts; a backed-up database
+migration removes version 4 server records.
 
 ### Calculation revision controls
 
@@ -2650,3 +2772,13 @@ asset and states that the change is permanent. For assigned icons, the
 confirmation names the owning entity type. ISAC clears that source icon
 assignment before it removes the shared file. General library uploads retain the
 `ICON` or `IMAGE` state.
+
+In the Weapon Mod registry, operators manage shared artwork for all eight
+code-defined slots. The compact panel labels each slot `ICON REGISTERED` or
+`ICON REQUIRED`. Selecting a slot opens the standard icon upload control. Keep
+the slot name visible in ISAC after an operator uploads artwork.
+
+On public weapon cards, a configured slot chip shows only its uploaded icon.
+Keep the slot name in screen-reader and hover text. Retain the visible `T1+`
+marker and blue information treatment for slots unlocked at Tier 1. When artwork
+is missing, show the slot name instead of an invented glyph.

docs/TALENT_MECHANIC_RULES.md

@@ -26,8 +26,8 @@ Use these event boundaries:
 - **Healing:** Count each healing event. A heal-over-time effect counts each
   tick as a separate event.
 - **Extra Health gained:** Count every Extra Health grant, including a grant
-  received while the Agent already has Extra Health. Use
-  `extra_health_granted` for the grant action.
+  received while the Agent already has Extra Health. Use `extra_health_granted`
+  for the grant action.
 - **Extra Health state changed:** `extra_health_changed` is Agent-scoped. Emit
   it when the Agent receives a grant, when the remaining amount changes, and
   when it is depleted to zero. Every event requires the boolean
@@ -35,8 +35,8 @@ Use these event boundaries:
   `values.currentExtraHealth`, which must agree with that status. This state
   event is distinct from the `extra_health_granted` grant action.
 - **Reloading:** Trigger on reload completion when the weapon had at least one
-  round to load. A canceled reload does not count. A weapon that loads one
-  round at a time produces one completed-reload event for each round.
+  round to load. A canceled reload does not count. A weapon that loads one round
+  at a time produces one completed-reload event for each round.
 - **Taking damage:** Require Health loss. A hit absorbed by Extra Health does
   not count as taking damage.
 
@@ -59,8 +59,8 @@ Inspiration and Crossfire use a binary deployed-Skill state:
 
 - The benefit remains active while the Agent has at least one persistent
   deployed Skill object.
-- Destruction or timed expiration removes that object from the active count.
-  The benefit ends when no qualifying objects remain.
+- Destruction or timed expiration removes that object from the active count. The
+  benefit ends when no qualifying objects remain.
 - Instant-use Skills do not qualify.
 - Multiple deployed Skill objects do not multiply the benefit.
 
@@ -75,10 +75,28 @@ meters:
 
 - Moving within 30 meters of an ally who is already downed qualifies.
 - Each qualifying presence refreshes the ten-second duration.
-- Leaving the radius or reviving the ally does not cancel the current
-  ten-second duration.
+- Leaving the radius or reviving the ally does not cancel the current ten-second
+  duration.
 - The wearer does not count as an ally.
 
+## Close and Personal
+
+Close and Personal uses a proximity-snapshot qualifying set:
+
+- Include each distinct allied Agent whose distance from the source Agent is
+  less than or equal to 30 meters and who has at least one buff granted by that
+  source Agent.
+- Count an ally once when several of the source Agent's buffs qualify.
+- Do not include an ally whose qualifying buffs come only from other sources.
+
+Record the resolved non-negative integer count in
+`proximity_snapshot.values.alliesWithin30MetersWithAgentGrantedBuff`. The
+calculation builder supplies it from the
+`allies-within-30m-with-agent-granted-buff` scenario input. The confirmed rule
+defines this qualifying set but does not provide Close and Personal's base
+percentage. Keep that percentage unresolved until source evidence or an author's
+clarification supplies it.
+
 ## Emergency Retreat
 
 Emergency Retreat activates whenever at least one enemy is within 20 meters and
@@ -93,9 +111,9 @@ qualifies when the weapon had at least one round to load. This includes each
 round inserted by a weapon that reloads one round at a time. A canceled reload
 does not qualify.
 
-Resolve the Extra Health amount from the Agent's displayed Firepower when
-Second Wind activates. Include all equipped-item and active-buff contributions
-in that Firepower value:
+Resolve the Extra Health amount from the Agent's displayed Firepower when Second
+Wind activates. Include all equipped-item and active-buff contributions in that
+Firepower value:
 
 - Tier I grants Extra Health equal to 600% of displayed Firepower.
 - Tier II grants Extra Health equal to 840% of displayed Firepower.
@@ -103,19 +121,39 @@ in that Firepower value:
 Second Wind adds its Extra Health to Extra Health from other sources. Its
 five-second duration and five-second cooldown start when it activates. Expiry
 removes only the Second Wind contribution. At the five-second boundary, the
-prior grant can expire as a qualifying reload completion grants a new amount.
-If Second Wind supplies the Agent's only Extra Health, the old amount expires
-and the new amount begins at that boundary.
+prior grant can expire as a qualifying reload completion grants a new amount. If
+Second Wind supplies the Agent's only Extra Health, the old amount expires and
+the new amount begins at that boundary.
 
 ## Nothing to Lose
 
 Nothing to Lose uses a forward-looking deployment window:
 
-- Each Health-damage instance makes its own 50% activation roll. Damage
-  absorbed by Extra Health does not roll.
+- Each Health-damage instance makes its own 50% activation roll. Damage absorbed
+  by Extra Health does not roll.
 - A successful activation applies to every Skill deployed during the five
-  seconds after that damage instance. Several Skills can qualify during the
-  same window.
+  seconds after that damage instance. Several Skills can qualify during the same
+  window.
 - Calculate each reduction from the Skill's total cooldown after equipment
   modifiers.
 - A Skill can receive no more than three reductions during one cooldown cycle.
+
+## OS Protocol Talents
+
+Happy Survival restores Health once per second while it has a qualifying nearby
+enemy count. Each restoration resolves 0.5% of maximum Health per enemy within
+10 meters, capped at 2.5% before OS Protocol upgrade scaling.
+
+Explosive Charge requires three seconds of uninterrupted firing. Completion
+opens an eight-second window to deploy the next Skill. The window ends when the
+Agent deploys that Skill. Only the enhanced Skill's first damaging hit creates
+the five-meter explosion. The shared Talent cooldown rule starts its five-second
+cooldown when that explosion activates.
+
+Heavy Armor and Pummeling Shield replace and refresh their own active Extra
+Health grant when the same Talent activates again. Extra Health grants from
+different sources remain separate.
+
+Pummeling Shield counts confirmed weapon hits while the Agent possesses Extra
+Health. Losing all Extra Health resets the hit count. The full-Health condition
+checks Health immediately before the incoming hit resolves.

docs/agents/domain.md

@@ -0,0 +1,60 @@
+# Domain docs
+
+Engineering skills must consult this repository's domain documentation before
+exploring code.
+
+## Read before exploring
+
+- Read `CONTEXT.md` at the repository root.
+- If `CONTEXT-MAP.md` exists, use it to find the `CONTEXT.md` files relevant to
+  the task.
+- Read ADRs under `docs/adr/` that affect the area you will change. In a
+  multi-context repository, also check `src/<context>/docs/adr/`.
+
+If these files do not exist, proceed without comment. Do not suggest creating
+them before the project resolves domain terms or architectural decisions. The
+`/domain-modeling` skill, reached through `/grill-with-docs` and
+`/improve-codebase-architecture`, creates them when needed.
+
+## File structure
+
+This repository uses the single-context layout:
+
+```text
+/
+├── CONTEXT.md
+├── docs/adr/
+│   ├── 0001-event-sourced-orders.md
+│   └── 0002-postgres-for-write-model.md
+└── src/
+```
+
+A repository with multiple bounded contexts can use this layout:
+
+```text
+/
+├── CONTEXT-MAP.md
+├── docs/adr/
+└── src/
+    ├── ordering/
+    │   ├── CONTEXT.md
+    │   └── docs/adr/
+    └── billing/
+        ├── CONTEXT.md
+        └── docs/adr/
+```
+
+## Use glossary terms
+
+Use the terms defined in `CONTEXT.md` in issue titles, refactor proposals,
+hypotheses, and test names. Do not substitute synonyms that the glossary
+rejects.
+
+If a needed concept is absent, reconsider whether the project uses that concept.
+If it represents a real gap, record it for `/domain-modeling`.
+
+## Flag ADR conflicts
+
+Call out any proposal that conflicts with an ADR:
+
+> _Contradicts ADR-0007 (event-sourced orders), but worth reopening because…_

docs/agents/issue-tracker.md

@@ -0,0 +1,106 @@
+# Issue tracker: Gitea
+
+Issues and specs for this repo live as Gitea issues. Use the
+[`tea`](https://gitea.com/gitea/tea) CLI for all operations.
+
+## Repository context
+
+Run commands inside the clone so `tea` can infer the repository and login from
+its Git remote. If the clone has multiple Gitea remotes or logins, pass
+`--remote <name>` or `--login <name>`. Use `--repo <owner>/<repo>` only outside
+the clone.
+
+Before the first operation, verify the instance with
+`tea logins list --output json`. If it is missing, ask the user to run
+`tea login add`; never ask for or handle their access token.
+
+## Conventions
+
+- **Create an issue**: `tea issues create --title "..." --description "..."`.
+  For a multi-line body, use shell command substitution around a quoted heredoc:
+
+  ```bash
+  tea issues create --title "..." --description "$(cat <<'EOF'
+  Multi-line issue body.
+  EOF
+  )"
+  ```
+
+- **Read an issue with comments**:
+  `tea issues <number> --comments --fields index,state,author,url,title,body,assignees,labels,comments --output json`.
+- **List issues**:
+  `tea issues list --state open --fields index,state,author,url,title,body,assignees,labels,comments --output json`,
+  adding `--labels "label-one,label-two"`, `--assignee <user>`, or another
+  supported filter as needed. Paginate with `--page` and `--limit`; do not
+  assume the default first 30 results are complete.
+- **Comment on an issue**: `tea comments add <number> --description "..."`.
+- **Apply or remove labels**: `tea issues edit <number> --add-labels "..."` or
+  `--remove-labels "..."`. Separate multiple labels with commas.
+- **Assign or unassign**: `tea issues edit <number> --add-assignees "..."` or
+  `--remove-assignees "..."`.
+- **Close**: post the closing explanation with
+  `tea comments add <number> --description "..."`, then run
+  `tea issues close <number>`.
+- **Reopen**: `tea issues reopen <number>`.
+- **Raw API fallback**: use `tea api '<endpoint>'` only for a Gitea feature
+  without a first-class `tea` command. Prefer `{owner}` and `{repo}`
+  placeholders so repository context remains explicit.
+
+Use `--output json` for machine-readable reads. Do not scrape table output.
+
+## Pull requests as a triage surface
+
+**PRs as a request surface: no.** _(Set this to `yes` if this repo treats
+external pull requests as feature requests; `/triage` reads this flag.)_
+
+When set to `yes`, PRs use the same labels and states as issues:
+
+- **Read a PR with comments and diff**:
+  `tea pulls <number> --comments --fields index,state,author,url,title,body,diff,assignees,labels,comments --output json`.
+- **List open PRs**:
+  `tea pulls list --state open --fields index,state,author,author-id,url,title,body,assignees,labels,comments --output json`.
+  Determine whether an author is external from the repository's Gitea membership
+  data; the PR listing does not classify author membership.
+- **Comment**: `tea comments add <number> --description "..."`.
+- **Apply or remove labels**: `tea pulls edit <number> --add-labels "..."` or
+  `--remove-labels "..."`.
+- **Close**: `tea pulls close <number>`.
+
+Gitea pull requests use the repository's issue index space, so `#42` may refer
+to either surface. If the context is unclear, inspect it with
+`tea pulls 42 --output json`; if that command reports no PR, read it with
+`tea issues 42 --output json`.
+
+## When a skill says "publish to the issue tracker"
+
+Create a Gitea issue with `tea issues create`.
+
+## When a skill says "fetch the relevant ticket"
+
+Run
+`tea issues <number> --comments --fields index,state,author,url,title,body,assignees,labels,comments --output json`.
+
+## Wayfinding operations
+
+`/wayfinder` uses one **map** issue with linked **child** issues. These
+conventions store relationships in issue bodies, so they work across Gitea
+versions.
+
+- **Map**: create one issue labelled `wayfinder:map` containing the Notes,
+  Decisions-so-far, and Fog sections. Use
+  `tea issues create --labels "wayfinder:map"` with its title and description.
+- **Child ticket**: start the body with `Part of #<map>` and apply a
+  `wayfinder:<type>` label: `research`, `prototype`, `grilling`, or `task`. Add
+  each child as a task-list item in the map body to preserve frontier order.
+- **Blocking**: put `Blocked by: #<n>, #<n>` near the top of the child body. A
+  ticket becomes unblocked after every referenced blocker closes.
+- **Frontier query**: list all open children, order them by the map's task list,
+  and discard tickets with an open blocker or an assignee. Select the first
+  remaining ticket. Fetch each referenced blocker; do not infer its state from
+  map text.
+- **Claim**: resolve the active username with `tea whoami`, then run
+  `tea issues edit <n> --add-assignees "<username>"` as the session's first
+  write. Do not assume `@me` works.
+- **Resolve**: run `tea comments add <n> --description "<answer>"`, close the
+  child with `tea issues close <n>`, then append a context pointer and link to
+  the map's Decisions-so-far section.

docs/agents/triage-labels.md

@@ -0,0 +1,14 @@
+# Triage labels
+
+Engineering skills use five canonical triage roles. This table maps each role to
+the label string in this repository's issue tracker.
+
+| Canonical role    | Tracker label     | Meaning                                |
+| ----------------- | ----------------- | -------------------------------------- |
+| `needs-triage`    | `needs-triage`    | A maintainer must evaluate the issue   |
+| `needs-info`      | `needs-info`      | Waiting for more information           |
+| `ready-for-agent` | `ready-for-agent` | Fully specified and ready for an agent |
+| `ready-for-human` | `ready-for-human` | Requires human implementation          |
+| `wontfix`         | `wontfix`         | Maintainers will not act on the issue  |
+
+When a skill names a canonical role, use the corresponding tracker label.

docs/architecture.md

@@ -431,11 +431,13 @@ reference.
 
 # OS Protocol progression
 
-OS Protocols use dedicated normalized tables because their talent progression
-has six calculated states (base plus five upgrades) rather than the shared
-two-tier talent model. Each protocol owns one `os_protocol_primary_effects`
-record and one `os_protocol_talents` record. Each protocol Talent owns its
-mechanic program through the shared conditional-effect tables.
+OS Protocols use dedicated normalized tables because an assigned Talent has six
+calculated states: its base value plus five upgrades. Each protocol owns one
+`os_protocol_primary_effects` record and may own one `os_protocol_talents`
+record. The optional Talent owns its mechanic program through the shared
+conditional-effect tables. ISAC keeps the Talent workspace collapsed until an
+operator assigns or opens it, and removing an existing Talent requires explicit
+confirmation.
 
 Dedicated profile tables normalize the three secondary attributes. One
 `os_protocol_secondary_profiles` record exists for each configured quality +
@@ -460,6 +462,15 @@ compatible base weapon categories through `weapon_mod_compatible_categories`;
 eligibility requires both a category match and the slot to exist on the equipped
 weapon at its selected tier.
 
+The eight code-defined slot types have stable UUIDs and one shared icon each.
+Operators manage the artwork in the Weapon Mod registry through the game-data
+icon pipeline. Each upload or removal appends a
+`game_data/weapon_mod_slot_icon.updated` audit event, and contributors may send
+the same action to Data Oversight. Public weapon cards use icon-only slot chips
+when artwork exists, with the slot name available to screen readers and on
+hover. Cards show the name when artwork is missing and retain the visible `T1+`
+marker for slots unlocked at Tier 1.
+
 Exotic Weapon Mods instead reference one `exotic_weapon_id`. They do not carry
 regular category compatibility. The builder treats them as permanent equipment
 and lets the user change only their level. They do not use quality profiles,
@@ -469,16 +480,21 @@ values in `weapon_mod_exotic_attributes`; intermediate values use linear
 interpolation.
 
 All regular Weapon Mods permit Firepower, Toughness, or Engineering as a
-builder-time primary choice. `weapon_mod_quality_values` stores the shared
-level-1 and level-20 primary roll endpoints for each quality; primary values use
-linear interpolation from levels 1–20.
+builder-time primary choice. `weapon_mod_quality_values` stores each
+definition's level-1 and level-20 primary roll endpoints for each quality;
+primary values use linear interpolation from levels 1–20.
 
-`weapon_mod_secondary_options` is the shared pool from which a build selects two
-distinct secondary attributes. Every option owns a minimum and maximum at each
-quality through `weapon_mod_secondary_quality_values`; secondary availability is
-not tied to a numbered slot in canonical data. Mod Effects are triggerless, hold
-one or two attribute references, and store fixed per-quality values in
-`weapon_mod_effect_quality_values`.
+`weapon_mod_secondary_options` stores one global secondary Attribute pool for
+all regular Weapon Mods. Each Attribute has Level 1 and Level 20 minimum and
+maximum ranges for Specialized, Superior, and High-end quality through
+`weapon_mod_secondary_quality_values`; values at intermediate levels use linear
+interpolation. Secondary capacity is fixed by quality: Standard has zero,
+Specialized has one, Superior has two, and High-end has two. A build selects
+distinct Attributes from the pool up to that capacity. Individual Weapon Mod
+records do not own secondary options or ranges. Pool updates append a
+`game_data/weapon_mod_secondary_pool.updated` audit event. Mod Effects remain
+triggerless, hold one or two Attribute references, and store fixed per-quality
+values in `weapon_mod_effect_quality_values`.
 
 ### Gear Mods and tier slot capacity
 
@@ -488,42 +504,86 @@ Specialized, Superior, and High-end quality at Levels 1 and 20. Values between
 those endpoints use linear interpolation. A build instance selects one primary
 attribute from Firepower, Toughness, Engineering, Health, or Armor.
 
-The two secondary slots draw distinct attributes from one shared option pool.
-Each available secondary attribute stores its own minimum and maximum for all
-four qualities. Gear tier determines capacity without per-item configuration: T0
-gear has one Gear Mod slot; T1 and T2 gear have two.
+One global Gear Mod secondary Attribute pool serves every Gear Mod definition.
+Each Attribute has Level 1 and Level 20 minimum and maximum ranges for
+Specialized, Superior, and High-end quality through
+`gear_mod_secondary_quality_values`; values at intermediate levels use linear
+interpolation. Secondary capacity is fixed by quality: Standard has zero,
+Specialized has one, Superior has two, and High-end has two. A build selects
+distinct Attributes from the pool up to that capacity. Individual Gear Mod
+records do not own secondary options or ranges. Gear tier still determines mod
+slot capacity without per-item configuration: T0 gear has one Gear Mod slot; T1
+and T2 gear have two.
 
-The `gear_mods`, `gear_mod_quality_values`, `gear_mod_secondary_options`, and
-`gear_mod_secondary_quality_values` tables store canonical data. Successful
-mutations use `gear_mod.created`, `gear_mod.updated`, `gear_mod.archived`, and
-`gear_mod.unarchived` audit actions. Contributor submissions use the `gearmods`
-proposal module and remain non-canonical until approved by Oversight.
+The `gear_mods` and `gear_mod_quality_values` tables store individual definition
+data. `gear_mod_secondary_options` and `gear_mod_secondary_quality_values` store
+the family-wide pool. Pool updates append a
+`game_data/gear_mod_secondary_pool.updated` audit event. Individual definition
+mutations retain the `gear_mod.created`, `gear_mod.updated`,
+`gear_mod.archived`, and `gear_mod.unarchived` audit actions. Contributor
+submissions use the `gearmods` proposal module and remain non-canonical until
+approved by Oversight.
 
 # Skill Chip quality scaling
 
-Skill Chip sets support Superior and High-end chip instances. Each set owns one
-2-piece bonus, distinct primary and secondary stat-option pools, and one 3-piece
-Talent with a typed conditional rule. Primary and secondary options reference
-active Attributes that define Skill Chip minimum and maximum roll values. A
-configured chip rolls one primary and two distinct secondary stats from those
-pools.
+Each Skill Chip definition belongs to one specialization ability. Each set owns
+one 2-piece bonus and may own one 3-piece Talent with a typed conditional rule.
+ISAC keeps the complete Talent workspace, including its description and mechanic
+program, inside one collapsible optional section.
 
-Each active Skill Chip definition belongs to one active specialization ability
-through `skill_chip_sets.specialization_ability_id`. An ability has capacity for
-three active definitions. The save and restore actions enforce that capacity,
-and the schema requires the foreign key for each row. A specialization focus is
+All definitions use one fixed primary profile. The profile contains Skill
+Duration, Skill Radius, Skill Cooldown Recovery, and Skill Intensity, with
+direct minimum and maximum values for Standard, Specialized, Superior, and
+High-end. Primary values apply to the assigned ability rather than the Agent.
+Builder and shared Build pages label them `NOT YET DEFINED` and exclude them
+from current Agent and combat totals.
+
+All definitions also use one shared secondary Attribute pool. Each pool entry
+stores direct minimum and maximum values for Specialized, Superior, and
+High-end. Standard chips have no secondary slot, Specialized chips have one, and
+Superior and High-end chips have two. A configured chip selects distinct
+secondary Attributes up to its quality's capacity. Skill Chips have no item
+level, so neither profile uses level interpolation.
+
+Active definitions reference an active specialization ability through
+`skill_chip_sets.specialization_ability_id`. An ability has capacity for three
+active definitions. The save and restore actions enforce that capacity, and the
+schema requires the foreign key for each row. A specialization focus is
 builder-ready only when each of its three assigned abilities has all three
 active Skill Chip definitions. Skill Chip mutations refresh readiness for
 focuses that reference both the previous and resulting ability.
 
-Both set-bonus progression systems use the number of equipped High-end chips as
-the interpolation step. For `h` High-end chips, where `h` is zero through three,
-a configured minimum and maximum resolve as
-`minimum + (maximum − minimum) × h / 3`. Zero High-end chips therefore produce
-the minimum, while three produce the maximum. The editor stores endpoints and
-previews all four states, preventing duplicated tier data from diverging. The
-`game_data` audit stream captures Skill Chip mutations, owned relationships, and
-safe icon metadata.
+`specialization_ability_skill_chip_links` may pair two active abilities from the
+same specialization. Operators create each pair explicitly; the application does
+not infer compatibility from ability names, focus membership, or shared
+specialization. The pair is bidirectional, and an ability may belong to only one
+pair. This permits compatible abilities such as two Tactical Link variants to
+share definitions without making unrelated pairs such as two Smart Cover
+variants compatible. Archiving either ability removes the pair; restoring an
+ability does not recreate it.
+
+A linked ability can equip its own three definitions or its partner's three
+definitions, so each of its three Builder positions offers at most six choices.
+The loadout still equips three Skill Chips per ability and nine per focus.
+Ability-scoped primary values and 3-piece Talent outcomes bind to the ability
+that owns the equipped position, not the definition's original owner. Two-piece
+and 3-piece thresholds remain local to one equipped ability and never combine
+matching definitions across ability panels. ISAC audit snapshots and game-data
+transfers include the compatibility pair.
+
+Every equipped quality counts toward the two-piece threshold. After the loadout
+meets that threshold, only equipped High-end chips increase the interpolation
+step. For `h` High-end chips, where `h` is zero through three, a configured
+minimum and maximum resolve as `minimum + (maximum − minimum) × h / 3`. Zero
+High-end chips resolve to the minimum, while three resolve to the maximum. The
+editor stores endpoints and previews all four states.
+
+ISAC presents the fixed primary profile and secondary pool as two shared
+registry/editor cards above the definition registry. Successful profile saves
+append `game_data/skill_chip_primary_profile.updated` and
+`game_data/skill_chip_secondary_pool.updated`, respectively. Definition
+mutations continue to capture their owned bonus, optional Talent, ability
+relationship, and safe icon metadata in the `game_data` audit stream.
 
 # Mechanic programs and loadout state
 
@@ -542,6 +602,9 @@ state, with sprinting taking precedence. Enabled Skill activation profiles emit
 the deployed ability. An `on_event` Skill modifier applies to that activation
 until the ability's next deployment or the encounter ends.
 
+`skill_deployed.values.abilityId` and `skill_hit.values.abilityId` identify the
+same ability for mechanics that bind an effect to the next deployed Skill.
+
 Each source supplies a fixed value-variant contract:
 
 - Standard Talents require Tier I and Tier II values. Exotic Talents require
@@ -575,9 +638,37 @@ normalized events are `shot_fired`, `weapon_hit`, `skill_deployed`,
 `weapon_swapped`, and `tick`. Event details such as target, distance, critical
 state, source, movement, and nearby counts travel as typed event values. The
 event registry publishes authoritative field metadata where branches need a
-bounded contract. For those events, the mechanic editor derives its event-field
-controls from that metadata. For example, `weapon_hit.values.headshot` is a
-boolean that distinguishes headshots from body shots.
+bounded contract. For those events, the mechanic editor derives event-field
+conditions and manual derived-scalar controls from that metadata.
+`proximity_snapshot.values.alliesWithin30MetersWithAgentGrantedBuff` is an
+optional non-negative integer. It contains the resolved count of distinct allied
+Agents at a distance less than or equal to 30 meters who have at least one buff
+granted by the source Agent. Several qualifying buffs on one ally count once.
+`proximity_snapshot` remains non-strict, so saved mechanic data and producers
+that omit the field remain compatible.
+
+`src/lib/builder/loadout-combat.ts` bridges the calculation scenario input
+`allies-within-30m-with-agent-granted-buff` into that field on each generated
+`proximity_snapshot`. For example, a derived-scalar reducer can select the
+registered numeric field without requiring a hand-entered path. Other registered
+metadata includes `weapon_hit.values.headshot`, a boolean that distinguishes
+headshots from body shots. `enemy_killed` and `assist` may carry
+`values.assignedAbilityActive`; a Skill Chip Talent uses that boolean to
+restrict a kill or assist trigger to its assigned ability's active period.
+`skill_deployed` and `signature_ability_deployed` may carry
+`values.assignedAbilityDurationSeconds` to start assigned-ability state. The
+runtime expires that state before it evaluates another event at the same
+timestamp.
+
+`weapon_hit.values.aiming` records whether the Agent was aiming down sights when
+the hit resolved. A producer omits the field when it lacks authoritative aiming
+state; the runtime does not replace missing evidence with a scenario assumption.
+Predicates compare this field explicitly with `true` or `false`; negation and
+inequality cannot turn missing evidence into a match. A `weapon_hit` or
+`skill_hit` event may include an event-target-centered area sample. The bounded
+sample lists up to 256 valid ally and enemy entity IDs with their distances from
+the hit target and includes that target as an enemy at zero meters. Duplicate
+IDs, negative distances, or a missing center target invalidate the evaluation.
 
 `extra_health_changed` is Agent-scoped. Normalized timeline producers emit it
 when the Agent receives an Extra Health grant, when the remaining amount
@@ -612,7 +703,10 @@ The program graph uses three child tables:
   durations, intervals, or derived values. Mutations can set, add, consume,
   clear, derive, or transfer state. A mutation may bind a target-scoped pool to
   the current event target, event actor, or another typed entity selector. Each
-  target owns an independent value and expiry timer.
+  target owns an independent value and expiry timer. A clause may require active
+  assigned-ability state and carry `procChancePercent`. The runtime evaluates
+  that chance after predicates and cooldown checks, before reducers, mutations,
+  and outcomes.
 - `conditional_effect_outcomes` applies Attribute modifiers, direct damage,
   restoration, resource costs, or markers. Each outcome names its target scope,
   value basis, optional resource or Attribute, combat timing, optional state
@@ -621,15 +715,46 @@ The program graph uses three child tables:
   required by the owning source. The common value models are static values, live
   Attribute values, percentage-normalized Attribute values, event-field values,
   reducer output, source-defined scenario values, and OS Protocol upgrade
-  scaling. Restoration outcomes may deliver their total immediately or
+  scaling. An outcome may carry `probabilityPercent`; each eligible outcome
+  rolls separately. Restoration outcomes may deliver their total immediately or
   continuously over an explicit duration.
 
+Draft outcome expressions may use `{"ref":{"source":"variant_value"}}`. This
+reference belongs to the conditional draft grammar and does not enter the
+runtime expression grammar. Each persisted outcome-variant row keeps its
+human-facing numeric `value`, while `value_expression_json` preserves the
+reference and its semantic link. The adapters in
+`src/lib/calculations/mechanic-editor.ts` and
+`src/lib/calculations/mechanic-persistence.ts` resolve the reference from the
+current row's `value` when they construct a runtime program.
+
+Target-scoped direct damage may use `event_target_area` targeting for an
+explosion around its event target. This targeting selects valid enemies and
+stores a positive radius in meters. It is valid only for `on_event` or
+`after_event` outcomes. The legacy `within_radius` shape remains descriptive
+targeting metadata and does not select runtime entities.
+
 The generic runtime in `src/lib/calculations/mechanic.ts` processes combat
 events in timestamp order. Predicates decide whether an event enters a clause.
 Reducers convert event streams into activations or derived values. The runtime
 applies state mutations, enforces pool bounds and expiry, emits outcomes in
 phase order, and records telemetry for each activation.
 
+When `event_target_area` damage activates, the runtime requires the triggering
+event's authoritative area sample. It includes valid enemies whose distance is
+less than or equal to the configured radius, sorts them by entity ID, and emits
+one equal damage outcome for each entity. The outcome chance resolves once
+before fan-out. A missing sample invalidates the evaluation instead of producing
+single-target damage or treating the area as empty.
+
+Custom evaluation uses a Mulberry32 stream seeded by `randomSeed`; an omitted
+seed resolves from the stable mechanic program ID. The returned evaluation
+reports the seed. Maximum mode resolves every nonzero clause or outcome chance
+as successful. `extend_duration` changes only an active assigned ability's
+remaining duration. `start_cooldown_on_max` writes an expiring Agent cooldown
+pool only when an earlier mutation in the same clause transitions a capped stack
+pool to its maximum.
+
 Each write to an expiring pool refreshes its timer. When a pool expires,
 `on_exit` outcomes evaluate stack thresholds and per-stack expressions against
 the final value before reset. The runtime records the bound target on emitted
@@ -647,11 +772,13 @@ substitute zero.
 The read-only `combat.currentHealthPercent` reference divides resolved current
 Health by resolved maximum Health and returns a value from 0 through 100. The
 runtime derives it when a predicate is evaluated instead of storing a second
-Health value that could become stale. Current timing observes deterministic
-resource changes from earlier branches at the same event. Health-band mechanics
-use strict upper bounds and inclusive lower bounds, so bands do not overlap and
-an exact threshold enters the next weaker band. Maximum-potential evaluation
-applies the same predicates before emitting passive outcomes.
+Health value that could become stale. Pre-event timing reads the combat snapshot
+before mechanic branches process the event. Current timing observes
+deterministic resource changes from earlier branches at the same event.
+Health-band mechanics use strict upper bounds and inclusive lower bounds, so
+bands do not overlap and an exact threshold enters the next weaker band.
+Maximum-potential evaluation applies the same predicates before emitting passive
+outcomes.
 
 Continuous restoration resolves the outcome's total when the branch activates,
 then delivers that total at a constant rate over the configured duration.
@@ -694,6 +821,13 @@ descriptions, and calculation metadata. The client cannot replace the system
 instructions, choose arbitrary models, attach files, add tools, or add external
 URLs.
 
+When source wording contains an unresolved numbered numeric placeholder, the
+assistant must return `clarification_required` and ask for the value of every
+required source variant. It must not infer a percentage or other numeric value.
+After clarification, the draft places each answer in the corresponding
+outcome-variant `value`; any scaling expression uses the draft-only
+`variant_value` reference instead of repeating that number.
+
 The deterministic draft parser owns the canonical outcome-capability manifest.
 The AI context serializes that manifest instead of maintaining a second outcome
 grammar. The parser rejects outcome fields absent from the manifest. Contract
@@ -790,20 +924,23 @@ events remain the evidence for revision saves and activation.
 Source authors define planned player scenario controls as typed toggle, slider,
 or numeric inputs. Each input records its label, guidance, bounds when
 applicable, default value, and best-case value. ISAC retains these definitions
-for continued mechanic authoring. Current Builder and shared Build pages do not
-render or evaluate them. Their calculation panels display `COMING SOON` instead.
+for continued mechanic authoring, and the calculation timeline builder can
+consume scenario values supplied by calculation orchestration. Current Builder
+and shared Build pages do not expose those controls or invoke the simulation.
+Their calculation panels display `COMING SOON` instead.
 
-Loadout schema version 4 stores one focus, selected tree ranks, nine Skill
-Chips, a unified conditional-effect state map, encounter assumptions,
-per-ability activation controls, and `calculationMode`. Runtime readers accept
-the exact version 4 structure. The schema retains its simulation fields for
-compatibility, but the current player UI ignores them. A backed-up prototype
-migration removes drafts, saved builds, and calibration snapshots that use
-incompatible payloads.
+Loadout schema version 6 stores one focus, selected tree ranks, nine Skill
+Chips, independent T1/T2 choices for each equipped gear and weapon Talent, a
+unified conditional-effect state map, encounter assumptions, per-ability
+activation controls, and `calculationMode`. Runtime readers accept the exact
+version 6 structure. A backed-up migration translated version 5 equipment
+Talents from their previous equipment-tier-derived behavior. The schema retains
+its simulation fields, but the current player UI ignores them. Version 4 remains
+obsolete prototype data.
 
 ## Planned player calculation modes
 
-Loadout v4 defines `maximum` and `custom` modes for the planned simulation UI:
+Loadout v6 defines `maximum` and `custom` modes for the planned simulation UI:
 
 - Maximum mode supplies each scenario input's best-case value, selects peak
   conditional-effect state, and runs selected abilities on cooldown against
@@ -925,11 +1062,12 @@ does not scale.
 
 # Game-data icon storage
 
-Talents, brand sets, OS Protocols, and Skill Chips reference uploaded artwork
-through the polymorphic `game_data_icons` metadata table. The shared server
-pipeline accepts transparent SVG, PNG, WebP, and AVIF sources, rejects active
-SVG content and external references, and uses Sharp’s native worker pool to
-rasterize and normalize each accepted icon to a transparent 256 × 256 WebP.
+Talents, brand sets, OS Protocols, Skill Chips, Specializations, and shared
+Weapon Mod slots reference uploaded artwork through the polymorphic
+`game_data_icons` metadata table. The shared server pipeline accepts transparent
+SVG, PNG, WebP, and AVIF sources, rejects active SVG content and external
+references, and uses Sharp’s native worker pool to rasterize and normalize each
+accepted icon to a transparent 256 × 256 WebP.
 
 Normalized files live beneath the ignored `data/game-icons/` directory. The
 validated `/icons/game-data/[type]/[id]` endpoint serves them with immutable

paseo.json

@@ -0,0 +1,5 @@
+{
+  "worktree": {
+    "setup": "npm install"
+  }
+}

scripts/db-migrate.mjs

@@ -45,7 +45,8 @@ const isRoll = (value) =>
   isFiniteNumber(value.value);
 const isRollPair = (value) =>
   Array.isArray(value) && value.length === 2 && value.every(isRoll);
-const isGearSelection = (value) =>
+const isTalentTier = (value) => value === 1 || value === 2;
+const isLegacyGearSelection = (value) =>
   hasExactKeys(value, [
     'itemId',
     'level',
@@ -68,7 +69,7 @@ const isGearSelection = (value) =>
   isRollPair(value.rolls) &&
   Array.isArray(value.augmentSlots) &&
   value.augmentSlots.every(isFiniteNumber);
-const isWeaponSelection = (value) =>
+const isLegacyWeaponSelection = (value) =>
   hasExactKeys(value, [
     'itemId',
     'level',
@@ -88,12 +89,68 @@ const isWeaponSelection = (value) =>
     (key) => isFiniteNumber(value[key]),
   ) &&
   isRollPair(value.rolls);
+const isGearSelection = (value) =>
+  hasExactKeys(value, [
+    'itemId',
+    'level',
+    'brandId',
+    'talentId',
+    'talentTier',
+    'health',
+    'armor',
+    'firepower',
+    'toughness',
+    'engineering',
+    'rolls',
+    'augmentSlots',
+  ]) &&
+  ['itemId', 'brandId', 'talentId'].every(
+    (key) => typeof value[key] === 'string',
+  ) &&
+  isTalentTier(value.talentTier) &&
+  ['level', 'health', 'armor', 'firepower', 'toughness', 'engineering'].every(
+    (key) => isFiniteNumber(value[key]),
+  ) &&
+  isRollPair(value.rolls) &&
+  Array.isArray(value.augmentSlots) &&
+  value.augmentSlots.every(isFiniteNumber);
+const isWeaponSelection = (value) =>
+  hasExactKeys(value, [
+    'itemId',
+    'level',
+    'tier',
+    'damage',
+    'firepower',
+    'toughness',
+    'engineering',
+    'talent1Id',
+    'talent1Tier',
+    'talent2Id',
+    'talent2Tier',
+    'exoticTalentTier',
+    'rolls',
+  ]) &&
+  ['itemId', 'talent1Id', 'talent2Id'].every(
+    (key) => typeof value[key] === 'string',
+  ) &&
+  isTalentTier(value.talent1Tier) &&
+  isTalentTier(value.talent2Tier) &&
+  isTalentTier(value.exoticTalentTier) &&
+  ['level', 'tier', 'damage', 'firepower', 'toughness', 'engineering'].every(
+    (key) => isFiniteNumber(value[key]),
+  ) &&
+  isRollPair(value.rolls);
 const isChipSelection = (value) =>
   hasExactKeys(value, ['setId', 'quality', 'primary', 'secondary']) &&
   typeof value.setId === 'string' &&
-  (value.quality === 'Superior' || value.quality === 'High-end') &&
+  ['Standard', 'Specialized', 'Superior', 'High-end'].includes(value.quality) &&
   isRoll(value.primary) &&
-  isRollPair(value.secondary);
+  Array.isArray(value.secondary) &&
+  value.secondary.length ===
+    ({ Standard: 0, Specialized: 1, Superior: 2, 'High-end': 2 }[
+      value.quality
+    ] ?? -1) &&
+  value.secondary.every(isRoll);
 const isProtocolSelection = (value) =>
   hasExactKeys(value, ['itemId', 'level', 'talentUpgrades']) &&
   typeof value.itemId === 'string' &&
@@ -185,7 +242,7 @@ const isCurrentLoadoutSnapshot = (raw) => {
       'skillActivations',
       'specialization',
     ]) &&
-    value.version === 4 &&
+    value.version === 6 &&
     typeof value.buildName === 'string' &&
     ['maximum', 'custom'].includes(value.calculationMode) &&
     hasExactKeys(value.gear, gearSlots) &&
@@ -207,6 +264,49 @@ const isCurrentLoadoutSnapshot = (raw) => {
   );
 };
 
+const isLegacyLoadoutSnapshot = (raw) => {
+  let value;
+  try {
+    value = typeof raw === 'string' ? JSON.parse(raw) : raw;
+  } catch {
+    return false;
+  }
+  return (
+    hasExactKeys(value, [
+      'version',
+      'buildName',
+      'gear',
+      'weapons',
+      'chips',
+      'protocol',
+      'conditionalEffects',
+      'combatProfile',
+      'calculationMode',
+      'skillActivations',
+      'specialization',
+    ]) &&
+    value.version === 5 &&
+    typeof value.buildName === 'string' &&
+    ['maximum', 'custom'].includes(value.calculationMode) &&
+    hasExactKeys(value.gear, gearSlots) &&
+    gearSlots.every((slot) => isLegacyGearSelection(value.gear[slot])) &&
+    Array.isArray(value.weapons) &&
+    value.weapons.length === 2 &&
+    value.weapons.every(isLegacyWeaponSelection) &&
+    Array.isArray(value.chips) &&
+    value.chips.length === 9 &&
+    value.chips.every(isChipSelection) &&
+    isProtocolSelection(value.protocol) &&
+    isEffectStates(value.conditionalEffects) &&
+    isCombatProfile(value.combatProfile) &&
+    isSkillActivations(value.skillActivations) &&
+    hasExactKeys(value.specialization, ['focusId', 'nodeRanks']) &&
+    typeof value.specialization.focusId === 'string' &&
+    isRecord(value.specialization.nodeRanks) &&
+    Object.values(value.specialization.nodeRanks).every(isFiniteNumber)
+  );
+};
+
 const databasePath = resolve(
   process.env.TDR_DATABASE_PATH || './data/shd-build.db',
 );
@@ -669,6 +769,44 @@ for (const statement of statements) {
   await database.exec(statement);
 }
 
+await database.exec(`CREATE TRIGGER IF NOT EXISTS specialization_ability_skill_chip_links_validate_insert
+	BEFORE INSERT ON specialization_ability_skill_chip_links
+	BEGIN
+		SELECT CASE WHEN EXISTS (
+			SELECT 1 FROM specialization_ability_skill_chip_links link
+			WHERE link.ability_id IN (NEW.ability_id,NEW.compatible_ability_id)
+				OR link.compatible_ability_id IN (NEW.ability_id,NEW.compatible_ability_id)
+		) THEN RAISE(ABORT,'Each ability can share one Skill Chip pool') END;
+		SELECT CASE WHEN NOT EXISTS (
+			SELECT 1 FROM specialization_abilities ability
+			JOIN specialization_abilities compatible
+				ON compatible.id=NEW.compatible_ability_id
+			WHERE ability.id=NEW.ability_id
+				AND ability.active=1
+				AND compatible.active=1
+				AND ability.specialization_id=compatible.specialization_id
+		) THEN RAISE(ABORT,'Skill Chip sharing requires active abilities from one specialization') END;
+	END`);
+await database.exec(`CREATE TRIGGER IF NOT EXISTS specialization_ability_skill_chip_links_validate_update
+	BEFORE UPDATE ON specialization_ability_skill_chip_links
+	BEGIN
+		SELECT CASE WHEN EXISTS (
+			SELECT 1 FROM specialization_ability_skill_chip_links link
+			WHERE link.rowid<>OLD.rowid
+				AND (link.ability_id IN (NEW.ability_id,NEW.compatible_ability_id)
+					OR link.compatible_ability_id IN (NEW.ability_id,NEW.compatible_ability_id))
+		) THEN RAISE(ABORT,'Each ability can share one Skill Chip pool') END;
+		SELECT CASE WHEN NOT EXISTS (
+			SELECT 1 FROM specialization_abilities ability
+			JOIN specialization_abilities compatible
+				ON compatible.id=NEW.compatible_ability_id
+			WHERE ability.id=NEW.ability_id
+				AND ability.active=1
+				AND compatible.active=1
+				AND ability.specialization_id=compatible.specialization_id
+		) THEN RAISE(ABORT,'Skill Chip sharing requires active abilities from one specialization') END;
+	END`);
+
 const articleRevisionColumns = await (
   await database.prepare("PRAGMA table_info('article_revisions')")
 ).all();
@@ -2392,6 +2530,32 @@ if (
   );
 }
 
+const weaponModSlotIconDefinition = await (
+  await database.prepare(
+    "SELECT sql FROM sqlite_master WHERE type='table' AND name='game_data_icons'",
+  )
+).get();
+if (
+  typeof weaponModSlotIconDefinition?.sql === 'string' &&
+  !weaponModSlotIconDefinition.sql.includes("'weapon_mod_slot'")
+) {
+  console.log('Adding shared Weapon Mod slot icon storage support.');
+  await database.exec(`CREATE TABLE game_data_icons_weapon_mod_slots (
+		entity_type TEXT NOT NULL CHECK(entity_type IN ('talent', 'brand_set', 'os_protocol', 'skill_chip', 'specialization', 'specialization_ability', 'specialization_node', 'weapon_mod_slot')),
+		entity_id TEXT NOT NULL,
+		storage_key TEXT NOT NULL UNIQUE,
+		byte_size INTEGER NOT NULL CHECK(byte_size > 0),
+		updated_at TEXT NOT NULL,
+		PRIMARY KEY(entity_type, entity_id)
+	)`);
+  await database.exec(`INSERT INTO game_data_icons_weapon_mod_slots
+		SELECT entity_type,entity_id,storage_key,byte_size,updated_at FROM game_data_icons`);
+  await database.exec('DROP TABLE game_data_icons');
+  await database.exec(
+    'ALTER TABLE game_data_icons_weapon_mod_slots RENAME TO game_data_icons',
+  );
+}
+
 const managedImageColumns = await (
   await database.prepare("PRAGMA table_info('managed_images')")
 ).all();
@@ -2433,6 +2597,7 @@ const iconLibraryCategory = {
   specialization: 'Specializations',
   specialization_ability: 'Specializations',
   specialization_node: 'Specializations',
+  weapon_mod_slot: 'Weapon Mods',
 };
 const iconLibraryLabel = {
   talent: 'Talent',
@@ -2442,6 +2607,17 @@ const iconLibraryLabel = {
   specialization: 'Specialization',
   specialization_ability: 'Specialization Ability',
   specialization_node: 'Specialization Tree Node',
+  weapon_mod_slot: 'Weapon Mod Slot',
+};
+const weaponModSlotNames = {
+  '28ffc3b1-5d98-4273-a9af-67dbff3e5c76': 'Optics',
+  'c4598f51-2cb0-4a20-a3a7-6d8983a26598': 'Muzzle',
+  '85ca3493-1871-4d22-950a-ed718fd547e0': 'Underbarrel',
+  '4d809a35-8285-4bff-be98-a0effe1d257e': 'Magazine',
+  '0e157cfe-975c-441d-8f49-72983161e7b1': 'Barrel',
+  '551fd7c8-3e5b-4c89-8437-9b901e89e8aa': 'Upper Receiver',
+  '72573367-6e91-4312-9cc3-710ede4f078e': 'Lower Receiver',
+  '8dda5edb-6079-4a23-a556-cd9be4521c70': 'Trigger',
 };
 const normalizeLibraryTags = (values) =>
   [
@@ -2532,6 +2708,13 @@ const linkedIconMetadata = async (entityType, entityId) => {
         ],
       };
     }
+    case 'weapon_mod_slot': {
+      const name = weaponModSlotNames[entityId];
+      return {
+        name: name ? `${name} Slot` : null,
+        tags: ['weapon mod', 'slot', name],
+      };
+    }
     default:
       return { name: null, tags: [] };
   }
@@ -2912,6 +3095,302 @@ if (
   await database.exec('PRAGMA foreign_keys=ON');
 }
 
+for (const kind of ['weapon', 'gear']) {
+  const optionTable = `${kind}_mod_secondary_options`;
+  const valueTable = `${kind}_mod_secondary_quality_values`;
+  const optionColumns = await (
+    await database.prepare(`PRAGMA table_info('${optionTable}')`)
+  ).all();
+  if (!optionColumns.some((column) => column.name === `${kind}_mod_id`))
+    continue;
+
+  const conflictingRanges = await (
+    await database.prepare(`SELECT stat_attribute_id,quality,
+      COUNT(DISTINCT CAST(min_value AS TEXT)||'/'||CAST(max_value AS TEXT)) AS variants
+      FROM ${valueTable}
+      WHERE quality IN ('Specialized','Superior','High-end')
+      GROUP BY stat_attribute_id,quality HAVING variants>1`)
+  ).all();
+  if (conflictingRanges.length) {
+    throw new Error(
+      `Cannot create the shared ${kind} Mod secondary pool because existing per-Mod ranges disagree. Reconcile ${conflictingRanges.map((row) => `${row.stat_attribute_id}/${row.quality}`).join(', ')} first.`,
+    );
+  }
+
+  const incompleteOptions = await (
+    await database.prepare(`SELECT options.stat_attribute_id,
+      COUNT(DISTINCT CASE WHEN values_row.quality IN ('Specialized','Superior','High-end') THEN values_row.quality END) AS qualities
+      FROM ${optionTable} options
+      LEFT JOIN ${valueTable} values_row ON values_row.${kind}_mod_id=options.${kind}_mod_id
+        AND values_row.stat_attribute_id=options.stat_attribute_id
+      GROUP BY options.${kind}_mod_id,options.stat_attribute_id HAVING qualities<>3`)
+  ).all();
+  if (incompleteOptions.length) {
+    throw new Error(
+      `Cannot create the shared ${kind} Mod secondary pool because ${incompleteOptions.map((row) => row.stat_attribute_id).join(', ')} does not have all applicable quality ranges.`,
+    );
+  }
+
+  console.log(
+    `Converting ${kind} Mod secondary Attributes to one shared level-scaled pool.`,
+  );
+  await database.exec('PRAGMA foreign_keys=OFF');
+  await database.exec('BEGIN');
+  try {
+    await database.exec(`CREATE TABLE ${optionTable}_shared (
+      stat_attribute_id TEXT PRIMARY KEY REFERENCES stat_attributes(id)
+    )`);
+    await database.exec(`CREATE TABLE ${valueTable}_shared (
+      stat_attribute_id TEXT NOT NULL,
+      quality TEXT NOT NULL CHECK(quality IN ('Specialized','Superior','High-end')),
+      level_1_min REAL NOT NULL,
+      level_1_max REAL NOT NULL,
+      level_20_min REAL NOT NULL,
+      level_20_max REAL NOT NULL,
+      PRIMARY KEY(stat_attribute_id,quality),
+      FOREIGN KEY(stat_attribute_id) REFERENCES ${optionTable}_shared(stat_attribute_id) ON DELETE CASCADE,
+      CHECK(level_1_max>=level_1_min),
+      CHECK(level_20_max>=level_20_min),
+      CHECK(level_20_min>=level_1_min),
+      CHECK(level_20_max>=level_1_max)
+    )`);
+    await database.exec(`INSERT INTO ${optionTable}_shared(stat_attribute_id)
+      SELECT DISTINCT stat_attribute_id FROM ${optionTable}`);
+    await database.exec(`INSERT INTO ${valueTable}_shared(
+      stat_attribute_id,quality,level_1_min,level_1_max,level_20_min,level_20_max
+    ) SELECT stat_attribute_id,quality,MIN(min_value),MAX(max_value),MIN(min_value),MAX(max_value)
+      FROM ${valueTable}
+      WHERE quality IN ('Specialized','Superior','High-end')
+      GROUP BY stat_attribute_id,quality`);
+    await database.exec(`DROP TABLE ${valueTable}`);
+    await database.exec(`DROP TABLE ${optionTable}`);
+    await database.exec(
+      `ALTER TABLE ${optionTable}_shared RENAME TO ${optionTable}`,
+    );
+    await database.exec(
+      `ALTER TABLE ${valueTable}_shared RENAME TO ${valueTable}`,
+    );
+    await database.exec('COMMIT');
+  } catch (error) {
+    await database.exec('ROLLBACK');
+    throw error;
+  } finally {
+    await database.exec('PRAGMA foreign_keys=ON');
+  }
+}
+
+const skillChipPrimaryOptionColumns = await (
+  await database.prepare("PRAGMA table_info('skill_chip_primary_options')")
+).all();
+if (
+  skillChipPrimaryOptionColumns.some(
+    (column) => column.name === 'skill_chip_set_id',
+  )
+) {
+  const fixedSkillChipAttributes = await (
+    await database.prepare(`SELECT COUNT(*) AS total,
+      SUM(CASE WHEN active=1 THEN 1 ELSE 0 END) AS active
+      FROM stat_attributes
+      WHERE name IN ('Skill Duration','Skill Radius','Skill Cooldown Recovery','Skill Intensity')`)
+  ).get();
+  if (
+    Number(fixedSkillChipAttributes?.total) !== 4 ||
+    Number(fixedSkillChipAttributes?.active) !== 4
+  )
+    throw new Error(
+      'Skill Chip profile migration requires exactly four active fixed primary Attributes.',
+    );
+  console.log(
+    'Converting Skill Chip primary and secondary options to shared quality profiles.',
+  );
+  await database.exec('PRAGMA foreign_keys=OFF');
+  await database.exec('BEGIN');
+  try {
+    await database.exec(
+      'DROP TABLE IF EXISTS skill_chip_primary_quality_values',
+    );
+    await database.exec(
+      'DROP TABLE IF EXISTS skill_chip_secondary_quality_values',
+    );
+    await database.exec(`CREATE TABLE skill_chip_primary_options_shared (
+      stat_attribute_id TEXT PRIMARY KEY REFERENCES stat_attributes(id)
+    )`);
+    await database.exec(`CREATE TABLE skill_chip_primary_quality_values_shared (
+      stat_attribute_id TEXT NOT NULL,
+      quality TEXT NOT NULL CHECK(quality IN ('Standard','Specialized','Superior','High-end')),
+      min_value REAL NOT NULL,
+      max_value REAL NOT NULL,
+      PRIMARY KEY(stat_attribute_id,quality),
+      FOREIGN KEY(stat_attribute_id) REFERENCES skill_chip_primary_options_shared(stat_attribute_id) ON DELETE CASCADE,
+      CHECK(max_value>=min_value),
+      CHECK(min_value>=0)
+    )`);
+    await database.exec(`CREATE TABLE skill_chip_secondary_options_shared (
+      stat_attribute_id TEXT PRIMARY KEY REFERENCES stat_attributes(id)
+    )`);
+    await database.exec(`CREATE TABLE skill_chip_secondary_quality_values_shared (
+      stat_attribute_id TEXT NOT NULL,
+      quality TEXT NOT NULL CHECK(quality IN ('Specialized','Superior','High-end')),
+      min_value REAL NOT NULL,
+      max_value REAL NOT NULL,
+      PRIMARY KEY(stat_attribute_id,quality),
+      FOREIGN KEY(stat_attribute_id) REFERENCES skill_chip_secondary_options_shared(stat_attribute_id) ON DELETE CASCADE,
+      CHECK(max_value>=min_value),
+      CHECK(min_value>=0)
+    )`);
+    await database.exec(`INSERT INTO skill_chip_primary_options_shared(stat_attribute_id)
+      SELECT id FROM stat_attributes
+      WHERE name IN ('Skill Duration','Skill Radius','Skill Cooldown Recovery','Skill Intensity')
+        AND active=1`);
+    await database.exec(`INSERT INTO skill_chip_primary_quality_values_shared(
+      stat_attribute_id,quality,min_value,max_value
+    ) SELECT attributes.id,qualities.quality,attributes.skill_chip_min,attributes.skill_chip_max
+      FROM stat_attributes attributes
+      CROSS JOIN (
+        SELECT 'Standard' quality UNION ALL SELECT 'Specialized'
+        UNION ALL SELECT 'Superior' UNION ALL SELECT 'High-end'
+      ) qualities
+      WHERE attributes.name IN ('Skill Duration','Skill Radius','Skill Cooldown Recovery','Skill Intensity')
+        AND attributes.active=1
+        AND attributes.skill_chip_min IS NOT NULL
+        AND attributes.skill_chip_max IS NOT NULL`);
+    await database.exec(`INSERT INTO skill_chip_secondary_options_shared(stat_attribute_id)
+      SELECT DISTINCT stat_attribute_id FROM skill_chip_secondary_options`);
+    await database.exec(`INSERT INTO skill_chip_secondary_quality_values_shared(
+      stat_attribute_id,quality,min_value,max_value
+    ) SELECT options.stat_attribute_id,qualities.quality,attributes.skill_chip_min,attributes.skill_chip_max
+      FROM (SELECT DISTINCT stat_attribute_id FROM skill_chip_secondary_options) options
+      JOIN stat_attributes attributes ON attributes.id=options.stat_attribute_id
+      CROSS JOIN (
+        SELECT 'Specialized' quality UNION ALL SELECT 'Superior' UNION ALL SELECT 'High-end'
+      ) qualities
+      WHERE attributes.skill_chip_min IS NOT NULL
+        AND attributes.skill_chip_max IS NOT NULL`);
+    await database.exec('DROP TABLE skill_chip_primary_options');
+    await database.exec('DROP TABLE skill_chip_secondary_options');
+    await database.exec(
+      'ALTER TABLE skill_chip_primary_options_shared RENAME TO skill_chip_primary_options',
+    );
+    await database.exec(
+      'ALTER TABLE skill_chip_primary_quality_values_shared RENAME TO skill_chip_primary_quality_values',
+    );
+    await database.exec(
+      'ALTER TABLE skill_chip_secondary_options_shared RENAME TO skill_chip_secondary_options',
+    );
+    await database.exec(
+      'ALTER TABLE skill_chip_secondary_quality_values_shared RENAME TO skill_chip_secondary_quality_values',
+    );
+    await database.exec('COMMIT');
+  } catch (error) {
+    await database.exec('ROLLBACK');
+    throw error;
+  } finally {
+    await database.exec('PRAGMA foreign_keys=ON');
+  }
+}
+await database.exec(`INSERT OR IGNORE INTO skill_chip_primary_options(stat_attribute_id)
+  SELECT id FROM stat_attributes
+  WHERE active=1 AND name IN (
+    'Skill Duration','Skill Radius','Skill Cooldown Recovery','Skill Intensity'
+  )`);
+
+const skillChipRangeAttributeColumns = await (
+  await database.prepare("PRAGMA table_info('stat_attributes')")
+).all();
+if (
+  skillChipRangeAttributeColumns.some(
+    (column) => column.name === 'skill_chip_min',
+  )
+) {
+  console.log(
+    'Removing obsolete Attribute-level Skill Chip ranges in favor of shared quality profiles.',
+  );
+  await database.exec('PRAGMA foreign_keys=OFF');
+  await database.exec('BEGIN');
+  try {
+    await database.exec(
+      'DROP INDEX IF EXISTS stat_attributes_name_unit_nocase_idx',
+    );
+    await database.exec(`CREATE TABLE stat_attributes_current (
+      id TEXT PRIMARY KEY,
+      name TEXT NOT NULL,
+      description TEXT,
+      type TEXT NOT NULL CHECK(type IN ('Offensive','Defensive')),
+      category TEXT NOT NULL CHECK(category IN ('Weapon','Skill','Character')),
+      calculation_type TEXT NOT NULL CHECK(calculation_type IN ('Additive','Multiplicative')),
+      unit TEXT NOT NULL DEFAULT '',
+      gear_min REAL,
+      gear_max REAL,
+      gear_reference_level INTEGER NOT NULL DEFAULT 50 CHECK(gear_reference_level BETWEEN 1 AND 50),
+      weapon_min REAL,
+      weapon_max REAL,
+      weapon_reference_level INTEGER NOT NULL DEFAULT 50 CHECK(weapon_reference_level BETWEEN 1 AND 50),
+      cap_value REAL,
+      active INTEGER NOT NULL DEFAULT 1,
+      created_at TEXT NOT NULL,
+      updated_at TEXT NOT NULL,
+      CHECK((gear_min IS NULL AND gear_max IS NULL) OR (gear_min IS NOT NULL AND gear_max IS NOT NULL AND gear_min<=gear_max)),
+      CHECK((weapon_min IS NULL AND weapon_max IS NULL) OR (weapon_min IS NOT NULL AND weapon_max IS NOT NULL AND weapon_min<=weapon_max)),
+      CHECK(cap_value IS NULL OR cap_value>=0)
+    )`);
+    await database.exec(`INSERT INTO stat_attributes_current(
+      id,name,description,type,category,calculation_type,unit,
+      gear_min,gear_max,gear_reference_level,weapon_min,weapon_max,weapon_reference_level,
+      cap_value,active,created_at,updated_at
+    ) SELECT id,name,description,type,category,calculation_type,unit,
+      gear_min,gear_max,gear_reference_level,weapon_min,weapon_max,weapon_reference_level,
+      cap_value,active,created_at,updated_at FROM stat_attributes`);
+    await database.exec('DROP TABLE stat_attributes');
+    await database.exec(
+      'ALTER TABLE stat_attributes_current RENAME TO stat_attributes',
+    );
+    await database.exec(
+      'CREATE UNIQUE INDEX stat_attributes_name_unit_nocase_idx ON stat_attributes(name COLLATE NOCASE,unit)',
+    );
+    await database.exec('COMMIT');
+  } catch (error) {
+    await database.exec('ROLLBACK');
+    throw error;
+  } finally {
+    await database.exec('PRAGMA foreign_keys=ON');
+  }
+}
+
+const [loadoutGearRows, loadoutWeaponRows, loadoutTalentTierRows] =
+  await Promise.all([
+    (await database.prepare('SELECT id,tier FROM gear')).all(),
+    (await database.prepare('SELECT id,exotic_talent_id FROM weapons')).all(),
+    (await database.prepare('SELECT talent_id,tier FROM talent_tiers')).all(),
+  ]);
+const migrateLegacyLoadoutSnapshot = (raw) => {
+  if (!isLegacyLoadoutSnapshot(raw)) return null;
+  const value =
+    typeof raw === 'string' ? JSON.parse(raw) : structuredClone(raw);
+  for (const slot of gearSlots) {
+    const item = loadoutGearRows.find(
+      (entry) => String(entry.id) === String(value.gear[slot].itemId),
+    );
+    value.gear[slot].talentTier = Number(item?.tier) >= 2 ? 2 : 1;
+  }
+  for (const selection of value.weapons) {
+    const inheritedTier = Number(selection.tier) >= 2 ? 2 : 1;
+    selection.talent1Tier = inheritedTier;
+    selection.talent2Tier = inheritedTier;
+    const weapon = loadoutWeaponRows.find(
+      (entry) => String(entry.id) === String(selection.itemId),
+    );
+    const exoticTalentId = String(weapon?.exotic_talent_id ?? '');
+    const hasExoticTierTwo = loadoutTalentTierRows.some(
+      (entry) =>
+        String(entry.talent_id) === exoticTalentId && entry.tier === 'II',
+    );
+    selection.exoticTalentTier =
+      inheritedTier === 2 && hasExoticTierTwo ? 2 : 1;
+  }
+  value.version = 6;
+  return isCurrentLoadoutSnapshot(value) ? JSON.stringify(value) : null;
+};
+
 const buildColumns = await (
   await database.prepare("PRAGMA table_info('builds')")
 ).all();
@@ -2926,9 +3405,34 @@ if (buildColumns.length) {
   await database.exec(
     "UPDATE builds SET visibility='private' WHERE visibility='draft'",
   );
-  const builds = await (
+  let builds = await (
     await database.prepare('SELECT id,loadout_json FROM builds')
   ).all();
+  const migratedBuilds = builds
+    .map((build) => ({
+      id: String(build.id),
+      loadout: migrateLegacyLoadoutSnapshot(build.loadout_json),
+    }))
+    .filter((build) => build.loadout);
+  if (migratedBuilds.length) {
+    console.log(
+      `Migrating ${migratedBuilds.length} build loadout snapshot(s) to version 6 Talent tiers.`,
+    );
+    await database.exec('BEGIN');
+    try {
+      for (const build of migratedBuilds)
+        await (
+          await database.prepare('UPDATE builds SET loadout_json=? WHERE id=?')
+        ).run(build.loadout, build.id);
+      await database.exec('COMMIT');
+    } catch (error) {
+      await database.exec('ROLLBACK');
+      throw error;
+    }
+    builds = await (
+      await database.prepare('SELECT id,loadout_json FROM builds')
+    ).all();
+  }
   const obsoleteBuildIds = builds
     .filter((build) => !isCurrentLoadoutSnapshot(build.loadout_json))
     .map((build) => String(build.id));
@@ -3305,11 +3809,55 @@ if (
   );
 }
 
-const calibrationCases = await (
+const outcomeProbabilityColumns = await (
+  await database.prepare("PRAGMA table_info('conditional_effect_outcomes')")
+).all();
+if (
+  !outcomeProbabilityColumns.some(
+    (column) => column.name === 'probability_percent',
+  )
+) {
+  await database.exec(
+    'ALTER TABLE conditional_effect_outcomes ADD COLUMN probability_percent REAL CHECK(probability_percent IS NULL OR (probability_percent>=0 AND probability_percent<=100))',
+  );
+}
+
+let calibrationCases = await (
   await database.prepare(
     'SELECT id,loadout_snapshot_json FROM calculation_calibration_cases',
   )
 ).all();
+const migratedCalibrationCases = calibrationCases
+  .map((calibrationCase) => ({
+    id: String(calibrationCase.id),
+    loadout: migrateLegacyLoadoutSnapshot(
+      calibrationCase.loadout_snapshot_json,
+    ),
+  }))
+  .filter((calibrationCase) => calibrationCase.loadout);
+if (migratedCalibrationCases.length) {
+  console.log(
+    `Migrating ${migratedCalibrationCases.length} calibration snapshot(s) to version 6 Talent tiers.`,
+  );
+  await database.exec('BEGIN');
+  try {
+    for (const calibrationCase of migratedCalibrationCases)
+      await (
+        await database.prepare(
+          'UPDATE calculation_calibration_cases SET loadout_snapshot_json=? WHERE id=?',
+        )
+      ).run(calibrationCase.loadout, calibrationCase.id);
+    await database.exec('COMMIT');
+  } catch (error) {
+    await database.exec('ROLLBACK');
+    throw error;
+  }
+  calibrationCases = await (
+    await database.prepare(
+      'SELECT id,loadout_snapshot_json FROM calculation_calibration_cases',
+    )
+  ).all();
+}
 const obsoleteCalibrationIds = calibrationCases
   .filter(
     (calibrationCase) =>

scripts/db-restore.mjs

@@ -44,21 +44,91 @@ for (const table of backup.tables) {
 }
 
 let restoredRows = 0;
+const attributeTable = backup.tables.find(
+  (table) => table.name === 'stat_attributes',
+);
+const legacySkillChipProfiles = attributeTable?.rows.some(
+  (row) => 'skill_chip_min' in row || 'skill_chip_max' in row,
+);
+const legacySkillChipRanges = new Map(
+  (attributeTable?.rows ?? []).map((row) => [
+    String(row.id),
+    { min: row.skill_chip_min, max: row.skill_chip_max },
+  ]),
+);
+const restoredLegacySecondaries = new Set();
 await database.exec('BEGIN');
 try {
   for (const table of backup.tables) {
     for (const row of table.rows) {
-      const columns = Object.keys(row);
+      if (
+        legacySkillChipProfiles &&
+        table.name === 'skill_chip_primary_options'
+      )
+        continue;
+      const restoredRow = { ...row };
+      if (legacySkillChipProfiles && table.name === 'stat_attributes') {
+        delete restoredRow.skill_chip_min;
+        delete restoredRow.skill_chip_max;
+      }
+      if (
+        legacySkillChipProfiles &&
+        table.name === 'skill_chip_secondary_options'
+      ) {
+        delete restoredRow.skill_chip_set_id;
+        const statId = String(restoredRow.stat_attribute_id ?? '');
+        if (restoredLegacySecondaries.has(statId)) continue;
+        restoredLegacySecondaries.add(statId);
+      }
+      const columns = Object.keys(restoredRow);
       if (!columns.length) continue;
       const columnSql = columns.map(quoteIdentifier).join(', ');
       const placeholders = columns.map(() => '?').join(', ');
       const insert = await database.prepare(
         `INSERT INTO ${quoteIdentifier(table.name)} (${columnSql}) VALUES (${placeholders})`,
       );
-      await insert.run(...columns.map((column) => row[column]));
+      await insert.run(...columns.map((column) => restoredRow[column]));
       restoredRows++;
     }
   }
+  if (legacySkillChipProfiles) {
+    const primaryAttributes = await (
+      await database.prepare(`SELECT id,active FROM stat_attributes WHERE name IN (
+        'Skill Duration','Skill Radius','Skill Cooldown Recovery','Skill Intensity'
+      )`)
+    ).all();
+    if (
+      primaryAttributes.length !== 4 ||
+      primaryAttributes.some((attribute) => Number(attribute.active) !== 1)
+    )
+      throw new Error(
+        'Legacy restore requires exactly four active fixed Skill Chip primary Attributes.',
+      );
+    for (const attribute of primaryAttributes) {
+      const statId = String(attribute.id);
+      await (
+        await database.prepare(
+          'INSERT INTO skill_chip_primary_options(stat_attribute_id) VALUES(?)',
+        )
+      ).run(statId);
+      const range = legacySkillChipRanges.get(statId);
+      if (!range || range.min === null || range.max === null) continue;
+      for (const quality of ['Standard', 'Specialized', 'Superior', 'High-end'])
+        await (
+          await database.prepare(`INSERT INTO skill_chip_primary_quality_values
+            (stat_attribute_id,quality,min_value,max_value) VALUES(?,?,?,?)`)
+        ).run(statId, quality, range.min, range.max);
+    }
+    for (const statId of restoredLegacySecondaries) {
+      const range = legacySkillChipRanges.get(statId);
+      if (!range || range.min === null || range.max === null) continue;
+      for (const quality of ['Specialized', 'Superior', 'High-end'])
+        await (
+          await database.prepare(`INSERT INTO skill_chip_secondary_quality_values
+            (stat_attribute_id,quality,min_value,max_value) VALUES(?,?,?,?)`)
+        ).run(statId, quality, range.min, range.max);
+    }
+  }
   await database.exec('COMMIT');
 } catch (error) {
   await database.exec('ROLLBACK');

scripts/import-resurgence-attributes.mjs

@@ -98,8 +98,6 @@ try {
         weapon_min: record.weaponRange?.[0] ?? existing?.weapon_min ?? null,
         weapon_max: record.weaponRange?.[1] ?? existing?.weapon_max ?? null,
         weapon_reference_level: Number(existing?.weapon_reference_level ?? 50),
-        skill_chip_min: existing?.skill_chip_min ?? null,
-        skill_chip_max: existing?.skill_chip_max ?? null,
         cap_value: existing?.cap_value ?? null,
         active: 1,
         created_at: String(existing?.created_at ?? now),
@@ -117,7 +115,7 @@ try {
         await (
           await database.prepare(`UPDATE stat_attributes SET
 					name=?,description=?,type=?,category=?,calculation_type=?,unit=?,
-					gear_min=?,gear_max=?,weapon_min=?,weapon_max=?,skill_chip_min=?,skill_chip_max=?,
+					gear_min=?,gear_max=?,weapon_min=?,weapon_max=?,
 					cap_value=?,active=1,updated_at=? WHERE id=?`)
         ).run(
           next.name,
@@ -130,8 +128,6 @@ try {
           next.gear_max,
           next.weapon_min,
           next.weapon_max,
-          next.skill_chip_min,
-          next.skill_chip_max,
           next.cap_value,
           now,
           id,
@@ -142,8 +138,8 @@ try {
           await database.prepare(`INSERT INTO stat_attributes(
 					id,name,description,type,category,calculation_type,unit,
 					gear_min,gear_max,gear_reference_level,weapon_min,weapon_max,weapon_reference_level,
-					skill_chip_min,skill_chip_max,cap_value,active,created_at,updated_at
-				) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,1,?,?)`)
+					cap_value,active,created_at,updated_at
+				) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,1,?,?)`)
         ).run(
           id,
           next.name,
@@ -158,8 +154,6 @@ try {
           next.weapon_min,
           next.weapon_max,
           next.weapon_reference_level,
-          next.skill_chip_min,
-          next.skill_chip_max,
           next.cap_value,
           now,
           now,

scripts/isac-data-export.mjs

@@ -2,7 +2,11 @@ import { connect } from '@tursodatabase/database';
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { basename, dirname, join, resolve } from 'node:path';
 import process from 'node:process';
-import { ISAC_DATA_TABLES, quoteIdentifier } from './isac-data-tables.mjs';
+import {
+  ISAC_DATA_FORMAT_VERSION,
+  ISAC_DATA_TABLES,
+  quoteIdentifier,
+} from './isac-data-tables.mjs';
 
 const databasePath = resolve(
   process.env.TDR_DATABASE_PATH || './data/shd-build-development.db',
@@ -67,7 +71,7 @@ for (const row of [
 
 const snapshot = {
   format: 'shd-build-isac-data',
-  version: 2,
+  version: ISAC_DATA_FORMAT_VERSION,
   createdAt: new Date().toISOString(),
   sourceDatabase: basename(databasePath),
   totalRows,

scripts/isac-data-import.mjs

@@ -3,7 +3,11 @@ import { spawnSync } from 'node:child_process';
 import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { basename, join, resolve } from 'node:path';
 import process from 'node:process';
-import { ISAC_DATA_TABLES, quoteIdentifier } from './isac-data-tables.mjs';
+import {
+  ISAC_DATA_FORMAT_VERSION,
+  ISAC_DATA_TABLES,
+  quoteIdentifier,
+} from './isac-data-tables.mjs';
 
 const snapshotArgument = process.argv
   .slice(2)
@@ -22,7 +26,7 @@ const snapshotPath = resolve(snapshotArgument);
 const snapshot = JSON.parse(await readFile(snapshotPath, 'utf8'));
 if (
   snapshot?.format !== 'shd-build-isac-data' ||
-  snapshot?.version !== 2 ||
+  snapshot?.version !== ISAC_DATA_FORMAT_VERSION ||
   !Array.isArray(snapshot.tables) ||
   !Array.isArray(snapshot.icons)
 ) {
@@ -39,6 +43,233 @@ if (
     'The ISAC snapshot table manifest is incomplete or out of order.',
   );
 }
+const abilityRows = snapshot.tables.find(
+  (table) => table.name === 'specialization_abilities',
+).rows;
+const abilitiesById = new Map(
+  abilityRows.map((row) => [String(row.id ?? ''), row]),
+);
+const skillChipRows = snapshot.tables.find(
+  (table) => table.name === 'skill_chip_sets',
+).rows;
+const activeSkillChipCounts = new Map();
+for (const row of skillChipRows) {
+  const abilityId = String(row.specialization_ability_id ?? '');
+  if (!abilityId || !abilitiesById.has(abilityId)) {
+    throw new Error(
+      `The ISAC snapshot contains a Skill Chip definition with a missing ability reference "${abilityId}".`,
+    );
+  }
+  if (Number(row.active) !== 1) continue;
+  const count = (activeSkillChipCounts.get(abilityId) ?? 0) + 1;
+  if (count > 3) {
+    throw new Error(
+      `The ISAC snapshot assigns more than three active Skill Chip definitions to ability "${abilityId}".`,
+    );
+  }
+  activeSkillChipCounts.set(abilityId, count);
+}
+const skillChipLinks = snapshot.tables.find(
+  (table) => table.name === 'specialization_ability_skill_chip_links',
+).rows;
+const linkedAbilityIds = new Set();
+for (const row of skillChipLinks) {
+  const abilityId = row.ability_id;
+  const compatibleAbilityId = row.compatible_ability_id;
+  if (
+    typeof abilityId !== 'string' ||
+    !abilityId ||
+    typeof compatibleAbilityId !== 'string' ||
+    !compatibleAbilityId
+  ) {
+    throw new Error(
+      'The ISAC snapshot contains a Skill Chip sharing link with malformed ability references.',
+    );
+  }
+  if (abilityId === compatibleAbilityId) {
+    throw new Error(
+      `The ISAC snapshot contains a self-referencing Skill Chip sharing link for ability "${abilityId}".`,
+    );
+  }
+  if (abilityId >= compatibleAbilityId) {
+    throw new Error(
+      `The ISAC snapshot contains a Skill Chip sharing link that is not in canonical ability order: "${abilityId}", "${compatibleAbilityId}".`,
+    );
+  }
+  const ability = abilitiesById.get(abilityId);
+  const compatibleAbility = abilitiesById.get(compatibleAbilityId);
+  if (!ability || !compatibleAbility) {
+    throw new Error(
+      `The ISAC snapshot contains a Skill Chip sharing link with a missing ability reference: "${abilityId}", "${compatibleAbilityId}".`,
+    );
+  }
+  if (Number(ability.active) !== 1 || Number(compatibleAbility.active) !== 1) {
+    throw new Error(
+      `The ISAC snapshot contains a Skill Chip sharing link with an inactive ability: "${abilityId}", "${compatibleAbilityId}".`,
+    );
+  }
+  if (ability.specialization_id !== compatibleAbility.specialization_id) {
+    throw new Error(
+      `The ISAC snapshot contains a cross-specialization Skill Chip sharing link: "${abilityId}", "${compatibleAbilityId}".`,
+    );
+  }
+  if (
+    linkedAbilityIds.has(abilityId) ||
+    linkedAbilityIds.has(compatibleAbilityId)
+  ) {
+    throw new Error(
+      'The ISAC snapshot contains more than one Skill Chip sharing link touching an ability.',
+    );
+  }
+  linkedAbilityIds.add(abilityId);
+  linkedAbilityIds.add(compatibleAbilityId);
+}
+for (const kind of ['weapon', 'gear']) {
+  const options = snapshot.tables.find(
+    (table) => table.name === `${kind}_mod_secondary_options`,
+  ).rows;
+  const values = snapshot.tables.find(
+    (table) => table.name === `${kind}_mod_secondary_quality_values`,
+  ).rows;
+  const optionIds = options.map((row) => String(row.stat_attribute_id ?? ''));
+  if (
+    optionIds.some((id) => !id) ||
+    new Set(optionIds).size !== optionIds.length ||
+    (optionIds.length !== 0 &&
+      (optionIds.length < 2 || optionIds.length > 50)) ||
+    values.length !== optionIds.length * 3
+  ) {
+    throw new Error(
+      `The ISAC snapshot contains an incomplete shared ${kind} Mod secondary pool.`,
+    );
+  }
+  for (const statId of optionIds) {
+    const profile = values.filter(
+      (row) => String(row.stat_attribute_id) === statId,
+    );
+    if (
+      profile.length !== 3 ||
+      ['Specialized', 'Superior', 'High-end'].some(
+        (quality) => !profile.some((row) => row.quality === quality),
+      ) ||
+      profile.some((row) => {
+        const endpoints = [
+          row.level_1_min,
+          row.level_1_max,
+          row.level_20_min,
+          row.level_20_max,
+        ];
+        return (
+          endpoints.some(
+            (value) => typeof value !== 'number' || !Number.isFinite(value),
+          ) ||
+          endpoints[1] < endpoints[0] ||
+          endpoints[2] < endpoints[0] ||
+          endpoints[3] < endpoints[1] ||
+          endpoints[3] < endpoints[2]
+        );
+      })
+    ) {
+      throw new Error(
+        `The ISAC snapshot contains an invalid shared ${kind} Mod secondary profile for ${statId}.`,
+      );
+    }
+  }
+  if (
+    values.some(
+      (row) => !optionIds.includes(String(row.stat_attribute_id ?? '')),
+    )
+  ) {
+    throw new Error(
+      `The ISAC snapshot contains an orphaned shared ${kind} Mod secondary range.`,
+    );
+  }
+}
+for (const [profileName, qualities, requiredOptions] of [
+  ['primary', ['Standard', 'Specialized', 'Superior', 'High-end'], 4],
+  ['secondary', ['Specialized', 'Superior', 'High-end'], null],
+]) {
+  const options = snapshot.tables.find(
+    (table) => table.name === `skill_chip_${profileName}_options`,
+  ).rows;
+  const values = snapshot.tables.find(
+    (table) => table.name === `skill_chip_${profileName}_quality_values`,
+  ).rows;
+  const optionIds = options.map((row) => String(row.stat_attribute_id ?? ''));
+  const validCardinality = requiredOptions
+    ? optionIds.length === requiredOptions
+    : optionIds.length <= 50;
+  if (
+    !validCardinality ||
+    optionIds.some((id) => !id) ||
+    new Set(optionIds).size !== optionIds.length
+  ) {
+    throw new Error(
+      `The ISAC snapshot contains an incomplete shared Skill Chip ${profileName} profile.`,
+    );
+  }
+  if (profileName === 'primary' && optionIds.length) {
+    const attributes = snapshot.tables.find(
+      (table) => table.name === 'stat_attributes',
+    ).rows;
+    const expectedIds = attributes
+      .filter(
+        (row) =>
+          Number(row.active) === 1 &&
+          [
+            'Skill Duration',
+            'Skill Radius',
+            'Skill Cooldown Recovery',
+            'Skill Intensity',
+          ].includes(String(row.name)),
+      )
+      .map((row) => String(row.id))
+      .sort();
+    if (
+      expectedIds.length !== 4 ||
+      optionIds
+        .slice()
+        .sort()
+        .some((id, index) => id !== expectedIds[index])
+    )
+      throw new Error(
+        'The ISAC snapshot does not use the four fixed Skill Chip primary Attributes.',
+      );
+  }
+  for (const statId of optionIds) {
+    const rows = values.filter(
+      (row) => String(row.stat_attribute_id ?? '') === statId,
+    );
+    if (!rows.length) continue;
+    if (
+      rows.length !== qualities.length ||
+      qualities.some(
+        (quality) => !rows.some((row) => row.quality === quality),
+      ) ||
+      rows.some(
+        (row) =>
+          typeof row.min_value !== 'number' ||
+          !Number.isFinite(row.min_value) ||
+          typeof row.max_value !== 'number' ||
+          !Number.isFinite(row.max_value) ||
+          row.min_value < 0 ||
+          row.max_value < row.min_value,
+      )
+    ) {
+      throw new Error(
+        `The ISAC snapshot contains an invalid shared Skill Chip ${profileName} profile for ${statId}.`,
+      );
+    }
+  }
+  if (
+    values.some(
+      (row) => !optionIds.includes(String(row.stat_attribute_id ?? '')),
+    )
+  )
+    throw new Error(
+      `The ISAC snapshot contains an orphaned shared Skill Chip ${profileName} range.`,
+    );
+}
 for (const icon of snapshot.icons) {
   if (
     typeof icon.storageKey !== 'string' ||

scripts/isac-data-tables.mjs

@@ -32,7 +32,9 @@ export const ISAC_DATA_TABLES = [
   'skill_chip_sets',
   'skill_chip_two_piece_bonuses',
   'skill_chip_primary_options',
+  'skill_chip_primary_quality_values',
   'skill_chip_secondary_options',
+  'skill_chip_secondary_quality_values',
   'skill_chip_talents',
   'skill_chip_talent_effects',
   'weapon_mods',
@@ -55,6 +57,7 @@ export const ISAC_DATA_TABLES = [
   'specialization_combat_effects',
   'specialization_focuses',
   'specialization_abilities',
+  'specialization_ability_skill_chip_links',
   'specialization_ability_attacks',
   'specialization_ability_effects',
   'specialization_focus_abilities',
@@ -73,5 +76,7 @@ export const ISAC_DATA_TABLES = [
   'managed_images',
 ];
 
+export const ISAC_DATA_FORMAT_VERSION = 5;
+
 export const quoteIdentifier = (identifier) =>
   `"${String(identifier).replaceAll('"', '""')}"`;

scripts/managed-images-export.mjs

@@ -23,7 +23,7 @@ const images = [];
 for (const row of rows) {
   if (
     typeof row.storage_key !== 'string' ||
-    !/^(?:library|talent|brand_set|os_protocol|skill_chip|specialization|specialization_ability|specialization_node)-[0-9a-f-]{36}\.webp$/i.test(
+    !/^(?:library|talent|brand_set|os_protocol|skill_chip|specialization|specialization_ability|specialization_node|weapon_mod_slot)-[0-9a-f-]{36}\.webp$/i.test(
       row.storage_key,
     )
   ) {

scripts/managed-images-import.mjs

@@ -14,6 +14,19 @@ if (!bundleArgument || !process.argv.includes('--confirm-merge')) {
   process.exit(2);
 }
 const updateExisting = process.argv.includes('--update-existing');
+const gameDataRenderSourceTypes = new Set([
+  'weapon_render',
+  'gear_render',
+  'weapon_mod_render',
+  'gear_mod_render',
+  'talent_render',
+  'brand_set_render',
+  'os_protocol_render',
+  'skill_chip_render',
+  'specialization_render',
+  'specialization_ability_render',
+  'specialization_node_render',
+]);
 const bundlePath = resolve(bundleArgument);
 const bundle = JSON.parse(await readFile(bundlePath, 'utf8'));
 if (
@@ -30,21 +43,21 @@ for (const image of bundle.images) {
     typeof image?.row?.id !== 'string' ||
     !/^[0-9a-f-]{36}$/i.test(image.row.id) ||
     typeof image.row.storage_key !== 'string' ||
-    !/^(?:library|talent|brand_set|os_protocol|skill_chip|specialization|specialization_ability|specialization_node)-[0-9a-f-]{36}\.webp$/i.test(
+    !/^(?:library|talent|brand_set|os_protocol|skill_chip|specialization|specialization_ability|specialization_node|weapon_mod_slot)-[0-9a-f-]{36}\.webp$/i.test(
       image.row.storage_key,
     ) ||
     typeof image.contentBase64 !== 'string'
   ) {
     throw new Error('The bundle contains an invalid managed image.');
   }
-  const isItemRender = ['weapon_render', 'gear_render'].includes(
+  const isGameDataRender = gameDataRenderSourceTypes.has(
     image.row.source_entity_type,
   );
   if (
     image.row.source_entity_type &&
     (typeof image.row.source_entity_id !== 'string' ||
       !/^[0-9a-f-]{36}$/i.test(image.row.source_entity_id) ||
-      (isItemRender
+      (isGameDataRender
         ? !image.row.storage_key.startsWith('library-')
         : !image.row.storage_key.startsWith(
             `${image.row.source_entity_type}-`,

scripts/runtime-launcher.mjs

@@ -14,6 +14,7 @@ const APP_SECRET_NAMES = new Set([
   'OPENAI_MECHANIC_MODEL',
   'OPENAI_MECHANIC_REASONING_EFFORT',
   'OPENAI_MODERATION_API_KEY',
+  'MFA_TOTP_ENCRYPTION_KEYS',
   'ORIGIN',
   'PASSKEY_RP_ID',
   'REMOVE_BG_API_KEY',

src/lib/articles/document.test.ts

@@ -91,6 +91,172 @@ describe('article documents', () => {
     ).toBeNull();
   });
 
+  it('accepts and canonicalizes metadata emitted by the Tiptap editor', () => {
+    const parsed = parseArticleDocument({
+      version: 1,
+      document: {
+        type: 'doc',
+        content: [
+          {
+            type: 'paragraph',
+            content: [
+              {
+                type: 'text',
+                text: 'Read more',
+                marks: [
+                  {
+                    type: 'link',
+                    attrs: {
+                      href: 'https://shd.build/news',
+                      target: '_blank',
+                      rel: 'noopener noreferrer nofollow',
+                      class: null,
+                      title: 'News archive',
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+          {
+            type: 'orderedList',
+            attrs: { start: 1, type: null },
+            content: [
+              {
+                type: 'listItem',
+                content: [
+                  {
+                    type: 'paragraph',
+                    content: [{ type: 'text', text: 'First item' }],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    });
+
+    expect(parsed?.document.document.content).toEqual([
+      {
+        type: 'paragraph',
+        content: [
+          {
+            type: 'text',
+            text: 'Read more',
+            marks: [
+              {
+                type: 'link',
+                attrs: {
+                  href: 'https://shd.build/news',
+                  title: 'News archive',
+                },
+              },
+            ],
+          },
+        ],
+      },
+      {
+        type: 'orderedList',
+        content: [
+          {
+            type: 'listItem',
+            content: [
+              {
+                type: 'paragraph',
+                content: [{ type: 'text', text: 'First item' }],
+              },
+            ],
+          },
+        ],
+      },
+    ]);
+    expect(parsed?.plainText).toContain('News archive');
+  });
+
+  it('preserves supported ordered-list numbering', () => {
+    const parsed = parseArticleDocument({
+      version: 1,
+      document: {
+        type: 'doc',
+        content: [
+          {
+            type: 'orderedList',
+            attrs: { start: 2, type: 'A' },
+            content: [
+              {
+                type: 'listItem',
+                content: [{ type: 'paragraph' }],
+              },
+            ],
+          },
+        ],
+      },
+    });
+
+    expect(parsed?.document.document.content?.[0]).toMatchObject({
+      type: 'orderedList',
+      attrs: { start: 2, type: 'A' },
+    });
+    expect(parseArticleDocument(parsed?.document)?.document).toEqual(
+      parsed?.document,
+    );
+  });
+
+  it('rejects unknown link metadata and non-default ordered lists', () => {
+    const documentWith = (content: unknown[]) => ({
+      version: 1,
+      document: { type: 'doc', content },
+    });
+
+    expect(
+      parseArticleDocument(
+        documentWith([
+          {
+            type: 'paragraph',
+            content: [
+              {
+                type: 'text',
+                text: 'unsafe metadata',
+                marks: [
+                  {
+                    type: 'link',
+                    attrs: {
+                      href: 'https://shd.build',
+                      onclick: 'alert(1)',
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        ]),
+      ),
+    ).toBeNull();
+    expect(
+      parseArticleDocument(
+        documentWith([
+          {
+            type: 'orderedList',
+            attrs: { start: 0, type: 'decimal' },
+            content: [],
+          },
+        ]),
+      ),
+    ).toBeNull();
+    expect(
+      parseArticleDocument(
+        documentWith([
+          {
+            type: 'orderedList',
+            attrs: { start: 1, type: 1 },
+            content: [],
+          },
+        ]),
+      ),
+    ).toBeNull();
+  });
+
   it('rejects duplicate embed keys and unknown envelope fields', () => {
     const embed = {
       type: 'buildEmbed',

src/lib/articles/document.ts

@@ -10,7 +10,7 @@ const EMBED_KEY_PATTERN = /^[a-z0-9][a-z0-9-]{7,63}$/;
 
 export type ArticleMark = {
   type: 'bold' | 'italic' | 'code' | 'link';
-  attrs?: { href: string };
+  attrs?: { href: string; title?: string };
 };
 
 export type ArticleNode = {
@@ -53,7 +53,17 @@ const safeLink = (value: unknown) => {
   }
 };
 
-function parseMarks(value: unknown): ArticleMark[] | null {
+const nullableBoundedString = (value: unknown, maximum: number) =>
+  value === undefined ||
+  value === null ||
+  (typeof value === 'string' &&
+    value.length <= maximum &&
+    !/\p{Cc}/u.test(value));
+
+function parseMarks(
+  value: unknown,
+  onLinkTitle: (title: string) => void,
+): ArticleMark[] | null {
   if (value === undefined) return [];
   if (!Array.isArray(value) || value.length > 4) return null;
   const seen = new Set<string>();
@@ -77,10 +87,31 @@ function parseMarks(value: unknown): ArticleMark[] | null {
       !isRecord(candidate.attrs)
     )
       return null;
-    if (!exactKeys(candidate.attrs, ['href'])) return null;
+    if (
+      !exactKeys(candidate.attrs, [
+        'href',
+        'target',
+        'rel',
+        'class',
+        'title',
+      ]) ||
+      !nullableBoundedString(candidate.attrs.target, 100) ||
+      !nullableBoundedString(candidate.attrs.rel, 500) ||
+      !nullableBoundedString(candidate.attrs.class, 500) ||
+      !nullableBoundedString(candidate.attrs.title, 500)
+    )
+      return null;
     const href = safeLink(candidate.attrs.href);
     if (!href) return null;
-    marks.push({ type: 'link', attrs: { href } });
+    const title =
+      typeof candidate.attrs.title === 'string'
+        ? candidate.attrs.title.normalize('NFKC').trim()
+        : '';
+    if (title) onLinkTitle(title);
+    marks.push({
+      type: 'link',
+      attrs: { href, ...(title ? { title } : {}) },
+    });
   }
   return marks;
 }
@@ -134,7 +165,9 @@ export function parseArticleDocument(value: unknown): {
       if (/\p{Cc}/u.test(text.replace(/[\n\t]/g, ''))) return null;
       textLength += [...text].length;
       if (textLength > MAX_ARTICLE_TEXT_CHARACTERS) return null;
-      const marks = parseMarks(candidate.marks);
+      const marks = parseMarks(candidate.marks, (title) =>
+        textParts.push(title),
+      );
       if (!marks) return null;
       textParts.push(text);
       return marks.length ? { type, text, marks } : { type, text };
@@ -211,6 +244,31 @@ export function parseArticleDocument(value: unknown): {
       )
         return null;
       attrs = { level: Number(candidate.attrs.level) };
+    } else if (type === 'orderedList' && candidate.attrs !== undefined) {
+      if (
+        !isRecord(candidate.attrs) ||
+        !exactKeys(candidate.attrs, ['start', 'type'])
+      )
+        return null;
+      const start = candidate.attrs.start ?? 1;
+      const listType = candidate.attrs.type;
+      if (
+        !Number.isInteger(start) ||
+        Number(start) < 1 ||
+        Number(start) > 1_000_000 ||
+        (listType !== null &&
+          listType !== undefined &&
+          (typeof listType !== 'string' ||
+            !['1', 'a', 'A', 'i', 'I'].includes(listType)))
+      )
+        return null;
+      const canonicalType =
+        typeof listType === 'string' && listType !== '1' ? listType : undefined;
+      attrs = {
+        ...(Number(start) === 1 ? {} : { start: Number(start) }),
+        ...(canonicalType ? { type: canonicalType } : {}),
+      };
+      if (!Object.keys(attrs).length) attrs = undefined;
     } else if (candidate.attrs !== undefined) {
       if (!isRecord(candidate.attrs) || Object.keys(candidate.attrs).length)
         return null;

src/lib/builder/loadout-combat.test.ts

@@ -176,6 +176,38 @@ describe('loadout mechanic timeline', () => {
     ).toBe(true);
   });
 
+  it('emits the Agent-granted-buff ally count from its exact scenario input and defaults it to zero', () => {
+    const profile = createDraft().combatProfile;
+    profile.encounterSeconds = 1;
+    const configured = buildWeaponMechanicTimeline(
+      { rpm: 60, magazine: 100, reload_speed: 0 },
+      profile,
+      0,
+      {
+        scenarioInputs: {
+          'allies-within-30m-with-agent-granted-buff': 4,
+          'allies-within-radius': 2,
+        },
+      },
+    ).filter((event) => event.kind === 'proximity_snapshot');
+    const defaults = buildWeaponMechanicTimeline(
+      { rpm: 60, magazine: 100, reload_speed: 0 },
+      profile,
+    ).filter((event) => event.kind === 'proximity_snapshot');
+
+    expect(
+      configured.map(
+        (event) => event.values?.alliesWithin30MetersWithAgentGrantedBuff,
+      ),
+    ).toEqual([4, 4]);
+    expect(configured.map((event) => event.values?.allyCount)).toEqual([2, 2]);
+    expect(
+      defaults.map(
+        (event) => event.values?.alliesWithin30MetersWithAgentGrantedBuff,
+      ),
+    ).toEqual([0, 0]);
+  });
+
   it('seeds Extra Health state before periodic stack evaluation', () => {
     const profile = createDraft().combatProfile;
     profile.encounterSeconds = 2;
@@ -259,7 +291,7 @@ describe('loadout mechanic timeline', () => {
     ).toEqual([1, 2]);
   });
 
-  it('falls back to a documented Tier I mechanic when equipment Tier II is absent', () => {
+  it('falls back to a documented Tier I mechanic when exotic Tier II is absent', () => {
     const persistedRule = {
       rule: {
         id: 'tier-i-only',
@@ -327,6 +359,7 @@ describe('loadout mechanic timeline', () => {
     const adapted = equippedConditionalProgram({
       key: 'weapon:0:exotic-talent',
       tier: 2,
+      isExotic: true,
       rule: persistedRule,
     });
 

src/lib/builder/loadout-combat.ts

@@ -7,6 +7,8 @@ import {
 } from '$lib/calculations/combat';
 import {
   evaluateMechanicProgram,
+  PROXIMITY_AGENT_GRANTED_BUFF_ALLY_COUNT_VALUE_KEY,
+  PROXIMITY_AGENT_GRANTED_BUFF_ALLY_COUNT_INPUT,
   type MechanicCombatContext,
   type MechanicEvaluation,
   type MechanicEvent,
@@ -283,7 +285,7 @@ export function equippedConditionalProgram(
     : 'base';
   return (
     conditionalProgram(equipped.rule, variant) ??
-    (equipmentTalent && variant === 'II'
+    (equipmentTalent && equipped.isExotic && variant === 'II'
       ? conditionalProgram(equipped.rule, 'I')
       : null)
   );
@@ -803,6 +805,11 @@ export function buildWeaponMechanicTimeline(
         allyCount: Number(
           options.scenarioInputs?.['allies-within-radius'] ?? 0,
         ),
+        [PROXIMITY_AGENT_GRANTED_BUFF_ALLY_COUNT_VALUE_KEY]: Number(
+          options.scenarioInputs?.[
+            PROXIMITY_AGENT_GRANTED_BUFF_ALLY_COUNT_INPUT
+          ] ?? 0,
+        ),
       },
     });
     events.push({

src/lib/builder/loadout-summary.test.ts

@@ -39,6 +39,7 @@ describe('summarizeLoadout', () => {
   it('returns an empty deterministic summary for a partial draft', () => {
     expect(summarizeLoadout(createDraft(), catalog())).toEqual({
       stats: [],
+      abilityStats: [],
       activeBonuses: [],
       equippedTalents: [],
     });
@@ -206,7 +207,7 @@ describe('summarizeLoadout', () => {
     });
     expect(summary.equippedTalents).toEqual([
       expect.objectContaining({
-        key: 'chips:chip-set',
+        key: 'chips:chip-set:ability',
         tier: 1,
         abilityId: 'ability',
         description: 'Gain 25% Skill Damage.',
@@ -214,6 +215,166 @@ describe('summarizeLoadout', () => {
     ]);
   });
 
+  it('keeps Skill Chip primaries ability-scoped while adding secondaries to Agent stats', () => {
+    const draft = createDraft();
+    draft.specialization.focusId = 'focus-1';
+    draft.chips[0] = {
+      setId: 'chip-set',
+      quality: 'Superior',
+      primary: { statId: 'skill-duration', value: 12 },
+      secondary: [
+        { statId: 'agent-stat', value: 4 },
+        { statId: 'other-secondary', value: 6 },
+      ],
+    };
+
+    const summary = summarizeLoadout(
+      draft,
+      catalog({
+        attributes: [
+          attribute('skill-duration', 'Skill Duration', { unit: '%' }),
+          attribute('agent-stat', 'Agent Stat', { unit: '%' }),
+          attribute('other-secondary', 'Other Secondary', { unit: '%' }),
+        ],
+        chipSets: [
+          {
+            id: 'chip-set',
+            name: 'Signal',
+            specialization_ability_id: 'ability-2',
+            compatibleAbilityIds: ['ability-2', 'ability-1'],
+            twoPiece: null,
+            talent: null,
+          },
+        ],
+        specializations: [
+          {
+            id: 'specialization-1',
+            focuses: [
+              {
+                id: 'focus-1',
+                abilities: [{ id: 'ability-1' }],
+                nodes: [],
+              },
+            ],
+          },
+        ],
+      }),
+    );
+
+    expect(stat(summary, 'skill-duration')).toBeUndefined();
+    expect(stat(summary, 'agent-stat')?.value).toBe(4);
+    expect(stat(summary, 'other-secondary')?.value).toBe(6);
+    expect(summary.abilityStats).toEqual([
+      {
+        abilityId: 'ability-1',
+        stats: [
+          {
+            id: 'skill-duration',
+            value: 12,
+            sourceCount: 1,
+            sources: [
+              {
+                source: 'Skill Chip 1 primary',
+                chipIndex: 0,
+                chipSetId: 'chip-set',
+                value: 12,
+              },
+            ],
+          },
+        ],
+      },
+    ]);
+  });
+
+  it('ignores a shared Skill Chip after its ability link is removed', () => {
+    const draft = createDraft();
+    draft.specialization.focusId = 'focus-1';
+    draft.chips[0] = {
+      setId: 'chip-set',
+      quality: 'Standard',
+      primary: { statId: 'skill-duration', value: 12 },
+      secondary: [],
+    };
+
+    const summary = summarizeLoadout(
+      draft,
+      catalog({
+        attributes: [
+          attribute('skill-duration', 'Skill Duration', { unit: '%' }),
+        ],
+        chipSets: [
+          {
+            id: 'chip-set',
+            name: 'Signal',
+            specialization_ability_id: 'ability-2',
+            compatibleAbilityIds: ['ability-2'],
+            twoPiece: null,
+            talent: null,
+          },
+        ],
+        specializations: [
+          {
+            id: 'specialization-1',
+            focuses: [
+              {
+                id: 'focus-1',
+                abilities: [{ id: 'ability-1' }],
+                nodes: [],
+              },
+            ],
+          },
+        ],
+      }),
+    );
+
+    expect(summary.abilityStats).toEqual([]);
+  });
+
+  it.each([
+    [0, 10],
+    [1, 20],
+    [2, 30],
+    [3, 40],
+  ])(
+    'scales a three-chip 2-piece bonus with %i High-end chips',
+    (highEndCount, expectedValue) => {
+      const draft = createDraft();
+      for (let index = 0; index < 3; index += 1) {
+        draft.chips[index].setId = 'chip-set';
+        draft.chips[index].quality =
+          index < highEndCount ? 'High-end' : 'Standard';
+      }
+
+      const summary = summarizeLoadout(
+        draft,
+        catalog({
+          attributes: [
+            attribute('skill-damage', 'Skill Damage', { unit: '%' }),
+          ],
+          chipSets: [
+            {
+              id: 'chip-set',
+              name: 'Signal',
+              specialization_ability_id: 'ability',
+              twoPiece: {
+                stat_attribute_id: 'skill-damage',
+                min_value: 10,
+                max_value: 40,
+              },
+              talent: null,
+            },
+          ],
+        }),
+      );
+
+      expect(stat(summary, 'skill-damage')?.value).toBe(expectedValue);
+      expect(summary.activeBonuses[0]).toMatchObject({
+        count: 3,
+        value: expectedValue,
+      });
+    },
+  );
+
   it('scales Protocol primary stats and Talent descriptions independently', () => {
     const draft = createDraft();
     draft.protocol = { itemId: 'protocol', level: 50, talentUpgrades: 5 };
@@ -322,11 +483,58 @@ describe('summarizeLoadout', () => {
     expect(stat(summary, 'mechanic')).toBeUndefined();
   });
 
-  it('renders the selected Talent tier without applying its mechanic outcomes to stats', () => {
+  it('uses a gear Talent tier independently from the gear tier', () => {
+    const draft = createDraft();
+    draft.gear.Holster.itemId = 'gear';
+    draft.gear.Holster.talentId = 'talent';
+    Object.assign(draft.gear.Holster, { talentTier: 2 });
+
+    const summary = summarizeLoadout(
+      draft,
+      catalog({
+        attributes: [attribute('bonus', 'Bonus', { unit: '%' })],
+        gear: [{ id: 'gear', tier: 0, base_armor_min: null }],
+        talents: [
+          {
+            id: 'talent',
+            name: 'Reinforced',
+            template: 'Gain {1}.',
+            tiers: [
+              {
+                tier: 'I',
+                effects: [{ stat_attribute_id: 'bonus', value: 10 }],
+              },
+              {
+                tier: 'II',
+                effects: [{ stat_attribute_id: 'bonus', value: 20 }],
+              },
+            ],
+          },
+        ],
+      }),
+    );
+
+    expect(summary.equippedTalents).toEqual([
+      expect.objectContaining({
+        id: 'talent',
+        tier: 2,
+        tierLabel: 'TIER II',
+        description: 'Gain 20%.',
+      }),
+    ]);
+  });
+
+  it('uses each weapon Talent tier independently without applying mechanic outcomes to stats', () => {
     const draft = createDraft();
     draft.weapons[0].itemId = 'weapon';
     draft.weapons[0].tier = 2;
-    draft.weapons[0].talent1Id = 'talent';
+    draft.weapons[0].talent1Id = 'talent-one';
+    draft.weapons[0].talent2Id = 'talent-two';
+    Object.assign(draft.weapons[0], {
+      talent1Tier: 1,
+      talent2Tier: 2,
+      exoticTalentTier: 1,
+    });
 
     const rule = {
       clauses: [
@@ -352,13 +560,13 @@ describe('summarizeLoadout', () => {
           {
             id: 'weapon',
             name: 'Test Weapon',
-            exotic_talent_id: null,
+            exotic_talent_id: 'exotic-talent',
             baseBonuses: [],
           },
         ],
         talents: [
           {
-            id: 'talent',
+            id: 'talent-one',
             name: 'Measured',
             template: 'Gain {1} for {2}.',
             tiers: [
@@ -379,17 +587,60 @@ describe('summarizeLoadout', () => {
             ],
             rule,
           },
+          {
+            id: 'talent-two',
+            name: 'Calibrated',
+            template: 'Gain {1}.',
+            tiers: [
+              {
+                tier: 'I',
+                effects: [{ stat_attribute_id: 'talent-stat', value: 30 }],
+              },
+              {
+                tier: 'II',
+                effects: [{ stat_attribute_id: 'talent-stat', value: 40 }],
+              },
+            ],
+          },
+          {
+            id: 'exotic-talent',
+            name: 'Exotic Talent',
+            template: 'Gain {1}.',
+            tiers: [
+              {
+                tier: 'I',
+                effects: [{ stat_attribute_id: 'talent-stat', value: 50 }],
+              },
+              {
+                tier: 'II',
+                effects: [{ stat_attribute_id: 'talent-stat', value: 60 }],
+              },
+            ],
+          },
         ],
       }),
     );
 
     expect(summary.equippedTalents).toEqual([
       expect.objectContaining({
-        id: 'talent',
-        tier: 2,
-        description: 'Gain 20% for 3 Shots.',
+        id: 'talent-one',
+        tier: 1,
+        tierLabel: 'TIER I',
+        description: 'Gain 10% for 2 Shots.',
         rule,
       }),
+      expect.objectContaining({
+        id: 'talent-two',
+        tier: 2,
+        tierLabel: 'TIER II',
+        description: 'Gain 40%.',
+      }),
+      expect.objectContaining({
+        id: 'exotic-talent',
+        tier: 1,
+        tierLabel: 'TIER I',
+        description: 'Gain 50%.',
+      }),
     ]);
     expect(stat(summary, 'talent-stat')).toBeUndefined();
   });

src/lib/builder/loadout-summary.ts

@@ -1,4 +1,9 @@
-import { gearSlots, scaled, type LoadoutDraft } from '$lib/builder/loadout';
+import {
+  gearSlots,
+  scaled,
+  type LoadoutDraft,
+  type TalentTier,
+} from '$lib/builder/loadout';
 
 export type LoadoutCatalog = {
   attributes: any[];
@@ -7,6 +12,10 @@ export type LoadoutCatalog = {
   brands: any[];
   weapons: any[];
   talents: any[];
+  skillChipProfile?: {
+    primaryOptions: any[];
+    secondaryOptions: any[];
+  };
   chipSets: any[];
   protocols: any[];
   specializations: any[];
@@ -14,6 +23,20 @@ export type LoadoutCatalog = {
 
 export type LoadoutSummary = {
   stats: Array<{ id: string; value: number; sourceCount: number }>;
+  abilityStats: Array<{
+    abilityId: string;
+    stats: Array<{
+      id: string;
+      value: number;
+      sourceCount: number;
+      sources: Array<{
+        source: string;
+        chipIndex: number;
+        chipSetId: string;
+        value: number;
+      }>;
+    }>;
+  }>;
   activeBonuses: any[];
   equippedTalents: any[];
 };
@@ -82,18 +105,21 @@ function unitValue(catalog: LoadoutCatalog, value: unknown, statId: string) {
   return unit === 'Shots' ? `${rendered} ${unit}` : `${rendered}${unit}`;
 }
 
-function talentTier(catalog: LoadoutCatalog, talentId: string, tier: number) {
+function talentTier(
+  catalog: LoadoutCatalog,
+  talentId: string,
+  tier: TalentTier,
+) {
   const item = catalog.talents.find((entry) => entry.id === talentId);
-  return (
-    item?.tiers.find((entry: any) => entry.tier === (tier >= 2 ? 'II' : 'I')) ??
-    item?.tiers[0]
+  return item?.tiers.find(
+    (entry: any) => entry.tier === (tier === 2 ? 'II' : 'I'),
   );
 }
 
 function talentDescription(
   catalog: LoadoutCatalog,
   talentId: string,
-  tier: number,
+  tier: TalentTier,
 ) {
   const item = catalog.talents.find((entry) => entry.id === talentId);
   const configured = talentTier(catalog, talentId, tier);
@@ -139,6 +165,55 @@ export function summarizeLoadout(
   const brandCounts = new Map<string, number>();
   const activeBonuses: any[] = [];
   const equippedTalents: any[] = [];
+  const abilityValues = new Map<string, Map<string, number>>();
+  const abilitySources = new Map<
+    string,
+    Map<
+      string,
+      Array<{
+        source: string;
+        chipIndex: number;
+        chipSetId: string;
+        value: number;
+      }>
+    >
+  >();
+  const addAbilityStat = (
+    abilityId: string,
+    statId: string,
+    value: unknown,
+    chipIndex: number,
+    chipSetId: string,
+  ) => {
+    if (
+      !abilityId ||
+      !statId ||
+      !catalogAttribute(catalog, statId) ||
+      !Number.isFinite(Number(value))
+    )
+      return;
+    if (!abilityValues.has(abilityId)) abilityValues.set(abilityId, new Map());
+    const valuesForAbility = abilityValues.get(abilityId)!;
+    valuesForAbility.set(
+      statId,
+      applyAttributeValue(
+        catalog,
+        valuesForAbility.get(statId) ?? 0,
+        statId,
+        Number(value),
+      ),
+    );
+    if (!abilitySources.has(abilityId))
+      abilitySources.set(abilityId, new Map());
+    const sourcesForAbility = abilitySources.get(abilityId)!;
+    if (!sourcesForAbility.has(statId)) sourcesForAbility.set(statId, []);
+    sourcesForAbility.get(statId)!.push({
+      source: `Skill Chip ${chipIndex + 1} primary`,
+      chipIndex,
+      chipSetId,
+      value: Number(value),
+    });
+  };
 
   for (const slot of gearSlots) {
     const selection = draft.gear[slot];
@@ -188,12 +263,14 @@ export function summarizeLoadout(
         rule:
           catalog.talents.find((entry) => entry.id === selection.talentId)
             ?.rule ?? null,
-        tier: Number(item.tier),
+        tier: selection.talentTier,
+        tierLabel: selection.talentTier === 2 ? 'TIER II' : 'TIER I',
+        isExotic: false,
         source: slot,
         description: talentDescription(
           catalog,
           selection.talentId,
-          Number(item.tier),
+          selection.talentTier,
         ),
       });
     }
@@ -238,42 +315,98 @@ export function summarizeLoadout(
         roll.value,
         `${index ? 'Secondary' : 'Primary'} weapon roll`,
       );
-    for (const talentId of [
-      selection.talent1Id,
-      selection.talent2Id,
-      item.exotic_talent_id,
-    ].filter(Boolean)) {
+    const equippedWeaponTalents = [
+      {
+        id: selection.talent1Id,
+        tier: selection.talent1Tier,
+        isExotic: false,
+      },
+      {
+        id: selection.talent2Id,
+        tier: selection.talent2Tier,
+        isExotic: false,
+      },
+      {
+        id: item.exotic_talent_id,
+        tier: selection.exoticTalentTier,
+        isExotic: true,
+      },
+    ].filter((entry) => entry.id);
+    for (const equippedTalent of equippedWeaponTalents) {
       equippedTalents.push({
-        key: `weapon:${index}:${talentId}`,
-        id: talentId,
+        key: `weapon:${index}:${equippedTalent.id}`,
+        id: equippedTalent.id,
         rule:
-          catalog.talents.find((entry) => entry.id === talentId)?.rule ?? null,
-        tier: selection.tier,
+          catalog.talents.find((entry) => entry.id === equippedTalent.id)
+            ?.rule ?? null,
+        tier: equippedTalent.tier,
+        tierLabel: equippedTalent.tier === 2 ? 'TIER II' : 'TIER I',
+        isExotic: equippedTalent.isExotic,
         source: index ? 'Secondary weapon' : 'Primary weapon',
-        description: talentDescription(catalog, talentId, selection.tier),
+        description: talentDescription(
+          catalog,
+          equippedTalent.id,
+          equippedTalent.tier,
+        ),
       });
     }
   }
 
   const chipGroups = new Map<
     string,
-    { count: number; highEnd: number; item: any }
+    { count: number; highEnd: number; item: any; abilityId: string }
   >();
+  const focus = selectedFocus(draft, catalog);
+  const validChipRoll = (
+    kind: 'primaryOptions' | 'secondaryOptions',
+    quality: string,
+    roll: { statId: string; value: number },
+  ) => {
+    if (!catalog.skillChipProfile) return true;
+    const range = catalog.skillChipProfile[kind].find(
+      (option) => option.statId === roll.statId,
+    )?.ranges?.[quality];
+    return (
+      range &&
+      roll.value >= Number(range.min) &&
+      roll.value <= Number(range.max)
+    );
+  };
   for (let index = 0; index < 9; index += 1) {
     const selection = draft.chips[index];
     const item = catalog.chipSets.find((entry) => entry.id === selection.setId);
     if (!item) continue;
-    add(
-      selection.primary.statId,
-      selection.primary.value,
-      `Skill Chip ${index + 1} primary`,
+    const slotAbilityId = String(
+      focus?.abilities?.[Math.floor(index / 3)]?.id ?? '',
     );
+    const compatibleAbilityIds = item.compatibleAbilityIds ?? [
+      String(item.specialization_ability_id ?? ''),
+    ];
+    if (slotAbilityId && !compatibleAbilityIds.includes(slotAbilityId))
+      continue;
+    const abilityId =
+      slotAbilityId || String(item.specialization_ability_id ?? '');
+    if (validChipRoll('primaryOptions', selection.quality, selection.primary))
+      addAbilityStat(
+        abilityId,
+        selection.primary.statId,
+        selection.primary.value,
+        index,
+        String(item.id),
+      );
     for (const roll of selection.secondary)
-      add(roll.statId, roll.value, `Skill Chip ${index + 1} secondary`);
-    const group = chipGroups.get(item.id) ?? { count: 0, highEnd: 0, item };
+      if (validChipRoll('secondaryOptions', selection.quality, roll))
+        add(roll.statId, roll.value, `Skill Chip ${index + 1} secondary`);
+    const groupKey = `${item.id}:${abilityId}`;
+    const group = chipGroups.get(groupKey) ?? {
+      count: 0,
+      highEnd: 0,
+      item,
+      abilityId,
+    };
     group.count += 1;
     if (selection.quality === 'High-end') group.highEnd += 1;
-    chipGroups.set(item.id, group);
+    chipGroups.set(groupKey, group);
   }
   for (const group of chipGroups.values()) {
     if (group.count >= 2 && group.item.twoPiece) {
@@ -298,12 +431,12 @@ export function summarizeLoadout(
     }
     if (group.count === 3 && group.item.talent) {
       equippedTalents.push({
-        key: `chips:${group.item.id}`,
+        key: `chips:${group.item.id}:${group.abilityId}`,
         id: '',
         custom: group.item.talent,
         rule: group.item.talent.rule ?? null,
         tier: group.highEnd,
-        abilityId: group.item.specialization_ability_id ?? null,
+        abilityId: group.abilityId || null,
         source: '3 Skill Chips',
         description: group.item.talent.description_template.replace(
           /\{(\d+)\}/g,
@@ -390,6 +523,28 @@ export function summarizeLoadout(
             catalogAttribute(catalog, right.id)?.name ?? '',
           ),
       ),
+    abilityStats: [...abilityValues].map(([abilityId, abilityStatValues]) => ({
+      abilityId,
+      stats: [...abilityStatValues]
+        .map(([id, value]) => {
+          const statSources = abilitySources.get(abilityId)?.get(id) ?? [];
+          return {
+            id,
+            value,
+            sourceCount: statSources.length,
+            sources: statSources,
+          };
+        })
+        .sort(
+          (left, right) =>
+            (catalogAttribute(catalog, left.id)?.category ?? '').localeCompare(
+              catalogAttribute(catalog, right.id)?.category ?? '',
+            ) ||
+            (catalogAttribute(catalog, left.id)?.name ?? '').localeCompare(
+              catalogAttribute(catalog, right.id)?.name ?? '',
+            ),
+        ),
+    })),
     activeBonuses,
     equippedTalents,
   };

src/lib/builder/loadout.test.ts

@@ -1,20 +1,91 @@
 import { describe, expect, it } from 'vitest';
-import { createDraft, parseLoadoutDraft } from './loadout.js';
+import {
+  createDraft,
+  migrateLoadoutDraftV5,
+  parseLoadoutDraft,
+  skillChipSecondaryCapacity,
+  type SkillChipQuality,
+} from './loadout.js';
 
 const copyDraft = () => structuredClone(createDraft());
 
+const talentTierFields = [
+  [
+    'gear talentTier',
+    (draft: ReturnType<typeof copyDraft>) =>
+      draft.gear.Holster as unknown as Record<string, unknown>,
+    'talentTier',
+  ],
+  [
+    'weapon talent1Tier',
+    (draft: ReturnType<typeof copyDraft>) =>
+      draft.weapons[0] as unknown as Record<string, unknown>,
+    'talent1Tier',
+  ],
+  [
+    'weapon talent2Tier',
+    (draft: ReturnType<typeof copyDraft>) =>
+      draft.weapons[0] as unknown as Record<string, unknown>,
+    'talent2Tier',
+  ],
+  [
+    'weapon exoticTalentTier',
+    (draft: ReturnType<typeof copyDraft>) =>
+      draft.weapons[0] as unknown as Record<string, unknown>,
+    'exoticTalentTier',
+  ],
+] as const;
+
 describe('parseLoadoutDraft', () => {
   it('accepts a current draft and returns an independent clone', () => {
     const draft = createDraft();
     const parsed = parseLoadoutDraft(draft);
 
     expect(parsed).toEqual(draft);
+    expect(parsed?.version).toBe(6);
+    expect(parsed?.chips[0]).toEqual({
+      setId: '',
+      quality: 'Standard',
+      primary: { statId: '', value: 0 },
+      secondary: [],
+    });
     expect(parsed?.calculationMode).toBe('maximum');
     expect(parsed).not.toBe(draft);
     parsed!.gear.Holster.level = 1;
     expect(draft.gear.Holster.level).toBe(50);
   });
 
+  it('defaults every equipment Talent tier to Tier I', () => {
+    const draft = createDraft();
+
+    expect(
+      Object.values(draft.gear).map(
+        (selection) =>
+          (selection as unknown as Record<string, unknown>).talentTier,
+      ),
+    ).toEqual(Array(6).fill(1));
+    expect(
+      draft.weapons.map((selection) => {
+        const weapon = selection as unknown as Record<string, unknown>;
+        return [
+          weapon.talent1Tier,
+          weapon.talent2Tier,
+          weapon.exoticTalentTier,
+        ];
+      }),
+    ).toEqual([
+      [1, 1, 1],
+      [1, 1, 1],
+    ]);
+  });
+
+  it('accepts Tier II for every equipment Talent selection', () => {
+    const draft = copyDraft();
+    for (const [, select, key] of talentTierFields) select(draft)[key] = 2;
+
+    expect(parseLoadoutDraft(draft)).toEqual(draft);
+  });
+
   it('rejects the retired version 1 three-chip shape', () => {
     const retired = copyDraft() as unknown as Record<string, unknown>;
     retired.version = 1;
@@ -23,13 +94,125 @@ describe('parseLoadoutDraft', () => {
     expect(parseLoadoutDraft(retired)).toBeNull();
   });
 
-  it('rejects a version 4 draft that does not contain exactly nine chips', () => {
+  it('rejects the retired version 4 schema', () => {
+    const retired = copyDraft() as unknown as Record<string, unknown>;
+    retired.version = 4;
+
+    expect(parseLoadoutDraft(retired)).toBeNull();
+  });
+
+  it('rejects the retired version 5 schema', () => {
+    const retired = copyDraft() as unknown as Record<string, unknown>;
+    retired.version = 5;
+
+    expect(parseLoadoutDraft(retired)).toBeNull();
+  });
+
+  it('migrates version 5 equipment-derived Talent tiers once', () => {
+    const legacy = copyDraft() as unknown as Record<string, any>;
+    legacy.version = 5;
+    for (const selection of Object.values(legacy.gear) as Record<
+      string,
+      any
+    >[]) {
+      delete selection.talentTier;
+    }
+    for (const selection of legacy.weapons as Record<string, any>[]) {
+      delete selection.talent1Tier;
+      delete selection.talent2Tier;
+      delete selection.exoticTalentTier;
+    }
+    legacy.gear.Holster.itemId = 'tier-two-gear';
+    legacy.weapons[0].itemId = 'exotic-weapon';
+    legacy.weapons[0].tier = 2;
+
+    const migrated = migrateLoadoutDraftV5(legacy, {
+      gear: [{ id: 'tier-two-gear', tier: 2 }],
+      weapons: [{ id: 'exotic-weapon', exotic_talent_id: 'exotic-talent' }],
+      talents: [
+        {
+          id: 'exotic-talent',
+          tiers: [{ tier: 'I' }, { tier: 'II' }],
+        },
+      ],
+    });
+
+    expect(migrated?.version).toBe(6);
+    expect(migrated?.gear.Holster.talentTier).toBe(2);
+    expect(migrated?.gear.Gloves.talentTier).toBe(1);
+    expect(migrated?.weapons[0]).toMatchObject({
+      talent1Tier: 2,
+      talent2Tier: 2,
+      exoticTalentTier: 2,
+    });
+  });
+
+  it('rejects a current draft that does not contain exactly nine chips', () => {
     const draft = copyDraft();
     draft.chips.pop();
 
     expect(parseLoadoutDraft(draft)).toBeNull();
   });
 
+  it.each(talentTierFields)('rejects a draft missing %s', (_, select, key) => {
+    const draft = copyDraft();
+    delete select(draft)[key];
+
+    expect(parseLoadoutDraft(draft)).toBeNull();
+  });
+
+  it.each(
+    talentTierFields.flatMap(([name, select, key]) =>
+      [0, 1.5, 3].map((value) => [name, value, select, key] as const),
+    ),
+  )('rejects %s value %s', (_, value, select, key) => {
+    const draft = copyDraft();
+    select(draft)[key] = value;
+
+    expect(parseLoadoutDraft(draft)).toBeNull();
+  });
+
+  it.each([
+    ['Standard', 0],
+    ['Specialized', 1],
+    ['Superior', 2],
+    ['High-end', 2],
+  ] as const)(
+    'accepts %s chips with exactly %i secondary rolls',
+    (quality, capacity) => {
+      const draft = copyDraft();
+      draft.chips[0].quality = quality;
+      draft.chips[0].primary = { statId: 'primary', value: 10 };
+      draft.chips[0].secondary = Array.from(
+        { length: capacity },
+        (_, index) => ({ statId: `secondary-${index}`, value: index + 1 }),
+      );
+
+      expect(skillChipSecondaryCapacity[quality]).toBe(capacity);
+      expect(parseLoadoutDraft(draft)).toEqual(draft);
+    },
+  );
+
+  it.each([
+    ['Standard', 1],
+    ['Specialized', 0],
+    ['Specialized', 2],
+    ['Superior', 1],
+    ['High-end', 3],
+  ] as Array<[SkillChipQuality, number]>)(
+    'rejects %s chips with %i secondary rolls',
+    (quality, capacity) => {
+      const draft = copyDraft();
+      draft.chips[0].quality = quality;
+      draft.chips[0].secondary = Array.from(
+        { length: capacity },
+        (_, index) => ({ statId: `secondary-${index}`, value: index + 1 }),
+      );
+
+      expect(parseLoadoutDraft(draft)).toBeNull();
+    },
+  );
+
   it('rejects a draft missing the unified combat profile', () => {
     const draft = copyDraft() as unknown as Record<string, unknown>;
     delete draft.combatProfile;

src/lib/builder/loadout.ts

@@ -1,9 +1,24 @@
 export type Roll = { statId: string; value: number };
+export type TalentTier = 1 | 2;
+export const skillChipQualities = [
+  'Standard',
+  'Specialized',
+  'Superior',
+  'High-end',
+] as const;
+export type SkillChipQuality = (typeof skillChipQualities)[number];
+export const skillChipSecondaryCapacity: Record<SkillChipQuality, number> = {
+  Standard: 0,
+  Specialized: 1,
+  Superior: 2,
+  'High-end': 2,
+};
 export type GearSelection = {
   itemId: string;
   level: number;
   brandId: string;
   talentId: string;
+  talentTier: TalentTier;
   health: number;
   armor: number;
   firepower: number;
@@ -21,14 +36,17 @@ export type WeaponSelection = {
   toughness: number;
   engineering: number;
   talent1Id: string;
+  talent1Tier: TalentTier;
   talent2Id: string;
+  talent2Tier: TalentTier;
+  exoticTalentTier: TalentTier;
   rolls: [Roll, Roll];
 };
 export type ChipSelection = {
   setId: string;
-  quality: 'Superior' | 'High-end';
+  quality: SkillChipQuality;
   primary: Roll;
-  secondary: [Roll, Roll];
+  secondary: Roll[];
 };
 export type ProtocolSelection = {
   itemId: string;
@@ -68,7 +86,7 @@ export type SpecializationSelection = {
   nodeRanks: Record<string, number>;
 };
 export type LoadoutDraft = {
-  version: 4;
+  version: 6;
   buildName: string;
   calculationMode: CalculationMode;
   gear: Record<string, GearSelection>;
@@ -105,6 +123,7 @@ export const blankGear = (): GearSelection => ({
   level: 50,
   brandId: '',
   talentId: '',
+  talentTier: 1,
   health: 0,
   armor: 0,
   firepower: 0,
@@ -122,14 +141,17 @@ export const blankWeapon = (): WeaponSelection => ({
   toughness: 0,
   engineering: 0,
   talent1Id: '',
+  talent1Tier: 1,
   talent2Id: '',
+  talent2Tier: 1,
+  exoticTalentTier: 1,
   rolls: [blankRoll(), blankRoll()],
 });
 export const blankChip = (): ChipSelection => ({
   setId: '',
-  quality: 'Superior',
+  quality: 'Standard',
   primary: blankRoll(),
-  secondary: [blankRoll(), blankRoll()],
+  secondary: [],
 });
 export const defaultCombatProfile = (): CombatProfile => ({
   encounterSeconds: 60,
@@ -148,7 +170,7 @@ export const defaultCombatProfile = (): CombatProfile => ({
   extraHealthActive: false,
 });
 export const createDraft = (): LoadoutDraft => ({
-  version: 4,
+  version: 6,
   buildName: 'Untitled loadout',
   calculationMode: 'maximum',
   gear: Object.fromEntries(gearSlots.map((slot) => [slot, blankGear()])),
@@ -174,6 +196,39 @@ export const createDraft = (): LoadoutDraft => ({
   },
 });
 
+export function migrateLoadoutDraftV5(
+  value: unknown,
+  catalog: { gear: any[]; weapons: any[]; talents: any[] },
+): LoadoutDraft | null {
+  if (!isRecord(value) || value.version !== 5) return null;
+  const migrated = structuredClone(value);
+  if (!isRecord(migrated.gear) || !Array.isArray(migrated.weapons)) return null;
+
+  for (const slot of gearSlots) {
+    const selection = migrated.gear[slot];
+    if (!isRecord(selection)) return null;
+    const item = catalog.gear.find((entry) => entry.id === selection.itemId);
+    selection.talentTier = Number(item?.tier) >= 2 ? 2 : 1;
+  }
+  for (const selection of migrated.weapons) {
+    if (!isRecord(selection)) return null;
+    const inheritedTier: TalentTier = Number(selection.tier) >= 2 ? 2 : 1;
+    selection.talent1Tier = inheritedTier;
+    selection.talent2Tier = inheritedTier;
+    const item = catalog.weapons.find((entry) => entry.id === selection.itemId);
+    const exoticTalent = catalog.talents.find(
+      (entry) => entry.id === item?.exotic_talent_id,
+    );
+    selection.exoticTalentTier =
+      inheritedTier === 2 &&
+      exoticTalent?.tiers?.some((entry: any) => entry.tier === 'II')
+        ? 2
+        : 1;
+  }
+  migrated.version = 6;
+  return parseLoadoutDraft(migrated);
+}
+
 const isRecord = (value: unknown): value is Record<string, unknown> =>
   Boolean(value) && typeof value === 'object' && !Array.isArray(value);
 const hasExactKeys = (value: Record<string, unknown>, keys: string[]) =>
@@ -181,6 +236,8 @@ const hasExactKeys = (value: Record<string, unknown>, keys: string[]) =>
   keys.every((key) => key in value);
 const isFiniteNumber = (value: unknown): value is number =>
   typeof value === 'number' && Number.isFinite(value);
+const isTalentTier = (value: unknown): value is TalentTier =>
+  value === 1 || value === 2;
 const isNumberRecord = (value: unknown) =>
   isRecord(value) &&
   Object.values(value).every(
@@ -200,6 +257,7 @@ const isGearSelection = (value: unknown): value is GearSelection =>
     'level',
     'brandId',
     'talentId',
+    'talentTier',
     'health',
     'armor',
     'firepower',
@@ -211,6 +269,7 @@ const isGearSelection = (value: unknown): value is GearSelection =>
   ['itemId', 'brandId', 'talentId'].every(
     (key) => typeof value[key] === 'string',
   ) &&
+  isTalentTier(value.talentTier) &&
   ['level', 'health', 'armor', 'firepower', 'toughness', 'engineering'].every(
     (key) => isFiniteNumber(value[key]),
   ) &&
@@ -228,12 +287,18 @@ const isWeaponSelection = (value: unknown): value is WeaponSelection =>
     'toughness',
     'engineering',
     'talent1Id',
+    'talent1Tier',
     'talent2Id',
+    'talent2Tier',
+    'exoticTalentTier',
     'rolls',
   ]) &&
   ['itemId', 'talent1Id', 'talent2Id'].every(
     (key) => typeof value[key] === 'string',
   ) &&
+  isTalentTier(value.talent1Tier) &&
+  isTalentTier(value.talent2Tier) &&
+  isTalentTier(value.exoticTalentTier) &&
   ['level', 'tier', 'damage', 'firepower', 'toughness', 'engineering'].every(
     (key) => isFiniteNumber(value[key]),
   ) &&
@@ -242,9 +307,12 @@ const isChipSelection = (value: unknown): value is ChipSelection =>
   isRecord(value) &&
   hasExactKeys(value, ['setId', 'quality', 'primary', 'secondary']) &&
   typeof value.setId === 'string' &&
-  (value.quality === 'Superior' || value.quality === 'High-end') &&
+  skillChipQualities.some((quality) => value.quality === quality) &&
   isRoll(value.primary) &&
-  isRollPair(value.secondary);
+  Array.isArray(value.secondary) &&
+  value.secondary.length ===
+    skillChipSecondaryCapacity[value.quality as SkillChipQuality] &&
+  value.secondary.every(isRoll);
 const isProtocolSelection = (value: unknown): value is ProtocolSelection =>
   isRecord(value) &&
   hasExactKeys(value, ['itemId', 'level', 'talentUpgrades']) &&
@@ -353,7 +421,7 @@ export function parseLoadoutDraft(value: unknown): LoadoutDraft | null {
       'skillActivations',
       'specialization',
     ]) ||
-    value.version !== 4 ||
+    value.version !== 6 ||
     typeof value.buildName !== 'string' ||
     !['maximum', 'custom'].includes(String(value.calculationMode))
   )

src/lib/calculations/mechanic-editor.test.ts

@@ -2,9 +2,13 @@ import { describe, expect, it } from 'vitest';
 import {
   currentHealthPercentBandPredicate,
   eventFieldComparisonPredicate,
+  eventFieldNumericExpression,
+  mechanicTargetingForMode,
+  mechanicTargetingMode,
   parseConditionalMechanicDraft,
   readCurrentHealthPercentBand,
   readEventFieldComparison,
+  readEventFieldNumericExpression,
   registeredEventFields,
   readStatePoolThreshold,
   statePoolThresholdPredicate,
@@ -200,6 +204,212 @@ describe('conditional mechanic authoring payload', () => {
     });
   });
 
+  it('round-trips the registered proximity count as a derived scalar and resolves each variant display value', () => {
+    const path = 'values.alliesWithin30MetersWithAgentGrantedBuff';
+    expect(registeredEventFields('proximity_snapshot')).toContainEqual({
+      path,
+      label: 'Allies within 30 meters with an Agent-granted buff',
+      type: 'number',
+      minimum: 0,
+      integer: true,
+    });
+
+    const expression = eventFieldNumericExpression(path);
+    expect(readEventFieldNumericExpression(expression)).toBe(path);
+    expect(
+      readEventFieldNumericExpression({
+        op: 'multiply',
+        left: expression,
+        right: 2,
+      }),
+    ).toBeNull();
+
+    const value = draft();
+    value.clauses[0].event = 'proximity_snapshot';
+    value.clauses[0].recipeKey = undefined;
+    value.clauses[0].reducer = {
+      kind: 'derived_scalar',
+      value: expression,
+    };
+    value.clauses[0].mutations = [
+      {
+        kind: 'derive',
+        pool: 'effect',
+        value: { ref: { source: 'reducer' } },
+      },
+    ];
+    const upgradeScale = {
+      op: 'add' as const,
+      left: 1,
+      right: {
+        op: 'divide' as const,
+        left: {
+          ref: {
+            source: 'equipment' as const,
+            path: 'protocolTalentUpgrades',
+          },
+        },
+        right: 5,
+      },
+    };
+    value.clauses[0].outcomes[0].variants = {
+      I: {
+        value: 7.25,
+        expression: {
+          op: 'multiply',
+          left: { ref: { source: 'variant_value' } },
+          right: upgradeScale,
+        },
+      },
+      II: {
+        value: 9.5,
+        expression: {
+          op: 'multiply',
+          left: { ref: { source: 'variant_value' } },
+          right: upgradeScale,
+        },
+      },
+    };
+
+    const result = parseConditionalMechanicDraft(value, {
+      variantKeys: ['I', 'II'],
+      allowedAttributeIds: new Set(['weapon-damage']),
+    });
+
+    expect(result.ok).toBe(true);
+    if (!result.ok) return;
+    expect(result.value.draft.clauses[0]).toMatchObject({
+      event: 'proximity_snapshot',
+      reducer: { kind: 'derived_scalar', value: expression },
+      outcomes: [
+        {
+          variants: {
+            I: {
+              value: 7.25,
+              expression: {
+                left: { ref: { source: 'variant_value' } },
+              },
+            },
+          },
+        },
+      ],
+    });
+    expect(result.value.programs.I.clauses[0].outcomes?.[0].value).toEqual({
+      op: 'multiply',
+      left: 7.25,
+      right: upgradeScale,
+    });
+    expect(result.value.programs.II.clauses[0].outcomes?.[0].value).toEqual({
+      op: 'multiply',
+      left: 9.5,
+      right: upgradeScale,
+    });
+  });
+
+  it('exposes assigned-ability activity for kill and assist event conditions', () => {
+    expect(registeredEventFields('enemy_killed')).toEqual(
+      expect.arrayContaining([
+        {
+          path: 'values.assignedAbilityActive',
+          label: 'Assigned ability active',
+          type: 'boolean',
+        },
+      ]),
+    );
+    expect(registeredEventFields('assist')).toEqual(
+      expect.arrayContaining([
+        {
+          path: 'values.assignedAbilityActive',
+          label: 'Assigned ability active',
+          type: 'boolean',
+        },
+      ]),
+    );
+    const value = draft();
+    value.clauses[0].event = 'enemy_killed';
+    value.clauses[0].recipeKey = undefined;
+    value.clauses[0].reducer = { kind: 'none' };
+    value.clauses[0].if = eventFieldComparisonPredicate({
+      path: 'values.assignedAbilityActive',
+      operator: 'eq',
+      value: true,
+    });
+
+    const result = parseConditionalMechanicDraft(value, {
+      variantKeys: ['I', 'II'],
+      allowedAttributeIds: new Set(['weapon-damage']),
+    });
+    expect(result.ok).toBe(true);
+    if (!result.ok) return;
+    expect(result.value.programs.I.clauses[0]).toMatchObject({
+      when: 'enemy_killed',
+      if: value.clauses[0].if,
+    });
+  });
+
+  it('parses deterministic outcome and clause proc chances with ability mutations', () => {
+    const value = draft();
+    value.clauses[0].event = 'skill_hit';
+    value.clauses[0].recipeKey = undefined;
+    value.clauses[0].procChancePercent = 10;
+    value.clauses[0].requiresAssignedAbilityActive = true;
+    value.clauses[0].outcomes[0].probabilityPercent = 29;
+    value.clauses[0].outcomes[0].statePool = undefined;
+    value.clauses[0].outcomes[0].perStack = false;
+    value.pools = [
+      {
+        key: 'extension-stacks',
+        label: 'Extension stacks',
+        stateKind: 'stack',
+        scope: 'agent',
+        initial: 0,
+        min: 0,
+        max: 8,
+      },
+      {
+        key: 'extension-cooldown',
+        label: 'Extension cooldown',
+        stateKind: 'flag',
+        scope: 'agent',
+        initial: 0,
+        min: 0,
+        max: 1,
+        expiresAfterSeconds: 15,
+      },
+    ];
+    value.clauses[0].mutations = [
+      { kind: 'add', pool: 'extension-stacks', value: 1 },
+      { kind: 'extend_duration', target: 'assigned_ability', seconds: 0.3 },
+      {
+        kind: 'start_cooldown_on_max',
+        stackPool: 'extension-stacks',
+        cooldownPool: 'extension-cooldown',
+      },
+    ];
+    const result = parseConditionalMechanicDraft(value, {
+      variantKeys: ['I', 'II'],
+      allowedAttributeIds: new Set(['weapon-damage']),
+    });
+
+    expect(result.ok).toBe(true);
+    if (!result.ok) return;
+    expect(result.value.programs.I.clauses[0]).toMatchObject({
+      procChancePercent: 10,
+      requiresAssignedAbilityActive: true,
+      outcomes: [{ probabilityPercent: 29 }],
+    });
+    expect(result.value.programs.I.clauses[0].mutations).toEqual(
+      expect.arrayContaining([
+        { kind: 'extend_duration', target: 'assigned_ability', seconds: 0.3 },
+        {
+          kind: 'start_cooldown_on_max',
+          stackPool: 'extension-stacks',
+          cooldownPool: 'extension-cooldown',
+        },
+      ]),
+    );
+  });
+
   it('rejects an unregistered Extra Health event field deterministically', () => {
     const value = draft();
     value.clauses[0].event = 'extra_health_changed';
@@ -685,9 +895,9 @@ describe('conditional mechanic authoring payload', () => {
     });
   });
 
-  it('rejects invalid pre-event timing for current Health percentage references', () => {
-    const invalid = draft();
-    invalid.clauses[0].if = {
+  it('preserves pre-event timing for current Health percentage references', () => {
+    const value = draft();
+    value.clauses[0].if = {
       kind: 'compare',
       left: {
         source: 'combat',
@@ -697,11 +907,13 @@ describe('conditional mechanic authoring payload', () => {
       operator: 'lt',
       right: 50,
     };
-    const result = parseConditionalMechanicDraft(invalid, {
+    const result = parseConditionalMechanicDraft(value, {
       variantKeys: ['I', 'II'],
       allowedAttributeIds: new Set(['weapon-damage']),
     });
-    expect(result.ok).toBe(false);
+    expect(result.ok).toBe(true);
+    if (!result.ok) return;
+    expect(result.value.draft.clauses[0].if).toEqual(value.clauses[0].if);
   });
 
   it('accepts compatible radius targeting and rejects incompatible scopes', () => {
@@ -735,4 +947,125 @@ describe('conditional mechanic authoring payload', () => {
       );
     }
   });
+
+  it('exposes aiming and round-trips event-target explosion editor state', () => {
+    expect(registeredEventFields('weapon_hit')).toContainEqual({
+      path: 'values.aiming',
+      label: 'Aiming down sights',
+      type: 'boolean',
+    });
+    const targeting = mechanicTargetingForMode('event_target_explosion');
+    expect(targeting).toEqual({
+      kind: 'event_target_area',
+      center: 'event_target',
+      validTargets: 'enemies',
+      radiusMeters: 5,
+    });
+    expect(mechanicTargetingMode(targeting)).toBe('event_target_explosion');
+    expect(mechanicTargetingForMode('none', targeting)).toBeUndefined();
+
+    const valid = draft();
+    valid.clauses[0].if = eventFieldComparisonPredicate({
+      path: 'values.aiming',
+      operator: 'eq',
+      value: true,
+    });
+    valid.clauses[0].outcomes[0] = {
+      ...valid.clauses[0].outcomes[0],
+      kind: 'direct_damage',
+      scope: 'target',
+      phase: 'after_event',
+      attributeId: undefined,
+      targeting,
+    };
+    const parsed = parseConditionalMechanicDraft(valid, {
+      variantKeys: ['I', 'II'],
+      allowedAttributeIds: new Set(['weapon-damage']),
+    });
+    expect(parsed.ok).toBe(true);
+    if (parsed.ok) {
+      expect(parsed.value.draft.clauses[0].outcomes[0].targeting).toEqual(
+        targeting,
+      );
+    }
+  });
+
+  it('rejects incomplete, mis-scoped, and non-event area damage', () => {
+    for (const configure of [
+      (candidate: ConditionalMechanicDraftV1) => {
+        candidate.clauses[0].outcomes[0].targeting = {
+          kind: 'event_target_area',
+          center: 'event_target',
+          validTargets: 'enemies',
+          radiusMeters: 0,
+        };
+      },
+      (candidate: ConditionalMechanicDraftV1) => {
+        candidate.clauses[0].outcomes[0].scope = 'self';
+      },
+      (candidate: ConditionalMechanicDraftV1) => {
+        candidate.clauses[0].outcomes[0].phase = 'while_active';
+      },
+      (candidate: ConditionalMechanicDraftV1) => {
+        candidate.clauses[0].event = 'enemy_killed';
+      },
+    ]) {
+      const invalid = draft();
+      invalid.clauses[0].outcomes[0] = {
+        ...invalid.clauses[0].outcomes[0],
+        kind: 'direct_damage',
+        scope: 'target',
+        phase: 'after_event',
+        attributeId: undefined,
+        targeting: {
+          kind: 'event_target_area',
+          center: 'event_target',
+          validTargets: 'enemies',
+          radiusMeters: 5,
+        },
+      };
+      configure(invalid);
+      expect(
+        parseConditionalMechanicDraft(invalid, {
+          variantKeys: ['I', 'II'],
+          allowedAttributeIds: new Set(['weapon-damage']),
+        }).ok,
+      ).toBe(false);
+    }
+  });
+
+  it('requires explicit equality for optional aiming evidence', () => {
+    for (const predicate of [
+      {
+        kind: 'compare' as const,
+        left: { source: 'event' as const, path: 'values.aiming' },
+        operator: 'ne' as const,
+        right: true,
+      },
+      {
+        kind: 'not' as const,
+        predicate: {
+          kind: 'compare' as const,
+          left: { source: 'event' as const, path: 'values.aiming' },
+          operator: 'eq' as const,
+          right: true,
+        },
+      },
+      {
+        kind: 'compare' as const,
+        left: { source: 'event' as const, path: 'values.aiming' },
+        operator: 'ne' as const,
+        right: { source: 'combat' as const, path: 'currentHealth' },
+      },
+    ]) {
+      const invalid = draft();
+      invalid.clauses[0].if = predicate;
+      expect(
+        parseConditionalMechanicDraft(invalid, {
+          variantKeys: ['I', 'II'],
+          allowedAttributeIds: new Set(['weapon-damage']),
+        }).ok,
+      ).toBe(false);
+    }
+  });
 });

src/lib/calculations/mechanic-editor.ts

@@ -1,12 +1,14 @@
 import {
   MECHANIC_EVENT_KINDS,
   MECHANIC_EVENT_REGISTRY,
+  mechanicOutcomeTargetingError,
   validateMechanicProgram,
   type ClauseMutation,
   type MechanicClause,
   type MechanicEventKind,
   type MechanicOutcome,
   type MechanicOutcomeScope,
+  type MechanicOutcomeTargeting,
   type MechanicProgram,
   type MechanicResource,
   type NumericExpression,
@@ -37,9 +39,28 @@ export type ConditionalMechanicPoolDraft = PoolDefinition & {
   expiresAfterSecondsVariants?: Record<string, number>;
 };
 
+export type ConditionalMechanicValueReference =
+  ValueReference | { source: 'variant_value' };
+
+export type ConditionalNumericExpression =
+  | number
+  | { ref: ConditionalMechanicValueReference }
+  | { op: 'floor'; value: ConditionalNumericExpression }
+  | {
+      op: 'add' | 'subtract' | 'multiply' | 'divide' | 'min' | 'max';
+      left: ConditionalNumericExpression;
+      right: ConditionalNumericExpression;
+    }
+  | {
+      op: 'clamp';
+      value: ConditionalNumericExpression;
+      min: ConditionalNumericExpression;
+      max: ConditionalNumericExpression;
+    };
+
 export type ConditionalMechanicVariantValue = {
   value: number;
-  expression?: NumericExpression;
+  expression?: ConditionalNumericExpression;
 };
 
 export type ConditionalMechanicOutcomeDraft = Omit<
@@ -198,6 +219,59 @@ export function registeredEventFields(event: MechanicEventKind) {
   return MECHANIC_EVENT_REGISTRY[event].fields ?? [];
 }
 
+export function eventFieldNumericExpression(path: string): NumericExpression {
+  return { ref: { source: 'event', path } };
+}
+
+export function readEventFieldNumericExpression(
+  expression: NumericExpression,
+): string | null {
+  return typeof expression === 'object' &&
+    'ref' in expression &&
+    expression.ref.source === 'event' &&
+    expression.ref.path.trim()
+    ? expression.ref.path
+    : null;
+}
+
+export type MechanicTargetingMode =
+  | 'none'
+  | 'allies_within_radius'
+  | 'enemies_within_radius'
+  | 'event_target_explosion';
+
+export function mechanicTargetingMode(
+  targeting: MechanicOutcomeTargeting | undefined,
+): MechanicTargetingMode {
+  if (!targeting) return 'none';
+  if (targeting.kind === 'event_target_area') return 'event_target_explosion';
+  return targeting.population === 'allies'
+    ? 'allies_within_radius'
+    : 'enemies_within_radius';
+}
+
+export function mechanicTargetingForMode(
+  mode: MechanicTargetingMode,
+  current?: MechanicOutcomeTargeting,
+): MechanicOutcomeTargeting | undefined {
+  if (mode === 'none') return undefined;
+  const radiusMeters =
+    current?.radiusMeters ?? (mode === 'event_target_explosion' ? 5 : 20);
+  if (mode === 'event_target_explosion') {
+    return {
+      kind: 'event_target_area',
+      center: 'event_target',
+      validTargets: 'enemies',
+      radiusMeters,
+    };
+  }
+  return {
+    kind: 'within_radius',
+    population: mode === 'allies_within_radius' ? 'allies' : 'enemies',
+    radiusMeters,
+  };
+}
+
 export type StatePoolThresholdComparison = {
   pool: string;
   operator: PredicateComparisonOperator;
@@ -258,6 +332,7 @@ export const CONDITIONAL_MECHANIC_OUTCOME_CAPABILITIES = {
     'maxStacks',
     'targeting',
     'descriptionSlot',
+    'probabilityPercent',
   ],
   phase: ['on_event', 'after_event', 'on_enter', 'on_exit', 'while_active'],
   kind: [
@@ -291,6 +366,25 @@ export const CONDITIONAL_MECHANIC_OUTCOME_CAPABILITIES = {
     continuous:
       'Valid only for restoration. The value is the total restoration, delivered at a constant rate across durationSeconds. Each activation creates an independent stream; overlapping streams add and overheal is lost when it occurs.',
   },
+  probabilitySemantics:
+    'probabilityPercent is an optional inclusive 0 through 100 percentage. In custom simulation, each eligible outcome rolls independently from the evaluation random stream. Maximum mode resolves every nonzero probability as successful.',
+  targeting: {
+    withinRadius: {
+      kind: 'within_radius',
+      population: ['allies', 'enemies'],
+      radiusMeters: 'positive finite number',
+      semantics:
+        'Legacy radius metadata. It preserves authored range but does not select or fan out runtime targets.',
+    },
+    eventTargetArea: {
+      kind: 'event_target_area',
+      center: 'event_target',
+      validTargets: 'enemies',
+      radiusMeters: 'positive finite number',
+      semantics:
+        'Valid only for target-scoped direct damage in on_event or after_event phases on a weapon_hit clause. The triggering event must supply an authoritative event-target area sample. Every valid enemy at or inside the radius receives one equal damage emission, ordered by entity ID.',
+    },
+  },
 } as const;
 const phases = new Set<OutcomePhase>(
   CONDITIONAL_MECHANIC_OUTCOME_CAPABILITIES.phase,
@@ -366,11 +460,14 @@ function isReference(value: unknown): value is ValueReference {
         Boolean(value.path.trim()) &&
         (value.timing === undefined ||
           value.timing === 'pre_event' ||
-          value.timing === 'current') &&
-        !(value.path === 'currentHealthPercent' && value.timing === 'pre_event')
+          value.timing === 'current')
       );
     case 'equipment':
       return typeof value.path === 'string' && Boolean(value.path.trim());
+    case 'assigned_ability':
+      return (
+        value.path === 'active' || value.path === 'remainingDurationSeconds'
+      );
     case 'attribute':
       return (
         typeof value.attributeId === 'string' &&
@@ -389,6 +486,14 @@ function isReference(value: unknown): value is ValueReference {
   }
 }
 
+function isConditionalReference(
+  value: unknown,
+): value is ConditionalMechanicValueReference {
+  return (
+    (object(value) && value.source === 'variant_value') || isReference(value)
+  );
+}
+
 function validateAttributeReferences(
   value: unknown,
   allowedAttributeIds: ReadonlySet<string> | undefined,
@@ -448,6 +553,29 @@ function isExpression(value: unknown): value is NumericExpression {
   );
 }
 
+function isConditionalExpression(
+  value: unknown,
+): value is ConditionalNumericExpression {
+  if (finite(value)) return true;
+  if (!object(value)) return false;
+  if ('ref' in value) return isConditionalReference(value.ref);
+  if (value.op === 'floor') return isConditionalExpression(value.value);
+  if (value.op === 'clamp') {
+    return (
+      isConditionalExpression(value.value) &&
+      isConditionalExpression(value.min) &&
+      isConditionalExpression(value.max)
+    );
+  }
+  return (
+    ['add', 'subtract', 'multiply', 'divide', 'min', 'max'].includes(
+      String(value.op),
+    ) &&
+    isConditionalExpression(value.left) &&
+    isConditionalExpression(value.right)
+  );
+}
+
 function isOperand(value: unknown) {
   return scalar(value) || isReference(value);
 }
@@ -527,6 +655,17 @@ function isMutation(value: unknown): value is ClauseMutation {
         isExpression(value.value))
     );
   }
+  if (value.kind === 'extend_duration') {
+    return value.target === 'assigned_ability' && isExpression(value.seconds);
+  }
+  if (value.kind === 'start_cooldown_on_max') {
+    return (
+      typeof value.stackPool === 'string' &&
+      Boolean(value.stackPool.trim()) &&
+      typeof value.cooldownPool === 'string' &&
+      Boolean(value.cooldownPool.trim())
+    );
+  }
   return (
     ['add', 'set', 'consume', 'derive'].includes(value.kind) &&
     typeof value.pool === 'string' &&
@@ -724,30 +863,21 @@ function parseOutcome(
   ) {
     errors.push(`${path} description slot must be a positive integer.`);
   }
-  if (value.targeting !== undefined) {
-    if (
-      !object(value.targeting) ||
-      value.targeting.kind !== 'within_radius' ||
-      !['allies', 'enemies'].includes(String(value.targeting.population)) ||
-      !finite(value.targeting.radiusMeters) ||
-      value.targeting.radiusMeters <= 0
-    ) {
-      errors.push(`${path} has invalid radius targeting.`);
-    } else if (
-      value.targeting.population === 'allies' &&
-      value.scope !== 'allies' &&
-      value.scope !== 'self_and_allies'
-    ) {
-      errors.push(
-        `${path} ally radius targeting requires allies or self-and-allies scope.`,
-      );
-    } else if (
-      value.targeting.population === 'enemies' &&
-      value.scope !== 'target'
-    ) {
-      errors.push(`${path} enemy radius targeting requires target scope.`);
-    }
+  if (
+    value.probabilityPercent !== undefined &&
+    (!finite(value.probabilityPercent) ||
+      value.probabilityPercent < 0 ||
+      value.probabilityPercent > 100)
+  ) {
+    errors.push(`${path} probability must be from 0 through 100 percent.`);
   }
+  const targetingError = mechanicOutcomeTargetingError({
+    kind,
+    scope: value.scope as MechanicOutcomeScope,
+    phase: value.phase as OutcomePhase,
+    targeting: value.targeting,
+  });
+  if (targetingError) errors.push(`${path} ${targetingError}`);
   if (!object(value.variants)) {
     errors.push(`${path} variants must be an object.`);
     return null;
@@ -773,7 +903,7 @@ function parseOutcome(
     }
     if (
       configured.expression !== undefined &&
-      !isExpression(configured.expression)
+      !isConditionalExpression(configured.expression)
     ) {
       errors.push(
         `${path} variant "${variant}" has an invalid value expression.`,
@@ -828,6 +958,22 @@ function parseClauses(
     if (candidate.weight !== undefined && !isExpression(candidate.weight)) {
       errors.push(`${path} has an invalid weight expression.`);
     }
+    if (
+      candidate.procChancePercent !== undefined &&
+      (!finite(candidate.procChancePercent) ||
+        candidate.procChancePercent < 0 ||
+        candidate.procChancePercent > 100)
+    ) {
+      errors.push(`${path} proc chance must be from 0 through 100 percent.`);
+    }
+    if (
+      candidate.requiresAssignedAbilityActive !== undefined &&
+      typeof candidate.requiresAssignedAbilityActive !== 'boolean'
+    ) {
+      errors.push(
+        `${path} assigned-ability activity requirement must be a boolean.`,
+      );
+    }
     if (
       candidate.cooldownSeconds !== undefined &&
       (!finite(candidate.cooldownSeconds) || candidate.cooldownSeconds <= 0)
@@ -873,6 +1019,37 @@ function parseClauses(
   return clauses;
 }
 
+function resolveVariantExpression(
+  expression: ConditionalNumericExpression,
+  variantValue: number,
+): NumericExpression {
+  if (typeof expression === 'number') return expression;
+  if ('ref' in expression) {
+    return expression.ref.source === 'variant_value'
+      ? variantValue
+      : { ref: expression.ref };
+  }
+  if (expression.op === 'floor') {
+    return {
+      op: 'floor',
+      value: resolveVariantExpression(expression.value, variantValue),
+    };
+  }
+  if (expression.op === 'clamp') {
+    return {
+      op: 'clamp',
+      value: resolveVariantExpression(expression.value, variantValue),
+      min: resolveVariantExpression(expression.min, variantValue),
+      max: resolveVariantExpression(expression.max, variantValue),
+    };
+  }
+  return {
+    op: expression.op,
+    left: resolveVariantExpression(expression.left, variantValue),
+    right: resolveVariantExpression(expression.right, variantValue),
+  };
+}
+
 function programsForDraft(
   draft: ConditionalMechanicDraftV1,
   options: ParseConditionalMechanicDraftOptions,
@@ -902,6 +1079,15 @@ function programsForDraft(
           ? {}
           : { cooldownSeconds: clause.cooldownSeconds }),
         ...(clause.weight === undefined ? {} : { weight: clause.weight }),
+        ...(clause.procChancePercent === undefined
+          ? {}
+          : { procChancePercent: clause.procChancePercent }),
+        ...(clause.requiresAssignedAbilityActive === undefined
+          ? {}
+          : {
+              requiresAssignedAbilityActive:
+                clause.requiresAssignedAbilityActive,
+            }),
         mutations: clause.mutations,
         outcomes: clause.outcomes.map(
           ({
@@ -912,7 +1098,13 @@ function programsForDraft(
           }) => ({
             ...outcome,
             id: outcomeKey,
-            value: variants[variant].expression ?? variants[variant].value,
+            value:
+              variants[variant].expression === undefined
+                ? variants[variant].value
+                : resolveVariantExpression(
+                    variants[variant].expression,
+                    variants[variant].value,
+                  ),
           }),
         ),
       })),

src/lib/calculations/mechanic-persistence.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, it } from 'vitest';
+import { evaluateMechanicProgram } from './mechanic.js';
 import {
   adaptConditionalEffectProgram,
   type ConditionalEffectClauseRow,
@@ -200,6 +201,143 @@ describe('conditional-effect persistence adapter', () => {
     });
   });
 
+  it('preserves event-target area damage semantics on an outcome', () => {
+    const result = adaptConditionalEffectProgram(
+      {
+        rule: rule(),
+        statePools: [],
+        clauses: [
+          clause({
+            trigger_id: null,
+            event_kind: 'weapon_hit',
+            state_pool_id: null,
+            mutations_json: '[]',
+          }),
+        ],
+        outcomes: [
+          outcome({
+            application_kind: 'direct_damage',
+            effect_scope: 'target',
+            stat_attribute_id: null,
+            application_phase: 'after_event',
+            state_pool_id: null,
+            targeting_json: JSON.stringify({
+              kind: 'event_target_area',
+              center: 'event_target',
+              validTargets: 'enemies',
+              radiusMeters: 5,
+            }),
+          }),
+        ],
+        triggers: [],
+      },
+      { name: 'Critical Explosion', variantKey: 'I' },
+    );
+
+    expect(result.errors).toEqual([]);
+    expect(result.program?.clauses[0].outcomes?.[0]).toMatchObject({
+      kind: 'direct_damage',
+      scope: 'target',
+      phase: 'after_event',
+      targeting: {
+        kind: 'event_target_area',
+        center: 'event_target',
+        validTargets: 'enemies',
+        radiusMeters: 5,
+      },
+    });
+  });
+
+  it('adapts assigned-ability activity predicates for kill and assist events', () => {
+    for (const eventKind of ['enemy_killed', 'assist'] as const) {
+      const result = adaptConditionalEffectProgram(
+        {
+          rule: rule(),
+          statePools: [],
+          clauses: [
+            clause({
+              trigger_id: null,
+              event_kind: eventKind,
+              parameters_json: '{}',
+              state_pool_id: null,
+              mutations_json: '[]',
+              conditions_json: JSON.stringify({
+                kind: 'compare',
+                left: {
+                  source: 'event',
+                  path: 'values.assignedAbilityActive',
+                },
+                operator: 'eq',
+                right: true,
+              }),
+            }),
+          ],
+          outcomes: [outcome({ state_pool_id: null })],
+          triggers: [],
+        },
+        { variantKey: 'I' },
+      );
+
+      expect(result).toMatchObject({ status: 'READY', errors: [] });
+      expect(result.program?.clauses[0]).toMatchObject({
+        when: eventKind,
+        if: {
+          kind: 'compare',
+          left: {
+            source: 'event',
+            path: 'values.assignedAbilityActive',
+          },
+          operator: 'eq',
+          right: true,
+        },
+      });
+    }
+  });
+
+  it('preserves outcome probability metadata', () => {
+    const result = adaptConditionalEffectProgram(
+      {
+        rule: rule(),
+        statePools: [],
+        clauses: [
+          clause({
+            trigger_id: null,
+            event_kind: 'shot_fired',
+            recipe_parameters_json: JSON.stringify({
+              procChancePercent: 10,
+              requiresAssignedAbilityActive: true,
+            }),
+            parameters_json: '{}',
+            state_pool_id: null,
+            mutations_json: '[]',
+          }),
+        ],
+        outcomes: [
+          outcome({
+            state_pool_id: null,
+            application_kind: 'restore_ammo',
+            effect_scope: 'self',
+            stat_attribute_id: null,
+            resource_kind: 'ammo',
+            probability_percent: 29,
+          }),
+        ],
+        triggers: [],
+      },
+      { variantKey: 'I' },
+    );
+
+    expect(result).toMatchObject({ status: 'READY', errors: [] });
+    expect(result.program?.clauses[0].outcomes?.[0]).toMatchObject({
+      probabilityPercent: 29,
+      resource: 'ammo',
+    });
+    expect(result.program?.clauses[0]).toMatchObject({
+      procChancePercent: 10,
+      requiresAssignedAbilityActive: true,
+    });
+  });
+
   it('loads continuous restoration delivery metadata', () => {
     const result = adaptConditionalEffectProgram(
       {
@@ -713,7 +851,7 @@ describe('conditional-effect persistence adapter', () => {
       left: {
         source: 'combat',
         path: 'currentHealthPercent',
-        timing: 'current',
+        timing: 'pre_event',
       },
       operator: 'lt',
       right: 25,
@@ -775,4 +913,77 @@ describe('conditional-effect persistence adapter', () => {
       if: condition,
     });
   });
+  it('preserves a variant-value expression in persisted JSON while adapting it to the selected row value', () => {
+    const sourceExpression = {
+      op: 'multiply',
+      left: { ref: { source: 'variant_value' } },
+      right: {
+        op: 'add',
+        left: 1,
+        right: {
+          op: 'divide',
+          left: {
+            ref: {
+              source: 'equipment',
+              path: 'protocolTalentUpgrades',
+            },
+          },
+          right: 5,
+        },
+      },
+    };
+    const serializedExpression = JSON.stringify(sourceExpression);
+    const persistedOutcome = outcome({
+      state_pool_id: null,
+      value: 7.25,
+      value_expression_json: serializedExpression,
+      value_scaling: 'flat',
+      application_phase: 'on_event',
+    });
+    const result = adaptConditionalEffectProgram(
+      {
+        rule: rule(),
+        statePools: [],
+        clauses: [
+          clause({
+            trigger_id: null,
+            event_kind: 'tick',
+            parameters_json: '{}',
+            state_pool_id: null,
+            mutations_json: '[]',
+          }),
+        ],
+        outcomes: [persistedOutcome],
+        triggers: [],
+      },
+      { variantKey: 'I' },
+    );
+
+    expect(result).toMatchObject({ status: 'READY', errors: [] });
+    expect(persistedOutcome.value).toBe(7.25);
+    expect(persistedOutcome.value_expression_json).toBe(serializedExpression);
+    expect(JSON.parse(String(persistedOutcome.value_expression_json))).toEqual(
+      sourceExpression,
+    );
+    expect(result.program?.clauses[0].outcomes?.[0].value).toEqual({
+      op: 'multiply',
+      left: 7.25,
+      right: sourceExpression.right,
+    });
+
+    if (!result.program) return;
+    const runtime = evaluateMechanicProgram(
+      result.program,
+      [{ kind: 'tick', at: 0 }],
+      { mode: 'custom', encounterSeconds: 1 },
+      undefined,
+      { protocolTalentUpgrades: 5 },
+    );
+    expect(runtime.status).toBe('OK');
+    expect(runtime.outcomes[0]).toMatchObject({
+      outcomeId: 'outcome-1',
+      value: 14.5,
+      resolvedValue: 14.5,
+    });
+  });
 });

src/lib/calculations/mechanic-persistence.ts

@@ -13,6 +13,7 @@ import {
   type Predicate,
   type Reducer,
   type ScenarioInputDefinition,
+  type ValueReference,
 } from './mechanic.js';
 
 type DatabaseValue = string | number | bigint | boolean | null | undefined;
@@ -54,6 +55,7 @@ export type ConditionalEffectClauseRow = {
   event_kind?: DatabaseValue;
   recipe_key?: DatabaseValue;
   parameters_json: DatabaseValue;
+  recipe_parameters_json?: DatabaseValue;
   conditions_json: DatabaseValue;
   reducer_json: DatabaseValue;
   weight_expression_json?: DatabaseValue;
@@ -85,6 +87,7 @@ export type ConditionalEffectOutcomeRow = {
   delivery_mode?: DatabaseValue;
   delivery_duration_seconds?: DatabaseValue;
   targeting_json?: DatabaseValue;
+  probability_percent?: DatabaseValue;
   value_scaling: DatabaseValue;
   unit: DatabaseValue;
   damage_basis: DatabaseValue;
@@ -205,14 +208,16 @@ function isValueReference(value: unknown) {
   if (value.source === 'event' || value.source === 'equipment') {
     return typeof value.path === 'string' && Boolean(value.path.trim());
   }
+  if (value.source === 'assigned_ability') {
+    return value.path === 'active' || value.path === 'remainingDurationSeconds';
+  }
   if (value.source === 'combat') {
     return (
       typeof value.path === 'string' &&
       Boolean(value.path.trim()) &&
       (value.timing === undefined ||
         value.timing === 'pre_event' ||
-        value.timing === 'current') &&
-      !(value.path === 'currentHealthPercent' && value.timing === 'pre_event')
+        value.timing === 'current')
     );
   }
   if (value.source === 'attribute') {
@@ -253,6 +258,55 @@ function isNumericExpression(value: unknown): value is NumericExpression {
   );
 }
 
+function resolveVariantExpression(
+  value: unknown,
+  variantValue: number,
+): NumericExpression | null {
+  if (finite(value)) return value;
+  if (!object(value)) return null;
+  if ('ref' in value) {
+    if (
+      object(value.ref) &&
+      value.ref.source === 'variant_value' &&
+      Object.keys(value.ref).length === 1
+    ) {
+      return variantValue;
+    }
+    return isValueReference(value.ref)
+      ? { ref: value.ref as ValueReference }
+      : null;
+  }
+  if (value.op === 'floor') {
+    const nested = resolveVariantExpression(value.value, variantValue);
+    return nested === null ? null : { op: 'floor', value: nested };
+  }
+  if (value.op === 'clamp') {
+    const nested = resolveVariantExpression(value.value, variantValue);
+    const min = resolveVariantExpression(value.min, variantValue);
+    const max = resolveVariantExpression(value.max, variantValue);
+    return nested === null || min === null || max === null
+      ? null
+      : { op: 'clamp', value: nested, min, max };
+  }
+  if (
+    !['add', 'subtract', 'multiply', 'divide', 'min', 'max'].includes(
+      String(value.op),
+    )
+  ) {
+    return null;
+  }
+  const left = resolveVariantExpression(value.left, variantValue);
+  const right = resolveVariantExpression(value.right, variantValue);
+  return left === null || right === null
+    ? null
+    : {
+        op: value.op as
+          'add' | 'subtract' | 'multiply' | 'divide' | 'min' | 'max',
+        left,
+        right,
+      };
+}
+
 function isPredicate(value: unknown): value is Predicate {
   if (!object(value) || typeof value.kind !== 'string') return false;
   if (value.kind === 'true') return true;
@@ -313,6 +367,19 @@ function isMutation(value: unknown): value is ClauseMutation {
         isNumericExpression(value.value))
     );
   }
+  if (value.kind === 'extend_duration') {
+    return (
+      value.target === 'assigned_ability' && isNumericExpression(value.seconds)
+    );
+  }
+  if (value.kind === 'start_cooldown_on_max') {
+    return (
+      typeof value.stackPool === 'string' &&
+      Boolean(value.stackPool.trim()) &&
+      typeof value.cooldownPool === 'string' &&
+      Boolean(value.cooldownPool.trim())
+    );
+  }
   return (
     ['add', 'set', 'consume', 'derive'].includes(value.kind) &&
     typeof value.pool === 'string' &&
@@ -656,11 +723,8 @@ function parseOutcome(
   ) {
     errors.push(`${path} has an unsupported application phase.`);
   }
-  let value: NumericExpression = requiredNumber(
-    row.value,
-    `${path} value`,
-    errors,
-  );
+  const variantValue = requiredNumber(row.value, `${path} value`, errors);
+  let value: NumericExpression = variantValue;
   if (
     row.value_expression_json !== null &&
     row.value_expression_json !== undefined &&
@@ -672,7 +736,8 @@ function parseOutcome(
       errors,
     );
     if (parsed.ok) {
-      if (isNumericExpression(parsed.value)) value = parsed.value;
+      const resolved = resolveVariantExpression(parsed.value, variantValue);
+      if (resolved !== null) value = resolved;
       else
         errors.push(
           `${path} value expression is not a valid numeric expression.`,
@@ -731,6 +796,17 @@ function parseOutcome(
   if (delivery === 'instant' && durationSeconds !== null) {
     errors.push(`${path} instant delivery cannot set a duration.`);
   }
+  const probabilityPercent = number(row.probability_percent);
+  if (
+    row.probability_percent !== undefined &&
+    row.probability_percent !== null &&
+    row.probability_percent !== '' &&
+    (probabilityPercent === null ||
+      probabilityPercent < 0 ||
+      probabilityPercent > 100)
+  ) {
+    errors.push(`${path} probability must be from 0 through 100 percent.`);
+  }
   let targeting: MechanicOutcome['targeting'] | undefined;
   if (
     row.targeting_json !== null &&
@@ -766,6 +842,7 @@ function parseOutcome(
         ? { delivery, durationSeconds }
         : {}),
       ...(targeting ? { targeting } : {}),
+      ...(probabilityPercent === null ? {} : { probabilityPercent }),
       ...(kind === 'attribute_modifier' && nullableText(row.stat_attribute_id)
         ? { attributeId: text(row.stat_attribute_id) }
         : {}),
@@ -903,7 +980,7 @@ export function adaptConditionalEffectProgram(
       continue;
     }
     const parametersJson = parseJson(
-      row.parameters_json,
+      row.recipe_parameters_json ?? row.parameters_json,
       `${path} parameters`,
       errors,
     );
@@ -976,6 +1053,25 @@ export function adaptConditionalEffectProgram(
       }
     }
     const recipeKey = nullableText(row.recipe_key);
+    const procChancePercent = parametersJson.value.procChancePercent;
+    if (
+      procChancePercent !== undefined &&
+      (!finite(procChancePercent) ||
+        procChancePercent < 0 ||
+        procChancePercent > 100)
+    ) {
+      errors.push(`${path} proc chance must be from 0 through 100 percent.`);
+    }
+    const requiresAssignedAbilityActive =
+      parametersJson.value.requiresAssignedAbilityActive;
+    if (
+      requiresAssignedAbilityActive !== undefined &&
+      typeof requiresAssignedAbilityActive !== 'boolean'
+    ) {
+      errors.push(
+        `${path} assigned-ability activity requirement must be a boolean.`,
+      );
+    }
     clauses.push({
       id,
       label: text(row.label) || text(row.clause_key) || undefined,
@@ -989,6 +1085,10 @@ export function adaptConditionalEffectProgram(
         ? {}
         : { cooldownSeconds: number(row.cooldown_seconds) as number }),
       ...(weight === undefined ? {} : { weight }),
+      ...(typeof procChancePercent === 'number' ? { procChancePercent } : {}),
+      ...(typeof requiresAssignedAbilityActive === 'boolean'
+        ? { requiresAssignedAbilityActive }
+        : {}),
       mutations: mutationsJson.value,
       ...(clauseOutcomes.length ? { outcomes: clauseOutcomes } : {}),
     });

src/lib/calculations/mechanic.test.ts

@@ -19,6 +19,354 @@ const custom = (
   inputs,
 });
 
+const closeAndPersonalProgram = (
+  resolvedVariantValue: number,
+): MechanicProgram => ({
+  id: 'close-and-personal-engineering',
+  name: 'Close and Personal Engineering',
+  pools: [
+    {
+      key: 'eligible-allies',
+      label: 'Eligible Allies',
+      scope: 'agent',
+      initial: 0,
+      min: 0,
+      max: 20,
+    },
+  ],
+  clauses: [
+    {
+      id: 'sample-eligible-allies',
+      when: 'proximity_snapshot',
+      reducer: {
+        kind: 'derived_scalar',
+        value: {
+          ref: {
+            source: 'event',
+            path: 'values.alliesWithin30MetersWithAgentGrantedBuff',
+          },
+        },
+      },
+      mutations: [
+        {
+          kind: 'derive',
+          pool: 'eligible-allies',
+          value: { ref: { source: 'reducer' } },
+        },
+      ],
+    },
+    {
+      id: 'resolve-engineering',
+      when: 'tick',
+      reducer: { kind: 'none' },
+      mutations: [{ kind: 'none' }],
+      outcomes: [
+        {
+          id: 'engineering',
+          label: 'Engineering',
+          phase: 'on_event',
+          kind: 'attribute_modifier',
+          scope: 'self',
+          basis: 'flat',
+          attributeId: 'engineering',
+          value: {
+            op: 'multiply',
+            left: {
+              op: 'multiply',
+              left: { ref: { source: 'pool', pool: 'eligible-allies' } },
+              right: resolvedVariantValue,
+            },
+            right: {
+              op: 'add',
+              left: 1,
+              right: {
+                op: 'divide',
+                left: {
+                  ref: {
+                    source: 'equipment',
+                    path: 'protocolTalentUpgrades',
+                  },
+                },
+                right: 5,
+              },
+            },
+          },
+        },
+      ],
+    },
+  ],
+});
+
+describe('deterministic mechanic probabilities and assigned abilities', () => {
+  it('rolls outcome probability independently with a reproducible seed and preserves a refreshed window', () => {
+    const program: MechanicProgram = {
+      id: 'ammo-refill',
+      name: 'Ammo Refill',
+      pools: [
+        {
+          key: 'tactical-link-window',
+          label: 'Tactical Link window',
+          scope: 'agent',
+          initial: 0,
+          min: 0,
+          max: 1,
+          expiresAfterSeconds: 6,
+        },
+      ],
+      clauses: [
+        {
+          id: 'start-window',
+          when: 'signature_ability_deployed',
+          reducer: { kind: 'none' },
+          mutations: [{ kind: 'set', pool: 'tactical-link-window', value: 1 }],
+        },
+        {
+          id: 'refresh-window',
+          when: 'enemy_killed',
+          reducer: { kind: 'none' },
+          mutations: [{ kind: 'set', pool: 'tactical-link-window', value: 1 }],
+        },
+        {
+          id: 'recover-ammo',
+          when: 'shot_fired',
+          if: {
+            kind: 'compare',
+            left: { source: 'pool', pool: 'tactical-link-window' },
+            operator: 'eq',
+            right: 1,
+          },
+          reducer: { kind: 'none' },
+          mutations: [],
+          outcomes: [
+            {
+              id: 'recover-one-ammo',
+              label: 'Recover one ammo',
+              phase: 'after_event',
+              kind: 'restoration',
+              scope: 'self',
+              basis: 'flat',
+              resource: 'ammo',
+              value: 1,
+              probabilityPercent: 29,
+            },
+          ],
+        },
+      ],
+    };
+    const events = [
+      {
+        kind: 'signature_ability_deployed' as const,
+        at: 0,
+        values: { assignedAbilityDurationSeconds: 6 },
+      },
+      { kind: 'shot_fired' as const, at: 1 },
+      { kind: 'shot_fired' as const, at: 2 },
+      { kind: 'enemy_killed' as const, at: 5 },
+      { kind: 'shot_fired' as const, at: 6 },
+      { kind: 'shot_fired' as const, at: 11 },
+    ];
+    const first = evaluateMechanicProgram(
+      program,
+      events,
+      { mode: 'custom', encounterSeconds: 12, randomSeed: 1 },
+      { maxHealth: 100, currentHealth: 100, maxAmmo: 20, currentAmmo: 5 },
+    );
+    const second = evaluateMechanicProgram(
+      program,
+      events,
+      { mode: 'custom', encounterSeconds: 12, randomSeed: 1 },
+      { maxHealth: 100, currentHealth: 100, maxAmmo: 20, currentAmmo: 5 },
+    );
+
+    expect(first.status).toBe('OK');
+    expect(first.randomSeed).toBe(1);
+    expect(first.outcomes.map((outcome) => outcome.at)).toEqual([2]);
+    expect(first.outcomes[0]).toMatchObject({
+      probabilityPercent: 29,
+      probabilityRoll: expect.any(Number),
+      appliedValue: 1,
+    });
+    expect(first.finalCombat?.currentAmmo).toBe(6);
+    expect(second.outcomes).toEqual(first.outcomes);
+  });
+
+  it('gates a proc before mutations, extends a live assigned ability, and starts cooldown on the eighth stack', () => {
+    const program: MechanicProgram = {
+      id: 'tactical-loop',
+      name: 'Tactical Loop',
+      pools: [
+        {
+          key: 'extension-stacks',
+          label: 'Extension stacks',
+          scope: 'agent',
+          initial: 7,
+          min: 0,
+          max: 8,
+        },
+        {
+          key: 'extension-cooldown',
+          label: 'Extension cooldown',
+          scope: 'agent',
+          initial: 0,
+          min: 0,
+          max: 1,
+          expiresAfterSeconds: 15,
+        },
+      ],
+      clauses: [
+        {
+          id: 'extend-tactical-link',
+          when: 'skill_hit',
+          if: {
+            kind: 'compare',
+            left: { source: 'pool', pool: 'extension-cooldown' },
+            operator: 'eq',
+            right: 0,
+          },
+          requiresAssignedAbilityActive: true,
+          procChancePercent: 10,
+          reducer: { kind: 'none' },
+          mutations: [
+            { kind: 'add', pool: 'extension-stacks', value: 1 },
+            {
+              kind: 'extend_duration',
+              target: 'assigned_ability',
+              seconds: 0.3,
+            },
+            {
+              kind: 'start_cooldown_on_max',
+              stackPool: 'extension-stacks',
+              cooldownPool: 'extension-cooldown',
+            },
+          ],
+        },
+      ],
+    };
+    const success = evaluateMechanicProgram(
+      program,
+      [
+        {
+          kind: 'signature_ability_deployed',
+          at: 0,
+          values: { assignedAbilityDurationSeconds: 6 },
+        },
+        { kind: 'skill_hit', at: 5.9 },
+        { kind: 'skill_hit', at: 6.1 },
+      ],
+      { mode: 'custom', encounterSeconds: 7, randomSeed: 7 },
+    );
+    const failed = evaluateMechanicProgram(
+      program,
+      [
+        {
+          kind: 'signature_ability_deployed',
+          at: 0,
+          values: { assignedAbilityDurationSeconds: 6 },
+        },
+        { kind: 'skill_hit', at: 5.9 },
+      ],
+      { mode: 'custom', encounterSeconds: 7, randomSeed: 1 },
+    );
+
+    expect(success.status).toBe('OK');
+    expect(success.emissions).toHaveLength(1);
+    const extension = success.emissions[0].mutations.find(
+      (mutation) => mutation.kind === 'extend_duration',
+    );
+    expect(extension).toMatchObject({ kind: 'extend_duration' });
+    expect(extension?.before).toBeCloseTo(0.1);
+    expect(extension?.after).toBeCloseTo(0.4);
+    expect(success.emissions[0].mutations).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          kind: 'start_cooldown_on_max',
+          pool: 'extension-cooldown',
+          after: 1,
+        }),
+      ]),
+    );
+    expect(success.finalState).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          pool: 'extension-stacks',
+          value: 8,
+        }),
+        expect.objectContaining({
+          pool: 'extension-cooldown',
+          value: 1,
+          expiresAt: 20.9,
+        }),
+      ]),
+    );
+    expect(failed.emissions).toEqual([]);
+  });
+
+  it('does not extend an assigned ability at its exact expiry and rejects invalid chance data', () => {
+    const boundaryProgram: MechanicProgram = {
+      id: 'exact-expiry',
+      name: 'Exact expiry',
+      clauses: [
+        {
+          id: 'extend',
+          when: 'skill_hit',
+          requiresAssignedAbilityActive: true,
+          procChancePercent: 100,
+          reducer: { kind: 'none' },
+          mutations: [
+            {
+              kind: 'extend_duration',
+              target: 'assigned_ability',
+              seconds: 0.3,
+            },
+          ],
+        },
+      ],
+    };
+    expect(
+      evaluateMechanicProgram(
+        boundaryProgram,
+        [
+          {
+            kind: 'signature_ability_deployed',
+            at: 0,
+            values: { assignedAbilityDurationSeconds: 1 },
+          },
+          { kind: 'skill_hit', at: 1 },
+        ],
+        { mode: 'custom', encounterSeconds: 2, randomSeed: 7 },
+      ).emissions,
+    ).toEqual([]);
+
+    const invalid = structuredClone(boundaryProgram);
+    invalid.clauses[0].procChancePercent = 101;
+    expect(validateMechanicProgram(invalid)).toMatchObject({
+      ok: false,
+      errors: [
+        expect.stringContaining('proc chance must be from 0 through 100'),
+      ],
+    });
+    const invalidOutcome = structuredClone(boundaryProgram);
+    invalidOutcome.clauses[0].outcomes = [
+      {
+        id: 'bad-chance',
+        label: 'Bad chance',
+        phase: 'after_event',
+        kind: 'marker',
+        scope: 'self',
+        basis: 'flat',
+        value: 1,
+        probabilityPercent: -1,
+      },
+    ];
+    expect(validateMechanicProgram(invalidOutcome)).toMatchObject({
+      ok: false,
+      errors: [
+        expect.stringContaining('probability must be from 0 through 100'),
+      ],
+    });
+  });
+});
+
 describe('structured mechanic runtime', () => {
   it('advertises the authoritative weapon-hit target and headshot fields', () => {
     expect(MECHANIC_EVENT_REGISTRY.weapon_hit).toMatchObject({
@@ -32,6 +380,11 @@ describe('structured mechanic runtime', () => {
         },
         { path: 'values.headshot', label: 'Headshot', type: 'boolean' },
         { path: 'values.critical', label: 'Critical hit', type: 'boolean' },
+        {
+          path: 'values.aiming',
+          label: 'Aiming down sights',
+          type: 'boolean',
+        },
         {
           path: 'values.behindCover',
           label: 'Agent behind cover',
@@ -46,6 +399,23 @@ describe('structured mechanic runtime', () => {
     });
   });
 
+  it('advertises the optional non-negative integer proximity count without making snapshots strict', () => {
+    const definition = MECHANIC_EVENT_REGISTRY.proximity_snapshot;
+    const countField = definition.fields?.find(
+      ({ path }) => path === 'values.alliesWithin30MetersWithAgentGrantedBuff',
+    );
+
+    expect(definition.strictFields).not.toBe(true);
+    expect(countField).toEqual({
+      path: 'values.alliesWithin30MetersWithAgentGrantedBuff',
+      label: 'Allies within 30 meters with an Agent-granted buff',
+      type: 'number',
+      minimum: 0,
+      integer: true,
+    });
+    expect(countField?.required).not.toBe(true);
+  });
+
   it('advertises imported support and equipment-use trigger events', () => {
     expect(MECHANIC_EVENT_REGISTRY.ally_downed).toMatchObject({
       key: 'ally_downed',
@@ -305,6 +675,161 @@ describe('structured mechanic runtime', () => {
     });
   });
 
+  it('matches kills and assists only while the assigned ability is active', () => {
+    const weaponCriticalHitChance = 'weapon-critical-hit-chance';
+    const activeOutcome = {
+      id: 'tactical-link-critical-chance',
+      label: 'Weapon Critical Hit Chance',
+      phase: 'while_active' as const,
+      kind: 'attribute_modifier' as const,
+      scope: 'self' as const,
+      basis: 'flat' as const,
+      value: 10.2,
+      attributeId: weaponCriticalHitChance,
+      statePool: 'tactical-link-kill-bonus',
+    };
+    const activePredicate = {
+      kind: 'compare' as const,
+      left: {
+        source: 'event' as const,
+        path: 'values.assignedAbilityActive',
+      },
+      operator: 'eq' as const,
+      right: true,
+    };
+    const program: MechanicProgram = {
+      id: 'tactical-link-kill-bonus',
+      name: 'Tactical Link Kill Bonus',
+      pools: [
+        {
+          key: 'tactical-link-kill-bonus',
+          label: 'Tactical Link kill bonus',
+          scope: 'agent',
+          initial: 0,
+          min: 0,
+          max: 1,
+          expiresAfterSeconds: 10,
+        },
+      ],
+      clauses: [
+        {
+          id: 'kill-during-tactical-link',
+          when: 'enemy_killed',
+          if: activePredicate,
+          reducer: { kind: 'none' },
+          mutations: [
+            { kind: 'set', pool: 'tactical-link-kill-bonus', value: 1 },
+          ],
+          outcomes: [activeOutcome],
+        },
+        {
+          id: 'assist-during-tactical-link',
+          when: 'assist',
+          if: activePredicate,
+          reducer: { kind: 'none' },
+          mutations: [
+            { kind: 'set', pool: 'tactical-link-kill-bonus', value: 1 },
+          ],
+          outcomes: [{ ...activeOutcome }],
+        },
+      ],
+    };
+
+    expect(validateMechanicProgram(program)).toMatchObject({ ok: true });
+    const result = evaluateMechanicProgram(
+      program,
+      [
+        {
+          kind: 'enemy_killed',
+          at: 0,
+          values: { assignedAbilityActive: true },
+        },
+        {
+          kind: 'assist',
+          at: 4,
+          values: { assignedAbilityActive: false },
+        },
+        { kind: 'enemy_killed', at: 6 },
+        {
+          kind: 'assist',
+          at: 10,
+          values: { assignedAbilityActive: true },
+        },
+      ],
+      custom(19),
+      {
+        maxHealth: 1_000,
+        currentHealth: 1_000,
+        attributes: { [weaponCriticalHitChance]: 0 },
+      },
+    );
+
+    expect(result.status).toBe('OK');
+    expect(result.outcomes.map((outcome) => outcome.at)).toEqual([0, 10]);
+    expect(result.finalState).toContainEqual(
+      expect.objectContaining({
+        pool: 'tactical-link-kill-bonus',
+        value: 1,
+        expiresAt: 20,
+      }),
+    );
+  });
+
+  it('rejects invalid assigned-ability activity predicates and event values', () => {
+    const program: MechanicProgram = {
+      id: 'assigned-ability-activity',
+      name: 'Assigned ability activity',
+      clauses: [
+        {
+          id: 'kill',
+          when: 'enemy_killed',
+          if: {
+            kind: 'compare',
+            left: {
+              source: 'event',
+              path: 'values.assignedAbilityActive',
+            },
+            operator: 'eq',
+            right: true,
+          },
+          reducer: { kind: 'none' },
+          mutations: [],
+        },
+      ],
+    };
+    const invalidPredicate = structuredClone(program);
+    invalidPredicate.clauses[0].if = {
+      kind: 'compare',
+      left: { source: 'event', path: 'values.assignedAbilityActive' },
+      operator: 'eq',
+      right: 'yes',
+    };
+    expect(validateMechanicProgram(invalidPredicate)).toMatchObject({
+      ok: false,
+      errors: [
+        expect.stringContaining('Assigned ability active with a boolean value'),
+      ],
+    });
+    expect(
+      evaluateMechanicProgram(
+        program,
+        [
+          {
+            kind: 'enemy_killed',
+            at: 0,
+            values: { assignedAbilityActive: 'yes' },
+          } as unknown as MechanicEvent,
+        ],
+        custom(1),
+      ),
+    ).toMatchObject({
+      status: 'INVALID',
+      errors: [
+        expect.stringContaining('Assigned ability active must be a boolean'),
+      ],
+    });
+  });
+
   it('executes imported talent trigger families as first-class events', () => {
     const eventKinds: MechanicEventKind[] = [
       'ally_downed',
@@ -876,6 +1401,7 @@ describe('structured mechanic runtime', () => {
       ],
       custom(),
     );
+    expect(result.status).toBe('OK');
     expect(result.finalState[0].value).toBe(2);
     const maximum = evaluateMechanicProgram(program, [], {
       mode: 'maximum',
@@ -884,6 +1410,81 @@ describe('structured mechanic runtime', () => {
     expect(maximum.finalState[0].value).toBe(3);
   });
 
+  it.each([
+    { count: 0, upgrades: 0, multiplier: 0 },
+    { count: 3, upgrades: 0, multiplier: 3 },
+    { count: 3, upgrades: 5, multiplier: 6 },
+  ])(
+    'resolves Close-and-Personal-style Engineering for count $count and $upgrades OS upgrades',
+    ({ count, upgrades, multiplier }) => {
+      const resolvedVariantValue = 7.25;
+      const result = evaluateMechanicProgram(
+        closeAndPersonalProgram(resolvedVariantValue),
+        [
+          {
+            kind: 'proximity_snapshot',
+            at: 0,
+            values: {
+              alliesWithin30MetersWithAgentGrantedBuff: count,
+            },
+          },
+          { kind: 'tick', at: 1 },
+        ],
+        custom(),
+        undefined,
+        { protocolTalentUpgrades: upgrades },
+      );
+
+      expect(result.status).toBe('OK');
+      expect(result.finalState).toContainEqual(
+        expect.objectContaining({ pool: 'eligible-allies', value: count }),
+      );
+      expect(
+        result.outcomes.find(({ outcomeId }) => outcomeId === 'engineering'),
+      ).toMatchObject({
+        value: resolvedVariantValue * multiplier,
+        resolvedValue: resolvedVariantValue * multiplier,
+      });
+    },
+  );
+
+  it.each([
+    {
+      count: '2',
+      error:
+        'Allies within 30 meters with an Agent-granted buff must be a number.',
+    },
+    {
+      count: -1,
+      error:
+        'Allies within 30 meters with an Agent-granted buff must be 0 or greater.',
+    },
+    {
+      count: 1.5,
+      error:
+        'Allies within 30 meters with an Agent-granted buff must be an integer.',
+    },
+  ])('rejects invalid proximity ally count $count', ({ count, error }) => {
+    const result = evaluateMechanicProgram(
+      closeAndPersonalProgram(7.25),
+      [
+        {
+          kind: 'proximity_snapshot',
+          at: 0,
+          values: {
+            alliesWithin30MetersWithAgentGrantedBuff: count,
+          },
+        },
+      ],
+      custom(),
+      undefined,
+      { protocolTalentUpgrades: 0 },
+    );
+
+    expect(result.status).toBe('INVALID');
+    expect(result.errors).toContain(`Event 1 (Proximity snapshot) ${error}`);
+  });
+
   it('shares one movement charge pool across generation and consumption clauses', () => {
     const program: MechanicProgram = {
       id: 'mobile-charge',
@@ -2404,13 +3005,13 @@ describe('mechanic validation and pseudo-script', () => {
     ]);
   });
 
-  it('rejects pre-event timing for the derived current Health percentage', () => {
-    const invalid: MechanicProgram = {
-      id: 'invalid-health-percent',
-      name: 'Invalid Health Percent',
+  it('evaluates pre-event timing for the derived current Health percentage', () => {
+    const program: MechanicProgram = {
+      id: 'pre-event-health-percent',
+      name: 'Pre-event Health Percent',
       clauses: [
         {
-          id: 'invalid',
+          id: 'full-health-before-event',
           when: 'tick',
           if: {
             kind: 'compare',
@@ -2419,25 +3020,32 @@ describe('mechanic validation and pseudo-script', () => {
               path: 'currentHealthPercent',
               timing: 'pre_event',
             },
-            operator: 'lt',
-            right: 50,
+            operator: 'gte',
+            right: 100,
           },
           reducer: { kind: 'none' },
           mutations: [],
+          outcomes: [
+            {
+              id: 'matched',
+              label: 'Matched',
+              phase: 'on_event',
+              kind: 'marker',
+              scope: 'self',
+              basis: 'flat',
+              value: 1,
+            },
+          ],
         },
       ],
     };
-    const result = validateMechanicProgram(invalid);
-    expect(result.ok).toBe(false);
-    if (!result.ok) {
-      expect(result.errors).toEqual(
-        expect.arrayContaining([
-          expect.stringContaining(
-            'current Health percentage must use current timing',
-          ),
-        ]),
-      );
-    }
+    expect(validateMechanicProgram(program)).toMatchObject({ ok: true });
+    expect(
+      evaluateMechanicProgram(program, [{ kind: 'tick', at: 0 }], custom(1), {
+        maxHealth: 100,
+        currentHealth: 100,
+      }).outcomes.map((outcome) => outcome.outcomeId),
+    ).toEqual(['matched']);
   });
 
   it('formats nested conditions and state operations deterministically', () => {
@@ -2550,4 +3158,287 @@ describe('mechanic validation and pseudo-script', () => {
     expect(result.script).toContain('TO ALLIES WITHIN 40m');
     expect(result.script).toContain('TO ENEMIES WITHIN 20m');
   });
+
+  it('applies aimed critical-hit area damage once to each valid enemy at or inside the radius', () => {
+    const program: MechanicProgram = {
+      id: 'aimed-critical-explosion',
+      name: 'Aimed Critical Explosion',
+      clauses: [
+        {
+          id: 'aimed-critical-hit',
+          when: 'weapon_hit',
+          if: {
+            kind: 'all',
+            predicates: [
+              {
+                kind: 'compare',
+                left: { source: 'event', path: 'values.critical' },
+                operator: 'eq',
+                right: true,
+              },
+              {
+                kind: 'compare',
+                left: { source: 'event', path: 'values.aiming' },
+                operator: 'eq',
+                right: true,
+              },
+            ],
+          },
+          reducer: { kind: 'none' },
+          mutations: [],
+          outcomes: [
+            {
+              id: 'explosion',
+              label: 'Explosion',
+              phase: 'after_event',
+              kind: 'direct_damage',
+              scope: 'target',
+              basis: 'flat',
+              value: {
+                op: 'multiply',
+                left: 20,
+                right: {
+                  ref: { source: 'attribute', attributeId: 'firepower' },
+                },
+              },
+              targeting: {
+                kind: 'event_target_area',
+                center: 'event_target',
+                validTargets: 'enemies',
+                radiusMeters: 5,
+              },
+              probabilityPercent: 100,
+            },
+          ],
+        },
+      ],
+    };
+    const result = evaluateMechanicProgram(
+      program,
+      [
+        {
+          kind: 'weapon_hit',
+          at: 1,
+          targetId: 'enemy-b',
+          values: { critical: true, aiming: true },
+          areaTargetSample: {
+            center: 'event_target',
+            validTargets: [
+              {
+                entityId: 'enemy-c',
+                population: 'enemy',
+                distanceMeters: 5.001,
+              },
+              { entityId: 'enemy-b', population: 'enemy', distanceMeters: 0 },
+              { entityId: 'ally-a', population: 'ally', distanceMeters: 2 },
+              { entityId: 'enemy-a', population: 'enemy', distanceMeters: 5 },
+            ],
+          },
+        },
+      ],
+      custom(5),
+      { maxHealth: 1000, currentHealth: 1000, attributes: { firepower: 100 } },
+    );
+
+    expect(result.status).toBe('OK');
+    expect(result.outcomes.map((outcome) => outcome.targetId)).toEqual([
+      'enemy-a',
+      'enemy-b',
+    ]);
+    expect(result.outcomes.map((outcome) => outcome.appliedValue)).toEqual([
+      2000, 2000,
+    ]);
+    expect(
+      new Set(result.outcomes.map((outcome) => outcome.probabilityRoll)).size,
+    ).toBe(1);
+    expect(result.outcomes[0].probabilityRoll).not.toBeNull();
+    expect(result.script).toContain(
+      'EXPLOSION CENTERED ON EVENT TARGET; APPLY TO VALID ENEMIES WITHIN 5m',
+    );
+    const maximum = evaluateMechanicProgram(
+      program,
+      [
+        {
+          kind: 'weapon_hit',
+          at: 1,
+          targetId: 'enemy-b',
+          values: { critical: true, aiming: true },
+          areaTargetSample: {
+            center: 'event_target',
+            validTargets: [
+              { entityId: 'enemy-b', population: 'enemy', distanceMeters: 0 },
+              { entityId: 'enemy-a', population: 'enemy', distanceMeters: 5 },
+            ],
+          },
+        },
+      ],
+      { mode: 'maximum', encounterSeconds: 5 },
+      { maxHealth: 1000, currentHealth: 1000, attributes: { firepower: 100 } },
+    );
+    expect(maximum.outcomes.map((outcome) => outcome.targetId)).toEqual([
+      'enemy-a',
+      'enemy-b',
+    ]);
+    expect(
+      maximum.outcomes.every((outcome) => outcome.probabilityRoll === 0),
+    ).toBe(true);
+
+    const skillProgram: MechanicProgram = {
+      ...program,
+      id: 'skill-hit-explosion',
+      clauses: program.clauses.map((clause) => ({
+        ...clause,
+        when: 'skill_hit',
+        if: undefined,
+      })),
+    };
+    expect(validateMechanicProgram(skillProgram)).toMatchObject({ ok: true });
+    expect(
+      evaluateMechanicProgram(
+        skillProgram,
+        [
+          {
+            kind: 'skill_hit',
+            at: 1,
+            targetId: 'enemy-b',
+            areaTargetSample: {
+              center: 'event_target',
+              validTargets: [
+                { entityId: 'enemy-b', population: 'enemy', distanceMeters: 0 },
+                { entityId: 'enemy-a', population: 'enemy', distanceMeters: 5 },
+              ],
+            },
+          },
+        ],
+        custom(5),
+        {
+          maxHealth: 1000,
+          currentHealth: 1000,
+          attributes: { firepower: 100 },
+        },
+      ).outcomes.map((outcome) => outcome.targetId),
+    ).toEqual(['enemy-a', 'enemy-b']);
+  });
+
+  it('requires authoritative area evidence only when an area outcome activates', () => {
+    const program: MechanicProgram = {
+      id: 'area-evidence',
+      name: 'Area Evidence',
+      clauses: [
+        {
+          id: 'critical-hit',
+          when: 'weapon_hit',
+          if: {
+            kind: 'compare',
+            left: { source: 'event', path: 'values.critical' },
+            operator: 'eq',
+            right: true,
+          },
+          reducer: { kind: 'none' },
+          mutations: [],
+          outcomes: [
+            {
+              id: 'explosion',
+              label: 'Explosion',
+              phase: 'after_event',
+              kind: 'direct_damage',
+              scope: 'target',
+              basis: 'flat',
+              value: 1,
+              targeting: {
+                kind: 'event_target_area',
+                center: 'event_target',
+                validTargets: 'enemies',
+                radiusMeters: 5,
+              },
+            },
+          ],
+        },
+      ],
+    };
+    expect(
+      evaluateMechanicProgram(
+        program,
+        [
+          {
+            kind: 'weapon_hit',
+            at: 1,
+            targetId: 'enemy',
+            values: { critical: false },
+          },
+        ],
+        custom(5),
+      ),
+    ).toMatchObject({ status: 'OK', outcomes: [] });
+    expect(
+      evaluateMechanicProgram(
+        program,
+        [
+          {
+            kind: 'weapon_hit',
+            at: 1,
+            targetId: 'enemy',
+            values: { critical: true },
+          },
+        ],
+        custom(5),
+      ),
+    ).toMatchObject({
+      status: 'INVALID',
+      errors: [
+        expect.stringContaining('authoritative event-target area sample'),
+      ],
+    });
+  });
+
+  it('rejects malformed and duplicate area-target samples', () => {
+    const result = evaluateMechanicProgram(
+      { id: 'sample-validation', name: 'Sample Validation', clauses: [] },
+      [
+        {
+          kind: 'weapon_hit',
+          at: 1,
+          targetId: 'enemy',
+          areaTargetSample: {
+            center: 'event_target',
+            validTargets: [
+              { entityId: 'enemy', population: 'enemy', distanceMeters: 0 },
+              { entityId: 'enemy', population: 'enemy', distanceMeters: 1 },
+            ],
+          },
+        },
+      ],
+      custom(5),
+    );
+    expect(result).toMatchObject({
+      status: 'INVALID',
+      errors: [expect.stringContaining('duplicates entity "enemy"')],
+    });
+
+    const oversizedTargets = Array.from({ length: 257 }, (_, index) => ({
+      entityId: index === 0 ? 'enemy' : `enemy-${index}`,
+      population: 'enemy' as const,
+      distanceMeters: index === 0 ? 0 : 1,
+    }));
+    expect(
+      evaluateMechanicProgram(
+        { id: 'sample-bound', name: 'Sample Bound', clauses: [] },
+        [
+          {
+            kind: 'weapon_hit',
+            at: 1,
+            targetId: 'enemy',
+            areaTargetSample: {
+              center: 'event_target',
+              validTargets: oversizedTargets,
+            },
+          },
+        ],
+        custom(5),
+      ),
+    ).toMatchObject({
+      status: 'INVALID',
+      errors: [expect.stringContaining('cannot contain more than 256')],
+    });
+  });
 });

src/lib/components/ArticleComposer.svelte

@@ -23,7 +23,9 @@
 	let coverUploading = $state(false);
 	let initialized = $state(false);
 	let lastContent = '';
-	let saveSequence = 0;
+	let saveTimer: number | undefined;
+	let saveInFlight = false;
+	let saveQueued = false;
 	const groupedTags = $derived.by(() => {
 		const groups: Record<string, ComposerTag[]> = {};
 		for (const tag of data.tags as ComposerTag[]) (groups[tag.group] ??= []).push(tag);
@@ -35,6 +37,40 @@
 			coverImageId, coverAlt, coverCaption, version };
 	}
 
+	function scheduleSave() {
+		if (saveTimer !== undefined) window.clearTimeout(saveTimer);
+		saveTimer = window.setTimeout(() => {
+			saveTimer = undefined;
+			void saveDraft();
+		}, 900);
+	}
+
+	async function saveDraft() {
+		if (saveInFlight || !saveQueued) return;
+		saveInFlight = true;
+		saveQueued = false;
+		const draft = { ...payload(), tagIds: [...selectedTags] };
+		try {
+			const response = await fetch('/api/articles/draft', {
+				method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(draft)
+			});
+			const result = await response.json();
+			if (response.status === 409) {
+				saveState = 'conflict';
+				return;
+			}
+			if (!response.ok) throw new Error(result.message || 'Draft save failed.');
+			version = result.version;
+			saveState = saveQueued ? 'saving' : 'saved';
+		} catch (error) {
+			saveState = 'error';
+			toast.error('Draft not saved', error instanceof Error ? error.message : 'Try again.');
+		} finally {
+			saveInFlight = false;
+			if (saveQueued && saveState !== 'conflict') scheduleSave();
+		}
+	}
+
 	$effect(() => {
 		const content = JSON.stringify({ title, deck, document, selectedTags, channel, coverImageId, coverAlt, coverCaption });
 		if (!initialized) {
@@ -44,29 +80,13 @@
 		}
 		if (content === lastContent) return;
 		lastContent = content;
-		const sequence = ++saveSequence;
+		saveQueued = true;
 		saveState = 'saving';
-		const timer = window.setTimeout(async () => {
-			try {
-				const response = await fetch('/api/articles/draft', {
-					method: 'POST', headers: { 'content-type': 'application/json' }, body: JSON.stringify(payload())
-				});
-				const result = await response.json();
-				if (sequence !== saveSequence) return;
-				if (response.status === 409) {
-					saveState = 'conflict';
-					return;
-				}
-				if (!response.ok) throw new Error(result.message || 'Draft save failed.');
-				version = result.version;
-				saveState = 'saved';
-			} catch (error) {
-				if (sequence !== saveSequence) return;
-				saveState = 'error';
-				toast.error('Draft not saved', error instanceof Error ? error.message : 'Try again.');
-			}
-		}, 900);
-		return () => window.clearTimeout(timer);
+		if (!saveInFlight) scheduleSave();
+		return () => {
+			if (saveTimer !== undefined) window.clearTimeout(saveTimer);
+			saveTimer = undefined;
+		};
 	});
 
 	function toggleTag(id: string) {
@@ -115,7 +135,7 @@
 		<div class="article-publication-note"><p>{visibility === 'private' ? 'Only you can open this draft.' : visibility === 'unlisted' ? 'Anyone with the direct URL can read it.' : 'Listed in discovery and visible to everyone.'}</p>{#if data.article.pendingRevisionId}<strong>MODERATION REVIEW PENDING</strong>{/if}</div>
 		<PendingForm action="?/publish" class="article-publish-form">
 			<input type="hidden" name="articleId" value={data.article.id}/><input type="hidden" name="title" value={title}/><input type="hidden" name="deck" value={deck}/><input type="hidden" name="document" value={document}/><input type="hidden" name="tagIds" value={JSON.stringify(selectedTags)}/><input type="hidden" name="channel" value={channel}/><input type="hidden" name="coverImageId" value={coverImageId}/><input type="hidden" name="coverAlt" value={coverAlt}/><input type="hidden" name="coverCaption" value={coverCaption}/><input type="hidden" name="version" value={version}/><input type="hidden" name="visibility" value={visibility}/>
-			<button class="primary">{visibility === 'private' ? 'SAVE AS PRIVATE' : data.article.kind === 'guide' ? 'SUBMIT FOR PUBLICATION' : 'PUBLISH ARTICLE'}</button>
+			<button class="primary" disabled={saveState === 'saving' || coverUploading}>{visibility === 'private' ? 'SAVE AS PRIVATE' : data.article.kind === 'guide' ? 'SUBMIT FOR PUBLICATION' : 'PUBLISH ARTICLE'}</button>
 		</PendingForm>
 	</section>
 

src/lib/components/ArticleContent.svelte

@@ -24,6 +24,16 @@
 	function link(mark: ArticleMark) {
 		return mark.type === 'link' ? mark.attrs?.href ?? '#' : '#';
 	}
+
+	function orderedListStart(node: ArticleNode) {
+		const start = Number(node.attrs?.start ?? 1);
+		return Number.isInteger(start) && start > 1 ? start : undefined;
+	}
+
+	function orderedListType(node: ArticleNode): 'a' | 'A' | 'i' | 'I' | undefined {
+		const type = node.attrs?.type;
+		return ['a', 'A', 'i', 'I'].includes(String(type)) ? type as 'a' | 'A' | 'i' | 'I' : undefined;
+	}
 </script>
 
 {#snippet renderText(text: string, marks: ArticleMark[], index = 0)}
@@ -32,7 +42,7 @@
 		{#if mark.type === 'bold'}<strong>{@render renderText(text, marks, index + 1)}</strong>
 		{:else if mark.type === 'italic'}<em>{@render renderText(text, marks, index + 1)}</em>
 		{:else if mark.type === 'code'}<code>{@render renderText(text, marks, index + 1)}</code>
-		{:else}<a href={link(mark)} rel="nofollow ugc noopener noreferrer">{@render renderText(text, marks, index + 1)}</a>{/if}
+		{:else}<a href={link(mark)} title={mark.attrs?.title} rel="nofollow ugc noopener noreferrer">{@render renderText(text, marks, index + 1)}</a>{/if}
 	{/if}
 {/snippet}
 
@@ -46,7 +56,7 @@
 	{:else if node.type === 'heading' && Number(node.attrs?.level) === 2}<h2>{@render children(node)}</h2>
 	{:else if node.type === 'heading'}<h3>{@render children(node)}</h3>
 	{:else if node.type === 'bulletList'}<ul>{@render children(node)}</ul>
-	{:else if node.type === 'orderedList'}<ol>{@render children(node)}</ol>
+	{:else if node.type === 'orderedList'}<ol start={orderedListStart(node)} type={orderedListType(node)}>{@render children(node)}</ol>
 	{:else if node.type === 'listItem'}<li>{@render children(node)}</li>
 	{:else if node.type === 'blockquote'}<blockquote>{@render children(node)}</blockquote>
 	{:else if node.type === 'horizontalRule'}<hr/>

src/lib/components/ArticlePage.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
+	import AgentIdentityLink from '$lib/components/AgentIdentityLink.svelte';
 	import ArticleContent from '$lib/components/ArticleContent.svelte';
 	import ArticleDiscussion from '$lib/components/ArticleDiscussion.svelte';
-	import AgentIdentityLink from '$lib/components/AgentIdentityLink.svelte';
 	import PendingForm from '$lib/components/PendingForm.svelte';
 	import { untrack } from 'svelte';
 	let { data, form = null } = $props();
@@ -25,7 +25,7 @@
 	<header class="article-reader-head">
 		<div class="article-reader-channel"><span>{data.article.channel ?? (data.article.kind === 'guide' ? 'COMMUNITY GUIDE' : 'NEWS')}</span>{#if data.article.featured}<b>FEATURED</b>{/if}{#if data.article.recommended}<b>RECOMMENDED</b>{/if}</div>
 		<h1>{data.article.title}</h1><p>{data.article.deck}</p>
-		<div class="article-reader-byline">{#if data.article.source}<div class="article-source-identity"><strong>{data.article.source.name}</strong><span>{publicationMeta}</span></div>{:else}<AgentIdentityLink size="compact" linked={Boolean(data.article.authorPublicSlug)} agent={{id:data.article.ownerId,displayName:data.article.author,publicSlug:data.article.authorPublicSlug,avatarUrl:`/avatars/user/${data.article.ownerId}`}} meta={publicationMeta}/>{/if}<div>{#if data.article.kind === 'guide' && data.article.owner}<a class="secondary" href={`/guides/${encodeURIComponent(data.article.slug)}/edit`}>EDIT GUIDE</a>{:else if data.article.kind === 'news' && data.canManageNews && !data.article.source}<a class="secondary" href={`/news/${encodeURIComponent(data.article.slug)}/edit`}>OPEN NEWSROOM</a>{/if}</div></div>
+		<div class="article-reader-byline">{#if data.article.source}<div class="article-source-identity"><strong>{data.article.source.name}</strong><span>{publicationMeta}</span></div>{:else}<AgentIdentityLink size="compact" linked={Boolean(data.article.authorPublicSlug)} agent={{id:data.article.ownerId,displayName:data.article.author,publicSlug:data.article.authorPublicSlug,avatarUrl:`/avatars/user/${data.article.ownerId}`}} meta={publicationMeta}/>{/if}<div>{#if data.article.kind === 'guide' && data.article.owner}<a class="secondary" href={`/guides/${encodeURIComponent(data.article.slug)}/edit`}>EDIT GUIDE</a>{:else if data.article.kind === 'news' && data.canManageNews && !data.article.source}<a class="secondary" href={`/news/${encodeURIComponent(data.article.slug)}/edit`}>Edit Article</a>{/if}</div></div>
 		{#if data.article.source}<aside class="article-source-notice"><div><span>OFFICIAL SOURCE</span><strong>Originally published by {data.article.source.name}</strong></div><a href={data.article.source.url} target="_blank" rel="noopener noreferrer">READ ON UBISOFT</a></aside>{/if}
 		{#if data.tags.length}<nav class="article-reader-tags" aria-label="Article tags">{#each data.tags as tag}<a href={`/${path}?tag=${encodeURIComponent(tag.slug)}`}>{tag.name}</a>{/each}</nav>{/if}
 	</header>

src/lib/components/BuilderPicker.svelte

@@ -5,7 +5,7 @@
 		items,
 		value = $bindable(''),
 		label,
-		placeholder = 'Search available items…',
+        placeholder = 'Search…',
 		disabledIds = [],
 		onchange
 	}: {
@@ -27,19 +27,19 @@
 	<span>{label}</span>
 	<button type="button" class="builder-picker-current" aria-expanded={open} onclick={() => open = !open}>
 		<ItemIcon src={selected?.iconUrl} alt=""/>
-		<b>{selected?.name ?? 'SELECT ITEM'}</b><small>{selected?.category ?? (selected ? 'EQUIPPED' : 'UNASSIGNED')}</small><em>{open ? '×' : '＋'}</em>
+        <b>{selected?.name ?? 'SELECT ITEM'}</b><small>{selected?.category ?? (selected ? 'EQUIPPED' : 'UNASSIGNED')}</small><em>{open ? '×' : '＋'}</em>
 	</button>
 	{#if open}
 		<div class="builder-picker-panel">
 			<input type="search" bind:value={query} {placeholder} aria-label={placeholder}/>
 			<div>
-				{#if selected}<button type="button" class="builder-picker-clear" onclick={() => choose('')}><i>×</i><span><b>CLEAR SLOT</b><small>REMOVE CURRENT SELECTION</small></span><em>CLEAR</em></button>{/if}
+                {#if selected}<button type="button" class="builder-picker-clear" onclick={() => choose('')}><i>×</i><span><b>CLEAR</b><small>REMOVE SELECTION</small></span><em>CLEAR</em></button>{/if}
 				{#each results as item}
 					<button type="button" class:selected={item.id === value} disabled={disabledIds.includes(item.id)} onclick={() => choose(item.id)}>
 						<ItemIcon src={item.iconUrl} alt=""/>
 						<span><b>{item.name}</b><small>{item.category ?? 'AVAILABLE'}</small></span><em>{item.id === value ? 'EQUIPPED' : disabledIds.includes(item.id) ? 'CONFLICT' : 'SELECT'}</em>
 					</button>
-				{:else}<p>NO MATCHING ITEMS</p>{/each}
+                {:else}<p>NO MATCHES</p>{/each}
 			</div>
 		</div>
 	{/if}

src/lib/components/BuilderRadioGrid.svelte

@@ -24,6 +24,8 @@
 	} = $props();
 
 	let query = $state('');
+	let open = $state(false);
+	const selected = $derived(items.find((item) => item.id === value));
 	const visible = $derived(items.filter((item) =>
 		!query.trim() || `${item.name} ${item.category ?? ''}`.toLocaleLowerCase().includes(query.trim().toLocaleLowerCase())
 	));
@@ -31,26 +33,33 @@
 	function choose(id: string) {
 		value = id;
 		onchange?.(id);
+		if (searchable) {
+			open = false;
+			query = '';
+		}
 	}
 </script>
 
 <fieldset class="builder-radio-grid" class:icon-only={iconOnly} style={`--builder-radio-columns:${Math.max(1, columns)}`}>
 	<legend>{label}</legend>
-	{#if searchable}
+	{#if searchable}<button type="button" class="builder-radio-toggle" aria-expanded={open} onclick={() => open = !open}><ItemIcon src={selected?.iconUrl} alt=""/><span><b>{selected?.name ?? 'SELECT OPTION'}</b><small>{selected?.category ?? 'NOT CONFIGURED'}</small></span><em>{open ? 'CLOSE' : 'CHANGE'}</em></button>{/if}
+	{#if searchable && open}
 		<input class="builder-radio-search" type="search" bind:value={query} placeholder="SEARCH AVAILABLE OPTIONS" aria-label={`Search ${label.toLocaleLowerCase()}`}/>
 	{/if}
-	<div>
-		{#each visible as item}
-			<label title={item.name}>
-				<input type="radio" {name} value={item.id} checked={value === item.id} {required} aria-label={item.name} onchange={() => choose(item.id)}/>
-				<span>
-					<ItemIcon src={item.iconUrl} alt=""/>
-					<b>{item.name}</b>
-					{#if item.category}<small>{item.category}</small>{/if}
-				</span>
-			</label>
-		{:else}
-			<p>NO MATCHING OPTIONS</p>
-		{/each}
-	</div>
+	{#if !searchable || open}
+		<div>
+			{#each visible as item}
+				<label title={item.name}>
+					<input type="radio" {name} value={item.id} checked={value === item.id} {required} aria-label={item.name} onchange={() => choose(item.id)}/>
+					<span>
+						<ItemIcon src={item.iconUrl} alt=""/>
+						<b>{item.name}</b>
+						{#if item.category}<small>{item.category}</small>{/if}
+					</span>
+				</label>
+			{:else}
+				<p>NO MATCHING OPTIONS</p>
+			{/each}
+		</div>
+	{/if}
 </fieldset>

src/lib/components/DatabaseItemCard.svelte

@@ -6,6 +6,7 @@
 	import type { GameIconName } from '$lib/game-icons';
 	import type { DatabaseItem } from '$lib/database/items';
 	import MarkdownContent from './MarkdownContent.svelte';
+	import WeaponModSlotIcon from './WeaponModSlotIcon.svelte';
 
 	let {
 		item,
@@ -16,9 +17,21 @@
 		hideDiscussionUtility?: boolean;
 		anchor?: boolean;
 	} = $props();
+	let protocolLevel = $state(1);
+	let talentUpgrades = $state(0);
+
+	const number = (value: number) => Number.isInteger(value) ? String(value) : value.toFixed(2).replace(/\.?0+$/, '');
+	const valueWithUnit = (value: number, unit: string) => `${number(value)}${unit ? (unit === '%' ? '%' : ` ${unit}`) : ''}`;
+	const protocolPrimaryValue = () => item.protocolPreview
+		? item.protocolPreview.primaryBaseValue * (1 + (protocolLevel - 1) / 49)
+		: 0;
+	const talentDescription = () => item.protocolPreview?.talentDescription?.replace(/\{(\d+)\}/g, (placeholder, raw) => {
+		const effect = item.protocolPreview?.talentEffects[Number(raw) - 1];
+		return effect ? valueWithUnit(effect.baseValue * (1 + talentUpgrades / 5), effect.unit) : placeholder;
+	});
 </script>
 
-<article id={anchor ? `database-item-${item.id}` : undefined} class="database-item-card" class:talent-card={item.variant === 'talent'}>
+<article id={anchor ? `database-item-${item.id}` : undefined} class="database-item-card" class:talent-card={item.variant === 'talent'} class:protocol-quality-standard={item.topBorderTone === 'standard'} class:protocol-quality-specialized={item.topBorderTone === 'specialized'} class:protocol-quality-superior={item.topBorderTone === 'superior'} class:protocol-quality-highend={item.topBorderTone === 'highend'}>
 	<header>
 		{#if item.renderUrl}<img class="database-item-render" src={item.renderUrl} alt="" loading="lazy"/>{/if}
 		<div class="database-item-icon">
@@ -31,13 +44,38 @@
 		{#if item.headerBadges?.length || item.headerBadge || item.headerMetaIcon}
 			<div class="database-header-status">
 				{#if item.headerMetaIcon}<GameIcon name={item.headerMetaIcon}/>{/if}
-				{#each item.headerBadges ?? [] as badge}<span class="database-header-badge">{badge}</span>{/each}
-				{#if item.headerBadge}<span class="database-header-badge">{item.headerBadge}</span>{/if}
+				{#each item.headerBadges ?? [] as badge}<span class="database-header-badge" class:exotic={badge === 'EXOTIC'}>{badge}</span>{/each}
+				{#if item.headerBadge}<span class="database-header-badge" class:protocol-badge-standard={item.headerBadgeTone === 'standard'} class:protocol-badge-specialized={item.headerBadgeTone === 'specialized'} class:protocol-badge-superior={item.headerBadgeTone === 'superior'} class:protocol-badge-highend={item.headerBadgeTone === 'highend'}>{item.headerBadge}</span>{/if}
 			</div>
 		{/if}
 	</header>
 	{#if item.badges?.length}<div class="database-item-badges">{#each item.badges as badge}<span class={badge.tone ?? ''}>{badge.label}</span>{/each}</div>{/if}
-	<DatabaseFacts facts={item.facts} layout={item.factLayout}/>
+	{#if item.protocolPreview}
+		<section class="database-protocol-preview">
+			<div class="database-protocol-primary"><span>{item.protocolPreview.primaryStat}</span><b>{Number.isFinite(protocolPrimaryValue()) ? valueWithUnit(protocolPrimaryValue(), item.protocolPreview.primaryUnit) : 'NOT CONFIGURED'}</b></div>
+			{#if item.protocolPreview.talentDescription}
+				<div class="database-protocol-talent"><p>{talentDescription()}</p></div>
+			{/if}
+			<div class="database-protocol-controls"><label class="database-protocol-level"><span>LVL {protocolLevel}</span><input type="range" min="1" max="50" step="1" bind:value={protocolLevel} aria-label={`${item.name} level`}/></label>{#if item.protocolPreview.talentDescription}<div class="database-protocol-diamonds" role="group" aria-label={`${item.name} talent upgrades`}>{#each [1, 2, 3, 4, 5] as upgrade}<button type="button" class:active={talentUpgrades >= upgrade} aria-label={`Set talent upgrades to ${upgrade}`} aria-pressed={talentUpgrades === upgrade} onclick={() => talentUpgrades = talentUpgrades === upgrade ? 0 : upgrade}>◆</button>{/each}</div>{/if}</div>
+		</section>
+	{:else}
+		<DatabaseFacts facts={item.facts} layout={item.factLayout}/>
+	{/if}
+	{#if item.weaponModSlots}
+		<div class="database-weapon-mod-slots">
+			<div><span>MOD SLOTS</span></div>
+			{#if item.weaponModSlots.length}
+				<ul aria-label={`${item.name} Weapon Mod slots`}>
+					{#each item.weaponModSlots as modSlot}
+						<li class:upgrade-slot={modSlot.unlockedAtTierOne} class:has-slot-icon={Boolean(modSlot.iconUrl)} title={`${modSlot.slot}${modSlot.unlockedAtTierOne ? ' - Unlocked when this weapon upgrades to Tier 1' : ''}`}>
+							{#if modSlot.iconUrl}<WeaponModSlotIcon slot={modSlot.slot} iconUrl={modSlot.iconUrl}/><span class="sr-only">{modSlot.slot}</span>{:else}<span>{modSlot.slot}</span>{/if}
+							{#if modSlot.unlockedAtTierOne}<small>T1+</small>{/if}
+						</li>
+					{/each}
+				</ul>
+			{:else}<p>MOD SLOT DATA NOT CONFIGURED</p>{/if}
+		</div>
+	{/if}
 	{#if item.lines?.length}
 		<div class="database-item-lines">{#each item.lines as line}<div><span>{line.label}</span><b>{line.value}</b></div>{/each}</div>
 	{/if}
@@ -53,7 +91,7 @@
 			<section><span>TIER I</span><p>{item.description ?? 'Description is not available.'}</p></section>
 			<section><span>TIER II</span><p>{item.secondaryDescription ?? 'Description is not available.'}</p></section>
 		</div>
-	{:else}
+	{:else if !item.protocolPreview}
 		{#if item.description}<p class:data-description={item.descriptionStyle === 'data'}>{item.description}</p>{/if}
 		{#if item.secondaryDescription}<p class="secondary-description" class:data-description={item.descriptionStyle === 'data'}>{item.secondaryDescription}</p>{/if}
 	{/if}

src/lib/components/ItemIcon.svelte

@@ -14,4 +14,4 @@
 	const resolvedAlt = $derived(src || !alt ? alt : `${alt} — icon awaiting contribution`);
 </script>
 
-<img src={src || MISSING_ITEM_ICON_URL} alt={resolvedAlt} class:missing-item-icon={!src} class={className}/>
+<img src={src || MISSING_ITEM_ICON_URL} alt={resolvedAlt} class:missing-item-icon={!src} class={`item-icon ${className}`.trim()}/>

src/lib/components/ModSecondaryPoolEditor.svelte

@@ -0,0 +1,125 @@
+<script lang="ts">
+  import PendingForm from '$lib/components/PendingForm.svelte';
+  import SearchableAssignment from '$lib/components/SearchableAssignment.svelte';
+  import {
+    MOD_QUALITIES,
+    MOD_SECONDARY_CAPACITY,
+    MOD_SECONDARY_QUALITIES,
+    type ModSecondaryRange
+  } from '$lib/mods/secondary-pool';
+
+  let {
+    kind,
+    pool,
+    stats,
+    error,
+    saved = false,
+    resultToken = ''
+  }: {
+    kind: 'Weapon Mod' | 'Gear Mod';
+    pool: ModSecondaryRange[];
+    stats: Array<{ id: string; name: string; unit: string }>;
+    error?: string;
+    saved?: boolean;
+    resultToken?: string;
+  } = $props();
+
+  const poolId = $derived(kind === 'Weapon Mod' ? 'weapon-mod-secondary-pool' : 'gear-mod-secondary-pool');
+  const action = '?/saveSecondaryPool';
+  const qualityClass = (quality: string) => `quality-${quality.toLowerCase().replace('-', '')}`;
+  const blankSecondary = (): ModSecondaryRange => ({
+    statId: '',
+    values: Object.fromEntries(
+      MOD_SECONDARY_QUALITIES.map((quality) => [quality, {
+        level1Min: 0,
+        level1Max: 0,
+        level20Min: 0,
+        level20Max: 0
+      }])
+    ) as ModSecondaryRange['values']
+  });
+  let editing = $state(false);
+  let draft = $state<ModSecondaryRange[]>([]);
+  let handledResultToken = $state('');
+
+  function openEditor() {
+    draft = pool.length ? structuredClone(pool) : [blankSecondary(), blankSecondary()];
+    editing = true;
+  }
+
+  function addSecondary() {
+    if (draft.length < 50) draft = [...draft, blankSecondary()];
+  }
+
+  function removeSecondary(index: number) {
+    if (draft.length > 2) draft = draft.filter((_, itemIndex) => itemIndex !== index);
+  }
+
+  $effect(() => {
+    if (saved && resultToken && resultToken !== handledResultToken) {
+      handledResultToken = resultToken;
+      editing = false;
+    }
+  });
+</script>
+
+<section class="mod-secondary-pool-registry">
+  <div class="selection-head">
+    <div>
+      <span>SHARED {kind.toUpperCase()} SECONDARY POOL</span>
+      <small>ONE CANONICAL POOL FOR EVERY REGULAR {kind.toUpperCase()}</small>
+    </div>
+    <button type="button" class="row-action" onclick={openEditor}>EDIT SHARED POOL →</button>
+  </div>
+  <div class="mod-secondary-capacity">
+    {#each MOD_QUALITIES as quality}
+      <span><b class={qualityClass(quality)}>{quality.toUpperCase()}</b><strong>{MOD_SECONDARY_CAPACITY[quality]}</strong><small>SECONDARY {MOD_SECONDARY_CAPACITY[quality] === 1 ? 'ROLL' : 'ROLLS'}</small></span>
+    {/each}
+    <span class="pool-total"><b>ATTRIBUTE POOL</b><strong>{pool.length}</strong><small>SHARED OPTIONS</small></span>
+  </div>
+</section>
+
+{#if editing}
+  <div class="dashboard-editor mod-secondary-pool-editor">
+    <div class="editor-title">
+      <div><p class="eyebrow">SHARED CONFIGURATION</p><h3>{kind.toUpperCase()} SECONDARY ATTRIBUTES</h3></div>
+      <button aria-label={`Close ${kind} secondary pool editor`} onclick={() => editing = false}>×</button>
+    </div>
+    <PendingForm {action}>
+      <input type="hidden" name="id" value={poolId}/>
+      <input type="hidden" name="name" value={`Shared ${kind} Secondary Pool`}/>
+      <input type="hidden" name="secondaryRanges" value={JSON.stringify(draft)}/>
+      <p class="console-note">Standard quality has no secondary roll. Specialized selects one option; Superior and High-end select two distinct options. Ranges scale linearly from Level 1 to Level 20.</p>
+      <div class="selection-head pool-editor-head">
+        <div><span>AVAILABLE ATTRIBUTES</span><small>SPECIALIZED · SUPERIOR · HIGH-END LEVEL ENDPOINTS</small></div>
+        <button type="button" class="row-action" onclick={addSecondary} disabled={draft.length >= 50}>ADD ATTRIBUTE ＋</button>
+      </div>
+      <div class="mod-secondary-pool-options">
+        {#each draft as range, index}
+          <div class="mod-secondary-pool-option">
+            <strong>{String(index + 1).padStart(2, '0')}</strong>
+            <SearchableAssignment
+              items={stats}
+              mode="single"
+              compact
+              subjectLabel="POSSIBLE ATTRIBUTE"
+              searchPlaceholder="Search attributes…"
+              excludedIds={draft.filter((_, itemIndex) => itemIndex !== index).map((item) => item.statId)}
+              bind:value={range.statId}
+            />
+            {#each MOD_SECONDARY_QUALITIES as quality}
+              <div class="mod-secondary-quality-range">
+                <b class={qualityClass(quality)}>{quality.toUpperCase()}</b>
+                <label><span>LEVEL 1</span><div><input type="number" step="any" bind:value={range.values[quality].level1Min} aria-label={`${quality} ${stats.find((item) => item.id === range.statId)?.name ?? 'attribute'} Level 1 minimum`} required/><i>–</i><input type="number" step="any" bind:value={range.values[quality].level1Max} aria-label={`${quality} ${stats.find((item) => item.id === range.statId)?.name ?? 'attribute'} Level 1 maximum`} required/></div></label>
+                <label><span>LEVEL 20</span><div><input type="number" step="any" bind:value={range.values[quality].level20Min} aria-label={`${quality} ${stats.find((item) => item.id === range.statId)?.name ?? 'attribute'} Level 20 minimum`} required/><i>–</i><input type="number" step="any" bind:value={range.values[quality].level20Max} aria-label={`${quality} ${stats.find((item) => item.id === range.statId)?.name ?? 'attribute'} Level 20 maximum`} required/></div></label>
+              </div>
+            {/each}
+            <button type="button" aria-label={`Remove shared secondary attribute option ${index + 1}`} onclick={() => removeSecondary(index)} disabled={draft.length <= 2}>×</button>
+          </div>
+        {/each}
+      </div>
+      {#if error}<p class="error">{error}</p>{/if}
+      <div class="form-actions"><button type="button" class="secondary" onclick={() => editing = false}>CANCEL</button><button class="primary">SAVE SHARED POOL →</button></div>
+    </PendingForm>
+  </div>
+{/if}

src/lib/components/ProposalChangePreview.svelte

@@ -29,8 +29,6 @@
 			gear_max: 'gearMax',
 			weapon_min: 'weaponMin',
 			weapon_max: 'weaponMax',
-			skill_chip_min: 'chipMin',
-			skill_chip_max: 'chipMax',
 			cap_value: 'capValue'
 		};
 		return proposed[names[key] ?? key];
@@ -46,6 +44,8 @@
 	);
 	const specializationRecord = $derived((currentSnapshot?.record ?? null) as Record<string, unknown> | null);
 	const skillChipRecord = $derived((currentSnapshot?.record ?? null) as Record<string, unknown> | null);
+	const currentSharedSkillChipProfiles = $derived((Array.isArray(currentSnapshot) ? currentSnapshot : []) as any[]);
+	const proposedSharedSkillChipProfiles = $derived((jsonValue(proposed.profiles) ?? []) as any[]);
 	const skillChipFields = $derived([
 		{ label: 'NAME', current: skillChipRecord?.name, proposed: proposed.name },
 		{ label: 'SPECIALIZATION ABILITY', current: skillChipRecord?.specialization_ability_id, proposed: proposed.abilityId },
@@ -78,6 +78,7 @@
 							{ label: 'SPECIALIZATION', current: specializationRecord?.specialization_id, proposed: proposed.specializationId },
 							{ label: 'DURATION · SECONDS', current: specializationRecord?.duration_seconds, proposed: proposed.durationSeconds },
 							{ label: 'COOLDOWN · SECONDS', current: specializationRecord?.cooldown_seconds, proposed: proposed.cooldownSeconds },
+							{ label: 'SHARED SKILL CHIP ABILITY', current: (currentSnapshot?.skillChipLinks as any[])?.[0]?.ability_id === specializationRecord?.id ? (currentSnapshot?.skillChipLinks as any[])?.[0]?.compatible_ability_id : (currentSnapshot?.skillChipLinks as any[])?.[0]?.ability_id, proposed: proposed.skillChipCompatibleAbilityId },
 							{ label: 'DESCRIPTION', current: specializationRecord?.description, proposed: proposed.description }
 						]
 						: action === 'saveCombatEffect'
@@ -256,7 +257,7 @@
 						{#each [['type','TYPE'],['category','CATEGORY'],['calculation_type','CALCULATION'],['unit','UNIT']] as field}
 							<div class="preview-field"><span>{field[1]}</span><strong>{shown(attributeValue('current', field[0]))}</strong></div>
 						{/each}
-						{#each [['gear','GEAR'],['weapon','WEAPON'],['skill_chip','SKILL CHIP']] as source}
+						{#each [['gear','GEAR'],['weapon','WEAPON']] as source}
 							<div class="preview-field range"><span>{source[1]} RANGE · OPTIONAL</span><div><strong>{shown(attributeValue('current', `${source[0]}_min`))}</strong><i>TO</i><strong>{shown(attributeValue('current', `${source[0]}_max`))}</strong></div></div>
 						{/each}
 						<div class="preview-field"><span>OPTIONAL CAP</span><strong>{shown(attributeValue('current', 'cap_value'))}</strong></div>
@@ -273,13 +274,24 @@
 					{#each [['type','TYPE'],['category','CATEGORY'],['calculation_type','CALCULATION'],['unit','UNIT']] as field}
 						<div class="preview-field"><span>{field[1]}</span><strong>{shown(attributeValue('proposed', field[0]))}</strong></div>
 					{/each}
-					{#each [['gear','GEAR'],['weapon','WEAPON'],['skill_chip','SKILL CHIP']] as source}
+					{#each [['gear','GEAR'],['weapon','WEAPON']] as source}
 						<div class="preview-field range"><span>{source[1]} RANGE · OPTIONAL</span><div><strong>{shown(attributeValue('proposed', `${source[0]}_min`))}</strong><i>TO</i><strong>{shown(attributeValue('proposed', `${source[0]}_max`))}</strong></div></div>
 					{/each}
 					<div class="preview-field"><span>OPTIONAL CAP</span><strong>{shown(attributeValue('proposed', 'cap_value'))}</strong></div>
 				</div>
 			</article>
 		</div>
+	{:else if module === 'skillchips' && ['savePrimaryProfile','saveSecondaryPool'].includes(action)}
+		<div class="proposal-compare-grid">
+			<article class="proposal-editor-preview before">
+				<header><span>CURRENT LIVE · SHARED {action === 'savePrimaryProfile' ? 'PRIMARY PROFILE' : 'SECONDARY POOL'}</span><b>BEFORE</b></header>
+				<div class="proposal-structured-list">{#each currentSharedSkillChipProfiles as profile}<p>{profile.statId} · {Object.entries(profile.values ?? {}).map(([quality, range]: [string, any]) => `${quality.toUpperCase()} ${shown(range.min)}–${shown(range.max)}`).join(' · ')}</p>{:else}<p>SHARED PROFILE NOT CONFIGURED</p>{/each}</div>
+			</article>
+			<article class="proposal-editor-preview after">
+				<header><span>PROPOSED · SHARED {action === 'savePrimaryProfile' ? 'PRIMARY PROFILE' : 'SECONDARY POOL'}</span><b>AFTER</b></header>
+				<div class="proposal-structured-list">{#each proposedSharedSkillChipProfiles as profile}<p>{profile.statId} · {Object.entries(profile.values ?? {}).map(([quality, range]: [string, any]) => `${quality.toUpperCase()} ${shown(range.min)}–${shown(range.max)}`).join(' · ')}</p>{/each}</div>
+			</article>
+		</div>
 	{:else if module === 'skillchips' && action === 'save'}
 		<div class="proposal-compare-grid">
 			<article class="proposal-editor-preview before">
@@ -287,7 +299,7 @@
 				{#if skillChipRecord}
 					<div class="proposal-field-summary">
 						{#each skillChipFields as field}<div><span>{field.label}</span><strong>{shown(field.current)}</strong></div>{/each}
-						<div><span>ROLL POOLS</span><strong>{(currentSnapshot?.primaryOptions as any[])?.length ?? 0} PRIMARY · {(currentSnapshot?.secondaryOptions as any[])?.length ?? 0} SECONDARY</strong></div>
+						<div><span>3-PIECE TALENT</span><strong>{currentSnapshot?.talent ? 'ASSIGNED' : 'NOT ASSIGNED'}</strong></div>
 					</div>
 					<div class="proposal-structured-list">
 						<header><span>3-PIECE CONDITIONAL MECHANIC</span><b>TYPED RULE</b></header>
@@ -301,7 +313,7 @@
 				<header><span>PROPOSED · SKILL CHIP</span><b>AFTER</b></header>
 				<div class="proposal-field-summary">
 					{#each skillChipFields as field}<div><span>{field.label}</span><strong>{shown(field.proposed)}</strong></div>{/each}
-					<div><span>ROLL POOLS</span><strong>{Array.isArray(proposed.primaryStatIds) ? proposed.primaryStatIds.length : Number(Boolean(proposed.primaryStatIds))} PRIMARY · {Array.isArray(proposed.secondaryStatIds) ? proposed.secondaryStatIds.length : Number(Boolean(proposed.secondaryStatIds))} SECONDARY</strong></div>
+					<div><span>3-PIECE TALENT</span><strong>{proposed.hasTalent === '1' ? 'ASSIGNED' : 'NOT ASSIGNED'}</strong></div>
 				</div>
 				<div class="proposal-structured-list">
 					<header><span>3-PIECE CONDITIONAL MECHANIC</span><b>TYPED RULE</b></header>

src/lib/components/SkillChipSharedProfiles.svelte

@@ -0,0 +1,128 @@
+<script lang="ts">
+  import PendingForm from '$lib/components/PendingForm.svelte';
+  import SearchableAssignment from '$lib/components/SearchableAssignment.svelte';
+  import {
+    SKILL_CHIP_QUALITIES,
+    SKILL_CHIP_SECONDARY_CAPACITY,
+    SKILL_CHIP_SECONDARY_QUALITIES,
+    type SkillChipProfile
+  } from '$lib/skill-chips/profiles';
+
+  let {
+    primaryProfiles,
+    primaryProfileBase,
+    secondaryPool,
+    stats,
+    primaryError,
+    secondaryError,
+    primarySaved = false,
+    secondarySaved = false,
+    resultToken = ''
+  }: {
+    primaryProfiles: SkillChipProfile[];
+    primaryProfileBase: SkillChipProfile[];
+    secondaryPool: SkillChipProfile[];
+    stats: Array<{ id: string; name: string; unit: string }>;
+    primaryError?: string;
+    secondaryError?: string;
+    primarySaved?: boolean;
+    secondarySaved?: boolean;
+    resultToken?: string;
+  } = $props();
+
+  const qualityClass = (quality: string) => `quality-${quality.toLowerCase().replace('-', '')}`;
+  const blankValues = (qualities: readonly string[]) => Object.fromEntries(
+    qualities.map((quality) => [quality, { min: '', max: '' }])
+  );
+  const hydrated = (profile: SkillChipProfile, qualities: readonly string[]) => ({
+    statId: profile.statId,
+    values: Object.fromEntries(qualities.map((quality) => [quality, {
+      min: profile.values[quality]?.min ?? '',
+      max: profile.values[quality]?.max ?? ''
+    }]))
+  });
+  const blankSecondary = () => ({ statId: '', values: blankValues(SKILL_CHIP_SECONDARY_QUALITIES) });
+  let primaryEditing = $state(false);
+  let secondaryEditing = $state(false);
+  let primaryDraft = $state<any[]>([]);
+  let secondaryDraft = $state<any[]>([]);
+  let handledPrimaryToken = $state('');
+  let handledSecondaryToken = $state('');
+
+  function openPrimary() {
+    primaryDraft = primaryProfiles.map((profile) => hydrated(profile, SKILL_CHIP_QUALITIES));
+    secondaryEditing = false;
+    primaryEditing = true;
+  }
+  function openSecondary() {
+    const loaded: any[] = secondaryPool.map((profile) =>
+      hydrated(profile, SKILL_CHIP_SECONDARY_QUALITIES)
+    );
+    while (loaded.length < 2) loaded.push(blankSecondary());
+    secondaryDraft = loaded;
+    primaryEditing = false;
+    secondaryEditing = true;
+  }
+  $effect(() => {
+    if (primarySaved && resultToken && resultToken !== handledPrimaryToken) {
+      handledPrimaryToken = resultToken;
+      primaryEditing = false;
+    }
+    if (secondarySaved && resultToken && resultToken !== handledSecondaryToken) {
+      handledSecondaryToken = resultToken;
+      secondaryEditing = false;
+    }
+  });
+</script>
+
+<div class="skill-chip-shared-config">
+  <section class="mod-secondary-pool-registry">
+    <div class="selection-head"><div><span>SHARED PRIMARY PROFILE</span><small>FOUR ABILITY-SCOPED STATS · ONE RANGE PER QUALITY</small></div><button type="button" class="row-action" onclick={openPrimary}>EDIT PRIMARY RANGES →</button></div>
+    <div class="mod-secondary-capacity">
+      {#each SKILL_CHIP_QUALITIES as quality}<span><b class={qualityClass(quality)}>{quality.toUpperCase()}</b><strong>{primaryProfiles.filter((profile) => profile.values[quality]).length}</strong><small>OF 4 CONFIGURED</small></span>{/each}
+      <span class="pool-total"><b>CALCULATION</b><strong>—</strong><small>NOT YET DEFINED</small></span>
+    </div>
+  </section>
+  <section class="mod-secondary-pool-registry">
+    <div class="selection-head"><div><span>SHARED SECONDARY POOL</span><small>ONE CANONICAL ATTRIBUTE POOL FOR EVERY SKILL CHIP</small></div><button type="button" class="row-action" onclick={openSecondary}>EDIT SHARED POOL →</button></div>
+    <div class="mod-secondary-capacity">
+      {#each SKILL_CHIP_QUALITIES as quality}<span><b class={qualityClass(quality)}>{quality.toUpperCase()}</b><strong>{SKILL_CHIP_SECONDARY_CAPACITY[quality]}</strong><small>SECONDARY {SKILL_CHIP_SECONDARY_CAPACITY[quality] === 1 ? 'ROLL' : 'ROLLS'}</small></span>{/each}
+      <span class="pool-total"><b>ATTRIBUTE POOL</b><strong>{secondaryPool.length}</strong><small>SHARED OPTIONS</small></span>
+    </div>
+  </section>
+</div>
+
+{#if primaryEditing}
+  <div class="dashboard-editor skill-chip-profile-editor">
+    <div class="editor-title"><div><p class="eyebrow">SHARED CONFIGURATION</p><h3>SKILL CHIP PRIMARY RANGES</h3></div><button aria-label="Close primary profile editor" onclick={() => primaryEditing = false}>×</button></div>
+    <PendingForm action="?/savePrimaryProfile">
+      <input type="hidden" name="id" value="skill-chip-primary-profile"/><input type="hidden" name="name" value="Shared Skill Chip Primary Profile"/><input type="hidden" name="baseProfiles" value={JSON.stringify(primaryProfileBase)}/><input type="hidden" name="profiles" value={JSON.stringify(primaryDraft)}/>
+      <p class="console-note">Every Skill Chip rolls one of these four ability-scoped primary stats. Configure the direct minimum and maximum for each quality. Current combat calculations do not apply these values.</p>
+      <div class="skill-chip-profile-options fixed">
+        {#each primaryDraft as profile}
+          <div class="skill-chip-profile-option"><div><strong>{stats.find((item) => item.id === profile.statId)?.name ?? 'UNKNOWN ATTRIBUTE'}</strong><small>{stats.find((item) => item.id === profile.statId)?.unit || 'FLAT'} · ABILITY SCOPED</small></div>{#each SKILL_CHIP_QUALITIES as quality}<label><b class={qualityClass(quality)}>{quality.toUpperCase()}</b><span><input type="number" min="0" step="any" bind:value={profile.values[quality].min} aria-label={`${quality} ${stats.find((item) => item.id === profile.statId)?.name ?? 'attribute'} minimum`} required/><i>–</i><input type="number" min="0" step="any" bind:value={profile.values[quality].max} aria-label={`${quality} ${stats.find((item) => item.id === profile.statId)?.name ?? 'attribute'} maximum`} required/></span></label>{/each}</div>
+        {/each}
+      </div>
+      {#if primaryError}<p class="error">{primaryError}</p>{/if}
+      <div class="form-actions"><button type="button" class="secondary" onclick={() => primaryEditing = false}>CANCEL</button><button class="primary">SAVE PRIMARY PROFILE →</button></div>
+    </PendingForm>
+  </div>
+{/if}
+
+{#if secondaryEditing}
+  <div class="dashboard-editor skill-chip-profile-editor">
+    <div class="editor-title"><div><p class="eyebrow">SHARED CONFIGURATION</p><h3>SKILL CHIP SECONDARY POOL</h3></div><button aria-label="Close secondary pool editor" onclick={() => secondaryEditing = false}>×</button></div>
+    <PendingForm action="?/saveSecondaryPool">
+      <input type="hidden" name="id" value="skill-chip-secondary-pool"/><input type="hidden" name="name" value="Shared Skill Chip Secondary Pool"/><input type="hidden" name="baseProfiles" value={JSON.stringify(secondaryPool)}/><input type="hidden" name="profiles" value={JSON.stringify(secondaryDraft)}/>
+      <p class="console-note">Standard has no secondary roll. Specialized selects one option; Superior and High-end select two distinct options. Skill Chips have no item level, so each quality uses one direct range.</p>
+      <div class="selection-head pool-editor-head"><div><span>AVAILABLE ATTRIBUTES</span><small>SPECIALIZED · SUPERIOR · HIGH-END RANGES</small></div><button type="button" class="row-action" onclick={() => secondaryDraft = [...secondaryDraft, blankSecondary()]} disabled={secondaryDraft.length >= 50}>ADD ATTRIBUTE ＋</button></div>
+      <div class="skill-chip-profile-options">
+        {#each secondaryDraft as profile, index}
+          <div class="skill-chip-profile-option selectable"><strong>{String(index + 1).padStart(2, '0')}</strong><SearchableAssignment items={stats} mode="single" compact subjectLabel="POSSIBLE ATTRIBUTE" searchPlaceholder="Search attributes…" excludedIds={secondaryDraft.filter((_, itemIndex) => itemIndex !== index).map((item) => item.statId)} bind:value={profile.statId}/>{#each SKILL_CHIP_SECONDARY_QUALITIES as quality}<label><b class={qualityClass(quality)}>{quality.toUpperCase()}</b><span><input type="number" min="0" step="any" bind:value={profile.values[quality].min} aria-label={`${quality} ${stats.find((item) => item.id === profile.statId)?.name ?? `option ${index + 1}`} minimum`} required/><i>–</i><input type="number" min="0" step="any" bind:value={profile.values[quality].max} aria-label={`${quality} ${stats.find((item) => item.id === profile.statId)?.name ?? `option ${index + 1}`} maximum`} required/></span></label>{/each}<button type="button" aria-label={`Remove secondary option ${index + 1}`} onclick={() => secondaryDraft = secondaryDraft.filter((_, itemIndex) => itemIndex !== index)} disabled={secondaryDraft.length <= 2}>×</button></div>
+        {/each}
+      </div>
+      {#if secondaryError}<p class="error">{secondaryError}</p>{/if}
+      <div class="form-actions"><button type="button" class="secondary" onclick={() => secondaryEditing = false}>CANCEL</button><button class="primary">SAVE SHARED POOL →</button></div>
+    </PendingForm>
+  </div>
+{/if}

src/lib/components/WeaponModSlotIcon.svelte

@@ -0,0 +1,29 @@
+<script lang="ts">
+  let {
+    slot,
+    iconUrl,
+    decorative = true,
+    size = 24
+  }: { slot: string; iconUrl?: string | null; decorative?: boolean; size?: number } = $props();
+</script>
+
+{#if iconUrl}
+  <img
+    class="weapon-mod-slot-icon"
+    src={iconUrl}
+    alt={decorative ? '' : `${slot} Weapon Mod slot`}
+    loading="lazy"
+    width={size}
+    height={size}
+    style={`--weapon-mod-slot-icon-size: ${size}px`}
+  />
+{/if}
+
+<style>
+  img {
+    width: var(--weapon-mod-slot-icon-size);
+    height: var(--weapon-mod-slot-icon-size);
+    flex: 0 0 var(--weapon-mod-slot-icon-size);
+    object-fit: contain;
+  }
+</style>

src/lib/components/WeaponModSlotIconPanel.svelte

@@ -0,0 +1,212 @@
+<script lang="ts">
+  import IconUploadField from '$lib/components/IconUploadField.svelte';
+  import PendingForm from '$lib/components/PendingForm.svelte';
+  import WeaponModSlotIcon from '$lib/components/WeaponModSlotIcon.svelte';
+
+  type SlotIcon = {
+    id: string;
+    name: string;
+    iconUrl: string;
+    updatedAt: string;
+  };
+
+  let {
+    slots,
+    error = '',
+    saved = false,
+    resultToken = ''
+  }: {
+    slots: SlotIcon[];
+    error?: string;
+    saved?: boolean;
+    resultToken?: string;
+  } = $props();
+
+  let editing = $state<SlotIcon | null>(null);
+  let handledResultToken = $state('');
+
+  $effect(() => {
+    if (saved && resultToken && resultToken !== handledResultToken) {
+      handledResultToken = resultToken;
+      editing = null;
+    }
+  });
+</script>
+
+<section class="slot-icon-registry" aria-labelledby="slot-icon-registry-title">
+  <div class="selection-head">
+    <div>
+      <span id="slot-icon-registry-title">SHARED MOD SLOT ICONS</span>
+      <small>ONE CANONICAL ICON FOR EACH WEAPON MOD SLOT</small>
+    </div>
+    <b>{slots.every((slot) => slot.iconUrl) ? 'READY' : 'CONFIG REQUIRED'}</b>
+  </div>
+  <div class="slot-icon-grid">
+    {#each slots as slot}
+      <button
+        type="button"
+        class:configured={Boolean(slot.iconUrl)}
+        aria-pressed={editing?.id === slot.id}
+        onclick={() => editing = slot}
+      >
+        <span class="slot-icon-preview">
+          {#if slot.iconUrl}
+            <WeaponModSlotIcon slot={slot.name} iconUrl={slot.iconUrl}/>
+          {:else}
+            <i aria-hidden="true">?</i>
+          {/if}
+        </span>
+        <span><strong>{slot.name}</strong><small>{slot.iconUrl ? 'ICON REGISTERED' : 'ICON REQUIRED'}</small></span>
+        <b>EDIT</b>
+      </button>
+    {/each}
+  </div>
+</section>
+
+{#if editing}
+  <section class="dashboard-editor slot-icon-editor" aria-labelledby="slot-icon-editor-title">
+    <div class="editor-title">
+      <div><p class="eyebrow">SHARED MOD SLOT ARTWORK</p><h3 id="slot-icon-editor-title">{editing.name.toUpperCase()}</h3></div>
+      <button aria-label="Close slot icon editor" onclick={() => editing = null}>×</button>
+    </div>
+    <PendingForm action="?/saveSlotIcon" enctype="multipart/form-data">
+      <input type="hidden" name="id" value={editing.id}/>
+      <input type="hidden" name="name" value={`${editing.name} Slot`}/>
+      <input type="hidden" name="slotType" value={editing.name}/>
+      <input type="hidden" name="baseUpdatedAt" value={editing.updatedAt}/>
+      <div class="slot-icon-editor-body">
+        <div class="slot-icon-editor-identity">
+          <span class="slot-icon-preview large">
+            {#if editing.iconUrl}
+              <WeaponModSlotIcon slot={editing.name} iconUrl={editing.iconUrl} size={56}/>
+            {:else}
+              <i aria-hidden="true">?</i>
+            {/if}
+          </span>
+          <div><small>CANONICAL SLOT</small><strong>{editing.name}</strong><p>Weapon cards use this artwork anywhere the slot is available.</p></div>
+        </div>
+        <IconUploadField currentUrl={editing.iconUrl} label={`${editing.name.toUpperCase()} SLOT ICON`} resetToken={`${editing.id}:${editing.updatedAt}`}/>
+      </div>
+      {#if error}<p class="error" role="alert">{error}</p>{/if}
+      <div class="form-actions"><button type="button" class="secondary" onclick={() => editing = null}>CANCEL</button><button class="primary">SAVE SLOT ICON →</button></div>
+    </PendingForm>
+  </section>
+{/if}
+
+<style>
+  .slot-icon-registry {
+    margin: 10px 0;
+    padding: 10px;
+    border: 1px solid var(--shd-border);
+    border-left: 2px solid var(--shd-info);
+    background: #0d1011;
+  }
+  .slot-icon-grid {
+    display: grid;
+    grid-template-columns: repeat(4, minmax(0, 1fr));
+    gap: 7px;
+    margin-top: 8px;
+  }
+  .slot-icon-grid > button {
+    min-height: 62px;
+    display: grid;
+    grid-template-columns: 38px minmax(0, 1fr) auto;
+    align-items: center;
+    gap: 9px;
+    padding: 8px;
+    border: 1px solid var(--shd-border);
+    background: #101415;
+    color: var(--shd-text);
+    text-align: left;
+    cursor: pointer;
+  }
+  .slot-icon-grid > button:hover,
+  .slot-icon-grid > button:focus-visible,
+  .slot-icon-grid > button[aria-pressed='true'] {
+    border-color: var(--shd-orange);
+    background: #191712;
+  }
+  .slot-icon-grid > button:focus-visible {
+    outline: 2px solid var(--shd-orange);
+    outline-offset: 2px;
+  }
+  .slot-icon-grid > button > span:nth-child(2) {
+    min-width: 0;
+    display: grid;
+    gap: 3px;
+  }
+  .slot-icon-grid strong,
+  .slot-icon-grid small {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .slot-icon-grid strong {
+    font-size: var(--shd-type-label);
+    letter-spacing: .04em;
+  }
+  .slot-icon-grid small,
+  .slot-icon-grid > button > b {
+    color: var(--shd-text-muted);
+    font-size: var(--shd-type-micro);
+    letter-spacing: .07em;
+  }
+  .slot-icon-grid > button.configured small,
+  .slot-icon-grid > button.configured > b {
+    color: var(--shd-info);
+  }
+  .slot-icon-preview {
+    width: 38px;
+    height: 38px;
+    display: grid;
+    place-items: center;
+    border: 1px solid #313839;
+    background: #090b0c;
+  }
+  .slot-icon-preview i {
+    color: #586164;
+    font-size: 20px;
+    font-style: normal;
+    font-weight: 900;
+  }
+  .slot-icon-editor {
+    border-top-color: var(--shd-info);
+  }
+  .slot-icon-editor-body {
+    display: grid;
+    grid-template-columns: minmax(260px, .7fr) minmax(360px, 1.3fr);
+    gap: 12px;
+  }
+  .slot-icon-editor-identity {
+    display: flex;
+    align-items: center;
+    gap: 12px;
+    padding: 12px;
+    border: 1px solid var(--shd-border);
+    background: #0d1011;
+  }
+  .slot-icon-preview.large {
+    width: 76px;
+    height: 76px;
+    flex: 0 0 76px;
+  }
+  .slot-icon-editor-identity > div {
+    display: grid;
+    gap: 5px;
+  }
+  .slot-icon-editor-identity small,
+  .slot-icon-editor-identity p {
+    color: var(--shd-text-muted);
+    font-size: var(--shd-type-telemetry);
+  }
+  .slot-icon-editor-identity p {
+    margin: 0;
+  }
+  @media (max-width: 900px) {
+    .slot-icon-grid { grid-template-columns: repeat(2, minmax(0, 1fr)); }
+    .slot-icon-editor-body { grid-template-columns: 1fr; }
+  }
+  @media (max-width: 480px) {
+    .slot-icon-grid { grid-template-columns: 1fr; }
+  }
+</style>

src/lib/components/builder/LoadoutMatrix.svelte

@@ -37,20 +37,20 @@
 			&& Math.floor(Number(active.split(':')[1]) / 3) === Number(cell.id.split(':')[1]));
 
 	const issueLabel = (issue: string) => {
-		if (/not configured|required/i.test(issue)) return 'ACTION REQUIRED';
-		if (/incomplete/i.test(issue)) return 'DATA INCOMPLETE';
-		return 'CHECK CONFIGURATION';
+		if (/not configured|required|select|choose/i.test(issue)) return 'REQUIRED';
+		if (/incomplete/i.test(issue)) return 'INCOMPLETE';
+		return 'CHECK';
 	};
 </script>
 
 <section class="loadout-matrix" aria-label="Loadout matrix">
 	<header>
-		<span>LOADOUT MATRIX</span>
-		<b class:ready={configured}>{configured ? 'COMBAT READY' : 'CONFIGURATION INCOMPLETE'}</b>
+		<span>LOADOUT</span>
+		<b class:ready={configured}>{configured ? 'COMPLETE' : 'INCOMPLETE'}</b>
 	</header>
 
 	<div class="matrix-section doctrine-section">
-		<small class="section-label">DOCTRINE · ROOT CHOICE</small>
+		<small class="section-label">SPECIALIZATION FOCUS</small>
 		<button
 			type="button"
 			class="doctrine-cell"
@@ -60,27 +60,15 @@
 			onclick={() => onselect(doctrine.id)}
 		>
 			<ItemIcon src={doctrine.iconUrl} alt="" className="matrix-icon" />
-			<span><small>{doctrine.label}</small><strong>{doctrine.name}</strong><em>{doctrine.summary}</em>{#if doctrine.issue}<mark title={doctrine.issue} aria-hidden="true">{issueLabel(doctrine.issue)}</mark><span class="sr-only">{doctrine.issue}</span>{/if}</span>
+			<span><small>{doctrine.label}</small><strong>{doctrine.name}</strong><em class:visible={selected(doctrine)}>{doctrine.summary}</em>{#if doctrine.issue}<mark title={doctrine.issue} aria-hidden="true">{issueLabel(doctrine.issue)}</mark><span class="sr-only">{doctrine.issue}</span>{/if}</span>
 			<i aria-hidden="true"></i>
 		</button>
-		<div class="supply-line"><span>SUPPLIES 3 ABILITIES</span></div>
+		<div class="supply-line"><span>ABILITIES</span></div>
 		<div class="ability-cells">
 			{#each abilities as cell}
 				<button type="button" class:active={selected(cell)} class:needs-attention={Boolean(cell.issue)} aria-pressed={selected(cell)} onclick={() => onselect(cell.id)}>
 					<ItemIcon src={cell.iconUrl} alt="" className="matrix-icon" />
-					<span><small>{cell.label}</small><strong>{cell.name}</strong><em>{cell.summary}</em>{#if cell.issue}<mark title={cell.issue} aria-hidden="true">{issueLabel(cell.issue)}</mark><span class="sr-only">{cell.issue}</span>{/if}</span>
-				</button>
-			{/each}
-		</div>
-	</div>
-
-	<div class="matrix-section">
-		<small class="section-label">WEAPONS · PRIMARY + SECONDARY</small>
-		<div class="equipment-cells">
-			{#each weapons as cell}
-				<button type="button" class:active={selected(cell)} class:needs-attention={Boolean(cell.issue)} aria-pressed={selected(cell)} onclick={() => onselect(cell.id)}>
-					<ItemIcon src={cell.iconUrl} alt="" className="matrix-icon" />
-					<span><small>{cell.label}</small><strong>{cell.name}</strong><em>{cell.summary}</em>{#if cell.issue}<mark title={cell.issue} aria-hidden="true">{issueLabel(cell.issue)}</mark><span class="sr-only">{cell.issue}</span>{/if}</span>
+					<span><small>{cell.label}</small><strong>{cell.name}</strong><em class:visible={selected(cell)}>{cell.summary}</em>{#if cell.issue}<mark title={cell.issue} aria-hidden="true">{issueLabel(cell.issue)}</mark><span class="sr-only">{cell.issue}</span>{/if}</span>
 					<i aria-hidden="true"></i>
 				</button>
 			{/each}
@@ -88,12 +76,25 @@
 	</div>
 
 	<div class="matrix-section">
-		<small class="section-label">GEAR · 6 POSITIONS</small>
+		<small class="section-label">WEAPONS</small>
+		<div class="equipment-cells">
+			{#each weapons as cell}
+				<button type="button" class:active={selected(cell)} class:needs-attention={Boolean(cell.issue)} aria-pressed={selected(cell)} onclick={() => onselect(cell.id)}>
+					<ItemIcon src={cell.iconUrl} alt="" className="matrix-icon" />
+					<span><small>{cell.label}</small><strong>{cell.name}</strong><em class:visible={selected(cell)}>{cell.summary}</em>{#if cell.issue}<mark title={cell.issue} aria-hidden="true">{issueLabel(cell.issue)}</mark><span class="sr-only">{cell.issue}</span>{/if}</span>
+					<i aria-hidden="true"></i>
+				</button>
+			{/each}
+		</div>
+	</div>
+
+	<div class="matrix-section">
+		<small class="section-label">GEAR</small>
 		<div class="equipment-cells gear-cells">
 			{#each gear as cell}
 				<button type="button" class:active={selected(cell)} class:needs-attention={Boolean(cell.issue)} aria-pressed={selected(cell)} onclick={() => onselect(cell.id)}>
 					<ItemIcon src={cell.iconUrl} alt="" className="matrix-icon" />
-					<span><small>{cell.label}</small><strong>{cell.name}</strong><em>{cell.summary}</em>{#if cell.issue}<mark title={cell.issue} aria-hidden="true">{issueLabel(cell.issue)}</mark><span class="sr-only">{cell.issue}</span>{/if}</span>
+					<span><small>{cell.label}</small><strong>{cell.name}</strong><em class:visible={selected(cell)}>{cell.summary}</em>{#if cell.issue}<mark title={cell.issue} aria-hidden="true">{issueLabel(cell.issue)}</mark><span class="sr-only">{cell.issue}</span>{/if}</span>
 					<i aria-hidden="true"></i>
 				</button>
 			{/each}
@@ -101,10 +102,10 @@
 	</div>
 
 	<div class="matrix-section protocol-section">
-		<small class="section-label">AGENT SYSTEM · ONE OS PROTOCOL</small>
+		<small class="section-label">OS PROTOCOL</small>
 		<button type="button" class:active={selected(protocol)} class:needs-attention={Boolean(protocol.issue)} aria-pressed={selected(protocol)} onclick={() => onselect(protocol.id)}>
 			<ItemIcon src={protocol.iconUrl} alt="" className="matrix-icon" />
-			<span><small>{protocol.label}</small><strong>{protocol.name}</strong><em>{protocol.summary}</em>{#if protocol.issue}<mark title={protocol.issue} aria-hidden="true">{issueLabel(protocol.issue)}</mark><span class="sr-only">{protocol.issue}</span>{/if}</span>
+			<span><small>{protocol.label}</small><strong>{protocol.name}</strong><em class:visible={selected(protocol)}>{protocol.summary}</em>{#if protocol.issue}<mark title={protocol.issue} aria-hidden="true">{issueLabel(protocol.issue)}</mark><span class="sr-only">{protocol.issue}</span>{/if}</span>
 			<i aria-hidden="true"></i>
 		</button>
 	</div>
@@ -112,21 +113,20 @@
 
 <style>
 	.loadout-matrix{min-width:0;border:1px solid var(--shd-border);background:var(--shd-surface)}
-	.loadout-matrix>header{min-height:40px;display:flex;align-items:center;justify-content:space-between;gap:8px;padding:0 10px;border-bottom:1px solid var(--shd-border);background:#0c0f10;color:var(--shd-text-muted);font-size:var(--shd-type-telemetry);font-weight:900;letter-spacing:.08em}
+	.loadout-matrix>header{height:auto;min-height:40px;position:static;display:flex;align-items:center;justify-content:space-between;gap:8px;padding:0 10px;border-bottom:1px solid var(--shd-border);background:#0c0f10;color:var(--shd-text-muted);font-size:var(--shd-type-telemetry);font-weight:900;letter-spacing:.08em}
 	.loadout-matrix>header b{color:var(--shd-warning);font-size:9px;text-align:right}.loadout-matrix>header b.ready{color:var(--shd-success)}
 	.matrix-section{padding:5px;border-bottom:1px solid var(--shd-border)}.matrix-section:last-child{border-bottom:0}
 	.section-label{display:block;padding:2px 3px 5px;color:var(--shd-text-dim);font-size:9px;font-weight:900;letter-spacing:.09em}
 	.doctrine-cell,.equipment-cells button,.ability-cells button,.protocol-section>button{min-width:0;display:grid;grid-template-columns:34px minmax(0,1fr) 3px;align-items:center;gap:7px;padding:7px;border:1px solid var(--shd-border-soft);background:var(--shd-builder-canvas);color:var(--shd-text);text-align:left}
 	.doctrine-cell{width:100%;min-height:76px;grid-template-columns:42px minmax(0,1fr) 3px}.doctrine-cell :global(.matrix-icon){width:40px;height:40px}
 	:global(.matrix-icon){width:30px;height:30px;object-fit:contain}
-	button>span{min-width:0;display:grid;gap:2px}button small,button em{overflow:hidden;color:var(--shd-text-dim);font-size:9px;font-style:normal;letter-spacing:.04em;text-overflow:ellipsis;white-space:nowrap}button strong{overflow:hidden;font-size:11px;text-overflow:ellipsis;white-space:nowrap}button>i{align-self:stretch;background:var(--quality-high-end)}
+	button>span{min-width:0;display:grid;gap:2px}button small,button em{overflow:hidden;color:var(--shd-text-dim);font-size:9px;font-style:normal;letter-spacing:.04em;text-overflow:ellipsis;white-space:nowrap}button em{display:none}button em.visible{display:block}button strong{overflow:hidden;font-size:11px;text-overflow:ellipsis;white-space:nowrap}button>i{align-self:stretch;background:var(--quality-high-end)}
 	button:hover,button:focus-visible{border-color:var(--shd-border-strong);background:var(--shd-surface-active);outline:none}button.active{border-color:var(--shd-builder-selection-border);background:var(--shd-builder-selection);box-shadow:inset 2px 0 var(--shd-orange)}
 	button.needs-attention{border-bottom-color:color-mix(in srgb,var(--shd-danger) 68%,var(--shd-border-soft))}button.needs-attention>i{background:var(--shd-danger)}button mark{width:fit-content;max-width:100%;overflow:hidden;margin-top:2px;padding:2px 4px;border:1px solid color-mix(in srgb,var(--shd-danger) 58%,transparent);background:#1d1212;color:var(--shd-danger);font-size:8px;font-weight:900;letter-spacing:.07em;line-height:1.2;text-overflow:ellipsis;text-transform:uppercase;white-space:nowrap}
 	.supply-line{height:22px;display:grid;place-items:center;background:linear-gradient(90deg,transparent 49.7%,var(--shd-orange) 49.7% 50.3%,transparent 50.3%)}.supply-line span{padding:0 6px;background:var(--shd-surface);color:var(--shd-orange);font-size:8px;font-weight:900;letter-spacing:.08em}
-	.ability-cells{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:3px}.ability-cells button{min-height:68px;grid-template-columns:25px minmax(0,1fr);padding:6px}.ability-cells :global(.matrix-icon){width:24px;height:24px}
+	.ability-cells{display:grid;grid-template-columns:1fr;gap:3px}.ability-cells button{min-height:48px;grid-template-columns:25px minmax(0,1fr) 3px;padding:6px}.ability-cells :global(.matrix-icon){width:24px;height:24px}
 	.equipment-cells{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:3px}.equipment-cells button{min-height:69px}.protocol-section>button{width:100%;min-height:68px}
 	button:focus-visible{outline:2px solid var(--shd-focus-ring);outline-offset:2px}
-	@media(max-width:1240px){.ability-cells{grid-template-columns:1fr}.ability-cells button{min-height:48px}}
-	@media(max-width:800px){.ability-cells{grid-template-columns:repeat(3,minmax(0,1fr))}}
-	@media(max-width:520px){.ability-cells{grid-template-columns:1fr}.equipment-cells{grid-template-columns:1fr 1fr}}
+	@media(max-width:800px) and (min-width:651px){.ability-cells{grid-template-columns:repeat(3,minmax(0,1fr))}.ability-cells button{min-height:68px}}
+	@media(max-width:520px){.ability-cells{grid-template-columns:1fr}.equipment-cells{grid-template-columns:1fr 1fr}.gear-cells{grid-template-columns:1fr}}
 </style>

src/lib/components/builder/LoadoutStatsSummary.svelte

@@ -37,10 +37,9 @@
 <section class:page={layout === 'page'} class="loadout-known-stats" aria-labelledby={headingId}>
 	<div class="summary-head">
 		<div>
-			<p class="eyebrow"><span></span> KNOWN EQUIPMENT TOTALS</p>
+            <p class="eyebrow"><span></span> KNOWN STATS</p>
 			<h2 id={headingId}>Agent stats</h2>
 		</div>
-		<b>{summary.stats.length}</b>
 	</div>
 	<div class="summary-core">
 		{#each ['Firepower', 'Toughness', 'Engineering'] as name}
@@ -53,49 +52,57 @@
 	</div>
 	<div class="summary-scroll">
 		<div class="summary-section">
-			<header><span>COMBINED ATTRIBUTES</span><b>{summary.stats.length}</b></header>
+            <header><span>ATTRIBUTES</span><b>{summary.stats.length}</b></header>
 			{#each summary.stats as stat}
 				<div class="summary-stat">
 					<span>{attribute(stat.id)?.name}<small>{attribute(stat.id)?.category} · {stat.sourceCount} SOURCE{stat.sourceCount === 1 ? '' : 'S'}</small></span>
 					<b>{unitValue(stat.value, stat.id)}</b>
 				</div>
 			{:else}
-				<p>Equip and configure items to calculate their known Attributes.</p>
+                <p>Equip items to see known Attributes.</p>
 			{/each}
 		</div>
 		<div class="summary-section">
-			<header><span>ACTIVE SET BONUSES</span><b>{summary.activeBonuses.length}</b></header>
+            <header><span>SET BONUSES</span><b>{summary.activeBonuses.length}</b></header>
 			{#each summary.activeBonuses as bonus}
 				<div class="summary-bonus">
 					<span><b>{bonus.name}</b><small>{bonus.pieces}-PIECE · {bonus.count} EQUIPPED</small></span>
 					<em>+{unitValue(bonus.value, bonus.statId)} {attribute(bonus.statId)?.name}</em>
 				</div>
 			{:else}
-				<p>Matching Brand Sets and Skill Chips activate bonuses here.</p>
+                <p>No active bonuses.</p>
 			{/each}
 		</div>
 		<div class="summary-section">
-			<header><span>EQUIPPED TALENTS</span><b>{summary.equippedTalents.length}</b></header>
+            <header><span>TALENTS</span><b>{summary.equippedTalents.length}</b></header>
 			{#each summary.equippedTalents as equipped}
 				<div class="summary-talent">
-					<span>
-						<b>{equipped.custom?.name ?? talent(equipped.id)?.name ?? 'Talent'}</b>
-						<small>{equipped.source} · CONDITIONAL EFFECT NOT INCLUDED</small>
-						<em>{equipped.description}</em>
+					<details open={layout === 'page'}>
+						<summary><b>{equipped.custom?.name ?? talent(equipped.id)?.name ?? 'Talent'}</b><small>{equipped.source}{equipped.tierLabel ? ` · ${equipped.tierLabel}` : ''}</small></summary>
+						<p>{equipped.description}</p>
 						{#if equipped.id && talentCooldown(equipped.id)}<i class="talent-cooldown">{talentCooldown(equipped.id)}</i>{/if}
-					</span>
+					</details>
 				</div>
 			{:else}
-				<p>Selected equipment Talents appear here.</p>
+                <p>No Talents equipped.</p>
 			{/each}
 		</div>
 	</div>
-	<p class="known-stats-note">Totals reflect this saved loadout and the current canonical item definitions. They include fixed values, rolls, inherited profiles, enabled augments, set bonuses, Protocol effects, and static Specialization rank effects. Conditional Talent outcomes are reserved for the advanced combat model.</p>
+    <p class="known-stats-note">Known values only. Advanced effects are planned.</p>
 </section>
 
 <style>
 	.loadout-known-stats{background:var(--shd-surface)}
 	.summary-talent{grid-template-columns:1fr;cursor:default}
+	.summary-talent details,.summary-talent summary{min-width:0}
+	.summary-talent summary{display:grid;grid-template-columns:minmax(0,1fr) auto;gap:8px;align-items:center;cursor:pointer;list-style:none}
+	.summary-talent summary::-webkit-details-marker{display:none}
+	.summary-talent summary:after{content:'+';grid-column:2;grid-row:1/3;color:var(--shd-orange);font-size:14px}
+	.summary-talent details[open] summary:after{content:'-'}
+	.summary-talent summary b,.summary-talent summary small{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+	.summary-talent summary small{grid-column:1;color:var(--shd-text-muted);font-size:var(--shd-type-telemetry)}
+	.summary-talent details>p{margin:8px 0 0;color:var(--shd-text-muted);font:var(--shd-type-telemetry)/1.45 var(--shd-font-editorial)}
+	.summary-talent summary:focus-visible{outline:2px solid var(--shd-focus-ring);outline-offset:3px}
 	.known-stats-note{margin:0;padding:11px;border-top:1px solid var(--shd-border);color:var(--shd-text-muted);font-size:var(--shd-type-telemetry);line-height:1.45}
 	.page{border:1px solid var(--shd-border);border-top:2px solid var(--shd-success)}
 	.page .summary-scroll{max-height:none;display:grid;grid-template-columns:repeat(3,minmax(0,1fr))}

src/lib/components/builder/PlannedCombatModel.svelte

@@ -10,20 +10,20 @@
 	} = $props();
 
 	const capabilities = [
-		{ label: 'WEAPON OUTPUT', detail: 'Hit values, burst DPS, sustained DPS, and reload-aware firing cycles' },
-		{ label: 'SKILL SIMULATION', detail: 'Ability cadence, target counts, critical hits, and multi-shot behavior' },
-		{ label: 'ENCOUNTER MODEL', detail: 'Duration, accuracy, movement, target flow, rotations, and downtime' },
-		{ label: 'CONDITIONAL EFFECTS', detail: 'Talent triggers, stack buildup, cooldowns, uptime, and resource changes' }
+        { label: 'WEAPON OUTPUT', detail: 'Hits and firing cycles' },
+        { label: 'SKILL SIMULATION', detail: 'Timing and target caps' },
+        { label: 'ENCOUNTER MODEL', detail: 'Duration and rotations' },
+        { label: 'CONDITIONAL EFFECTS', detail: 'Triggers and uptime' }
 	];
 </script>
 
 <section class:compact={variant === 'compact'} class="planned-combat-model" aria-labelledby={headingId}>
 	<header>
-		<div><span>ADVANCED COMBAT MODEL</span>{#if headingLevel === 'h2'}<h2 id={headingId}>DPS calculations</h2>{:else}<h3 id={headingId}>DPS calculations</h3>{/if}</div>
-		<b>COMING SOON</b>
+        <div><span>COMBAT MODEL</span>{#if headingLevel === 'h2'}<h2 id={headingId}>DPS calculations</h2>{:else}<h3 id={headingId}>DPS calculations</h3>{/if}</div>
+        <b>PLANNED</b>
 	</header>
 	{#if variant === 'full'}
-		<p>Known equipment totals remain available now. Advanced damage projections will return after their calculation rules and scenario controls are ready for player use.</p>
+        <p>Known stats are live. Damage projections are planned.</p>
 	{/if}
 	<div class="planned-capabilities" aria-label="Planned combat-model capabilities">
 		{#each capabilities as capability}

src/lib/components/builder/TalentTierChoice.svelte

@@ -0,0 +1,61 @@
+<script lang="ts">
+	import ItemIcon from '$lib/components/ItemIcon.svelte';
+	import type { TalentTier } from '$lib/builder/loadout';
+
+	let {
+		label = 'TALENT TIER',
+		name,
+		talent,
+		value = $bindable(1),
+		onchange
+	}: {
+		label?: string;
+		name: string;
+		talent: { name: string; iconUrl?: string; tiers?: Array<{ tier: string }> };
+		value?: TalentTier;
+		onchange?: (tier: TalentTier) => void;
+	} = $props();
+
+	const available = (tier: TalentTier) => talent.tiers?.some((entry) => entry.tier === (tier === 2 ? 'II' : 'I')) ?? false;
+	const choose = (tier: TalentTier) => {
+		value = tier;
+		onchange?.(tier);
+	};
+</script>
+
+<fieldset class="talent-tier-choice">
+	<legend>{label}</legend>
+	<div>
+		{#each [1, 2] as tier}
+			<label class:tier-two={tier === 2}>
+				<input type="radio" {name} value={tier} checked={value === tier} disabled={!available(tier as TalentTier)} onchange={() => choose(tier as TalentTier)}/>
+				<span>
+					<ItemIcon src={talent.iconUrl} alt="" className="talent-tier-icon"/>
+					<small>TIER {tier === 2 ? 'II' : 'I'}</small>
+					<b>T{tier}</b>
+					<em>{available(tier as TalentTier) ? value === tier ? 'SELECTED' : 'SELECT' : 'UNAVAILABLE'}</em>
+				</span>
+			</label>
+		{/each}
+	</div>
+</fieldset>
+
+<style>
+	.talent-tier-choice{min-width:0;margin:8px 0 0;padding:0;border:0}
+	.talent-tier-choice legend{margin-bottom:5px;color:var(--shd-text-muted);font-size:var(--shd-type-telemetry);font-weight:900;letter-spacing:.07em}
+	.talent-tier-choice>div{display:grid;grid-template-columns:1fr 1fr;gap:5px}
+	.talent-tier-choice label{min-width:0;cursor:pointer}
+	.talent-tier-choice input{position:absolute;width:1px;height:1px;margin:0;opacity:0;pointer-events:none}
+	.talent-tier-choice span{min-height:64px;display:grid;grid-template-columns:42px minmax(0,1fr) auto;grid-template-rows:auto auto;align-items:center;gap:1px 8px;padding:7px;border:1px solid var(--shd-border);background:var(--shd-builder-canvas);color:var(--shd-text);transition:var(--shd-transition)}
+	.talent-tier-choice :global(.talent-tier-icon){grid-row:1/3;width:40px;height:40px;object-fit:contain}
+	.talent-tier-choice .tier-two :global(.talent-tier-icon){filter:sepia(.3) saturate(1.45) hue-rotate(335deg) brightness(1.12)}
+	.talent-tier-choice small{align-self:end;color:var(--shd-text-muted);font-size:var(--shd-type-telemetry);font-weight:900;letter-spacing:.06em}
+	.talent-tier-choice b{grid-column:3;grid-row:1/3;color:var(--shd-text-muted);font-size:18px}
+	.talent-tier-choice em{align-self:start;color:var(--shd-text-dim);font-size:var(--shd-type-telemetry);font-style:normal;font-weight:900}
+	.talent-tier-choice label:hover span{border-color:var(--shd-border-strong);background:var(--shd-surface-active)}
+	.talent-tier-choice input:checked+span{border-color:var(--shd-builder-selection-border);background:var(--shd-builder-selection);box-shadow:inset 0 -2px var(--shd-orange)}
+	.talent-tier-choice input:checked+span b,.talent-tier-choice input:checked+span em{color:var(--shd-orange)}
+	.talent-tier-choice input:focus-visible+span{outline:2px solid var(--shd-focus-ring);outline-offset:2px}
+	.talent-tier-choice input:disabled+span{opacity:.38;cursor:not-allowed;filter:saturate(.35)}
+	@media(max-width:430px){.talent-tier-choice span{grid-template-columns:36px minmax(0,1fr);}.talent-tier-choice :global(.talent-tier-icon){width:34px;height:34px}.talent-tier-choice b{display:none}}
+</style>

src/lib/components/isac/MechanicProgramEditor.svelte

@@ -9,18 +9,24 @@
 		blankConditionalMechanicDraft,
 		currentHealthPercentBandPredicate,
 		eventFieldComparisonPredicate,
+		eventFieldNumericExpression,
+		mechanicTargetingForMode,
+		mechanicTargetingMode,
 		parseConditionalMechanicDraft,
 		readCurrentHealthPercentBand,
 		readEventFieldComparison,
+		readEventFieldNumericExpression,
 		registeredEventFields,
 		readStatePoolThreshold,
 		statePoolThresholdPredicate,
 		type ConditionalMechanicClauseDraft,
+		type ConditionalNumericExpression,
 		type ConditionalMechanicDraftV1,
 		type ConditionalMechanicOutcomeDraft,
 		type ConditionalMechanicPoolDraft,
 		type EditablePredicateScalar,
 		type EventFieldComparison,
+		type MechanicTargetingMode,
 		type PredicateComparisonOperator,
 		type StatePoolThresholdComparison
 	} from '$lib/calculations/mechanic-editor';
@@ -28,6 +34,7 @@
 		formatMechanicProgram,
 		MECHANIC_EVENT_KINDS,
 		MECHANIC_EVENT_REGISTRY,
+		PROXIMITY_AGENT_GRANTED_BUFF_ALLY_COUNT_FIELD,
 		type ClauseMutation,
 		type MechanicOutcomeScope,
 		type NumericExpression,
@@ -182,7 +189,9 @@
 	}
 
 	function eventPredicateOperatorOptions(clause: ConditionalMechanicClauseDraft) {
-		return selectedEventPredicateField(clause)?.type === 'number'
+		const field = selectedEventPredicateField(clause);
+		if (field?.path === 'values.aiming') return predicateOperatorOptions.filter((option) => option.value === 'eq');
+		return field?.type === 'number'
 			? predicateOperatorOptions
 			: predicateOperatorOptions.filter((option) => option.value === 'eq' || option.value === 'ne');
 	}
@@ -190,15 +199,21 @@
 	function setClauseEvent(clauseIndex: number, event: string) {
 		const nextEvent = event as ConditionalMechanicClauseDraft['event'];
 		const clause = rule.clauses[clauseIndex];
+		const outcomes = nextEvent === 'weapon_hit'
+			? clause.outcomes
+			: clause.outcomes.map((outcome) => outcome.targeting?.kind === 'event_target_area'
+				? { ...outcome, targeting: undefined }
+				: outcome);
 		const fields = registeredEventFields(nextEvent);
 		const comparison = readEventFieldComparison(clause.if);
 		if (!comparison || !fields.length) {
-			updateClause(clauseIndex, { event: nextEvent });
+			updateClause(clauseIndex, { event: nextEvent, outcomes });
 			return;
 		}
 		const field = fields[0];
 		updateClause(clauseIndex, {
 			event: nextEvent,
+			outcomes,
 			if: eventFieldComparisonPredicate({
 				path: field.path,
 				operator: 'eq',
@@ -397,12 +412,109 @@
 		updateClause(index, { reducer });
 	}
 
+	function derivedScalarModel(clause: ConditionalMechanicClauseDraft) {
+		if (clause.reducer.kind !== 'derived_scalar') return 'static';
+		if (typeof clause.reducer.value === 'number') return 'static';
+		return readEventFieldNumericExpression(clause.reducer.value) ? 'event' : 'advanced';
+	}
+
+	function numericEventFields(clause: ConditionalMechanicClauseDraft) {
+		return registeredEventFields(clause.event).filter((field) => field.type === 'number');
+	}
+
+	function setDerivedScalarModel(clauseIndex: number, model: string) {
+		const clause = rule.clauses[clauseIndex];
+		if (clause.reducer.kind !== 'derived_scalar') return;
+		if (model === 'static') {
+			updateClause(clauseIndex, { reducer: { kind: 'derived_scalar', value: 1 } });
+			return;
+		}
+		const field = numericEventFields(clause)[0];
+		if (model === 'event' && field) {
+			updateClause(clauseIndex, {
+				reducer: {
+					kind: 'derived_scalar',
+					value: eventFieldNumericExpression(field.path)
+				}
+			});
+		}
+	}
+
+	function setDerivedScalarEventField(clauseIndex: number, path: string) {
+		updateClause(clauseIndex, {
+			reducer: { kind: 'derived_scalar', value: eventFieldNumericExpression(path) }
+		});
+	}
+
 	function updateOutcome(clauseIndex: number, outcomeIndex: number, patch: Partial<ConditionalMechanicOutcomeDraft>) {
 		const outcomes = [...rule.clauses[clauseIndex].outcomes];
 		outcomes[outcomeIndex] = { ...outcomes[outcomeIndex], ...patch };
 		updateClause(clauseIndex, { outcomes });
 	}
 
+	function targetingOptions(clause: ConditionalMechanicClauseDraft, outcome: ConditionalMechanicOutcomeDraft) {
+		if (outcome.scope === 'allies' || outcome.scope === 'self_and_allies') {
+			return [
+				{ value: 'none', label: 'NONE' },
+				{ value: 'allies_within_radius', label: 'ALLIES IN RADIUS' }
+			];
+		}
+		if (outcome.scope === 'target') {
+			return [
+				{ value: 'none', label: 'NONE' },
+				{ value: 'enemies_within_radius', label: 'ENEMIES IN RADIUS · LEGACY' },
+				...(outcome.kind === 'direct_damage' && clause.event === 'weapon_hit'
+					? [{ value: 'event_target_explosion', label: 'HIT-TARGET EXPLOSION' }]
+					: [])
+			];
+		}
+		return [{ value: 'none', label: 'NONE' }];
+	}
+
+	function setOutcomeScope(clauseIndex: number, outcomeIndex: number, scope: MechanicOutcomeScope) {
+		const outcome = rule.clauses[clauseIndex].outcomes[outcomeIndex];
+		const targeting = outcome.targeting;
+		const compatible = !targeting
+			|| (targeting.kind === 'event_target_area' && scope === 'target' && outcome.kind === 'direct_damage')
+			|| (targeting.kind === 'within_radius' && targeting.population === 'enemies' && scope === 'target')
+			|| (targeting.kind === 'within_radius' && targeting.population === 'allies' && (scope === 'allies' || scope === 'self_and_allies'));
+		updateOutcome(clauseIndex, outcomeIndex, { scope, targeting: compatible ? targeting : undefined });
+	}
+
+	function setOutcomeKind(clauseIndex: number, outcomeIndex: number, kind: ConditionalMechanicOutcomeDraft['kind']) {
+		const outcome = rule.clauses[clauseIndex].outcomes[outcomeIndex];
+		updateOutcome(clauseIndex, outcomeIndex, {
+			kind,
+			resource: kind === 'restoration' || kind === 'resource_cost' ? outcome.resource ?? 'health' : undefined,
+			attributeId: kind === 'attribute_modifier' ? outcome.attributeId ?? '' : undefined,
+			delivery: kind === 'restoration' ? outcome.delivery : undefined,
+			durationSeconds: kind === 'restoration' ? outcome.durationSeconds : undefined,
+			targeting: outcome.targeting?.kind === 'event_target_area' && kind !== 'direct_damage'
+				? undefined
+				: outcome.targeting
+		});
+	}
+
+	function setOutcomeTargeting(clauseIndex: number, outcomeIndex: number, mode: MechanicTargetingMode) {
+		const outcome = rule.clauses[clauseIndex].outcomes[outcomeIndex];
+		updateOutcome(clauseIndex, outcomeIndex, {
+			targeting: mechanicTargetingForMode(mode, outcome.targeting),
+			phase: mode === 'event_target_explosion' && outcome.phase !== 'on_event' && outcome.phase !== 'after_event'
+				? 'after_event'
+				: outcome.phase
+		});
+	}
+
+	function phaseOptions(outcome: ConditionalMechanicOutcomeDraft) {
+		return [
+			{ value: 'on_event', label: 'ON EVENT' },
+			{ value: 'after_event', label: 'AFTER EVENT' },
+			{ value: 'while_active', label: 'WHILE ACTIVE', disabled: outcome.targeting?.kind === 'event_target_area' },
+			{ value: 'on_enter', label: 'ON ENTER', disabled: outcome.targeting?.kind === 'event_target_area' },
+			{ value: 'on_exit', label: 'ON EXIT', disabled: outcome.targeting?.kind === 'event_target_area' }
+		];
+	}
+
 	function updateVariant(clauseIndex: number, outcomeIndex: number, variant: string, raw: string) {
 		const outcome = rule.clauses[clauseIndex].outcomes[outcomeIndex];
 		const value = Number(raw);
@@ -443,6 +555,10 @@
 	const eventValueOptions = [
 		{ value: 'values.enemyCount', label: 'ENEMY COUNT' },
 		{ value: 'values.allyCount', label: 'ALLY COUNT' },
+		{
+			value: PROXIMITY_AGENT_GRANTED_BUFF_ALLY_COUNT_FIELD,
+			label: 'AGENT-BUFFED ALLIES ≤30M'
+		},
 		{ value: 'values.magazineRemaining', label: 'ROUNDS LEFT' },
 		{ value: 'values.magazinePercent', label: 'MAGAZINE %' },
 		{ value: 'values.distanceMeters', label: 'DISTANCE' }
@@ -460,10 +576,10 @@
 		};
 	}
 
-	function protocolUpgradeExpression(value: number): NumericExpression {
+	function protocolUpgradeExpression(): ConditionalNumericExpression {
 		return {
 			op: 'multiply',
-			left: value,
+			left: { ref: { source: 'variant_value' } },
 			right: {
 				op: 'add',
 				left: 1,
@@ -504,17 +620,17 @@
 			typeof expression === 'object'
 			&& 'op' in expression
 			&& expression.op === 'multiply'
-			&& typeof expression.left === 'number'
 			&& typeof expression.right === 'object'
 		) {
-			if ('ref' in expression.right) {
+			if (typeof expression.left === 'number' && 'ref' in expression.right) {
 				if (expression.right.ref.source === 'event') return 'event';
 				if (expression.right.ref.source === 'scenario') return 'scenario';
 				if (expression.right.ref.source === 'reducer') return 'reducer';
 				if (expression.right.ref.source === 'attribute') return 'attribute_value';
 			}
 			if (
-				'op' in expression.right
+				typeof expression.left === 'number'
+				&& 'op' in expression.right
 				&& expression.right.op === 'divide'
 				&& typeof expression.right.left === 'object'
 				&& 'ref' in expression.right.left
@@ -522,7 +638,13 @@
 				&& expression.right.right === 100
 			) return 'attribute';
 			if (
-				'op' in expression.right
+				(typeof expression.left === 'number'
+					|| (
+						typeof expression.left === 'object'
+						&& 'ref' in expression.left
+						&& expression.left.ref.source === 'variant_value'
+					))
+				&& 'op' in expression.right
 				&& expression.right.op === 'add'
 				&& typeof expression.right.right === 'object'
 				&& 'op' in expression.right.right
@@ -583,7 +705,7 @@
 		model: OutcomeValueModel,
 		value: number,
 		reference = ''
-	): NumericExpression | undefined {
+	): ConditionalNumericExpression | undefined {
 		if (model === 'event') return referenceExpression('event', reference || 'values.enemyCount', value);
 		if (model === 'attribute') return reference
 			? attributePercentExpression(value, reference)
@@ -597,7 +719,7 @@
 		if (model === 'reducer') {
 			return { op: 'multiply', left: value, right: { ref: { source: 'reducer' } } };
 		}
-		if (model === 'protocol_upgrades') return protocolUpgradeExpression(value);
+		if (model === 'protocol_upgrades') return protocolUpgradeExpression();
 		return undefined;
 	}
 
@@ -624,7 +746,7 @@
 		updateOutcome(clauseIndex, outcomeIndex, { variants });
 	}
 
-	function replaceExpressionBase(expression: NumericExpression, value: number): NumericExpression {
+	function replaceExpressionBase(expression: ConditionalNumericExpression, value: number): ConditionalNumericExpression {
 		const model = outcomeValueModel({
 			key: 'temporary',
 			label: 'Temporary',
@@ -669,7 +791,7 @@
 		if (model === 'reducer') {
 			return { op: 'multiply', left: value, right: { ref: { source: 'reducer' } } };
 		}
-		if (model === 'protocol_upgrades') return protocolUpgradeExpression(value);
+		if (model === 'protocol_upgrades') return protocolUpgradeExpression();
 		return expression;
 	}
 
@@ -684,7 +806,51 @@
 		});
 	}
 
-	function updateMutation(clauseIndex: number, mutationIndex: number, kind: 'add' | 'set' | 'consume' | 'clear', pool?: string, value?: number) {
+	function addAbilityDurationExtension(clauseIndex: number) {
+		updateClause(clauseIndex, {
+			mutations: [
+				...rule.clauses[clauseIndex].mutations,
+				{ kind: 'extend_duration', target: 'assigned_ability', seconds: 0.3 }
+			]
+		});
+	}
+
+	function addCooldownOnMax(clauseIndex: number) {
+		const stackPool = rule.pools.find((pool) => pool.max && pool.max > 0)?.key;
+		const cooldownPool = rule.pools.find((pool) => pool.scope === 'agent' && pool.expiresAfterSeconds)?.key;
+		if (!stackPool || !cooldownPool || stackPool === cooldownPool) return;
+		updateClause(clauseIndex, {
+			mutations: [
+				...rule.clauses[clauseIndex].mutations,
+				{ kind: 'start_cooldown_on_max', stackPool, cooldownPool }
+			]
+		});
+	}
+
+	function updateAbilityDurationExtension(clauseIndex: number, mutationIndex: number, raw: string) {
+		const mutations = [...rule.clauses[clauseIndex].mutations];
+		const seconds = Number(raw);
+		mutations[mutationIndex] = {
+			kind: 'extend_duration',
+			target: 'assigned_ability',
+			seconds: Number.isFinite(seconds) ? seconds : 0
+		};
+		updateClause(clauseIndex, { mutations });
+	}
+
+	function updateCooldownOnMax(
+		clauseIndex: number,
+		mutationIndex: number,
+		patch: { stackPool?: string; cooldownPool?: string }
+	) {
+		const mutations = [...rule.clauses[clauseIndex].mutations];
+		const current = mutations[mutationIndex];
+		if (current.kind !== 'start_cooldown_on_max') return;
+		mutations[mutationIndex] = { ...current, ...patch };
+		updateClause(clauseIndex, { mutations });
+	}
+
+	function updateMutation(clauseIndex: number, mutationIndex: number, kind: 'add' | 'set' | 'consume' | 'derive' | 'clear', pool?: string, value?: number) {
 		const mutations = [...rule.clauses[clauseIndex].mutations];
 		const current = mutations[mutationIndex];
 		const nextPool = pool ?? ('pool' in current ? current.pool : rule.pools[0]?.key ?? '');
@@ -694,7 +860,9 @@
 			: undefined;
 		mutations[mutationIndex] = kind === 'clear'
 			? { kind, pool: nextPool, entity }
-			: { kind, pool: nextPool, value: value ?? ('value' in current && typeof current.value === 'number' ? current.value : 1), entity };
+			: kind === 'derive'
+				? { kind, pool: nextPool, value: { ref: { source: 'reducer' } }, entity }
+				: { kind, pool: nextPool, value: value ?? ('value' in current && typeof current.value === 'number' ? current.value : 1), entity };
 		updateClause(clauseIndex, { mutations });
 	}
 
@@ -981,6 +1149,20 @@
 					{:else if conditionModel(clause) === 'advanced'}
 						<p class="advanced-condition-note">This saved condition remains active and is preserved unchanged. Use the generated mechanic preview to inspect it.</p>
 					{/if}
+					{#if allowAssignedAbility}
+						<div class="ability-proc-controls">
+							<SegmentedChoice
+								legend="ASSIGNED ABILITY"
+								name={`${idPrefix}-assigned-ability-${clauseIndex}`}
+								options={[{value:'false',label:'ANY STATE'},{value:'true',label:'MUST BE ACTIVE'}]}
+								value={String(clause.requiresAssignedAbilityActive ?? false)}
+								onchange={(values) => updateClause(clauseIndex,{requiresAssignedAbilityActive:values[0] === 'true' ? true : undefined})}
+							/>
+							<label class="field">PROC CHANCE · %<input type="number" min="0" max="100" step="any" value={clause.procChancePercent ?? ''} oninput={(event) => updateClause(clauseIndex,{procChancePercent:event.currentTarget.value ? Number(event.currentTarget.value) : undefined})}/><small>Rolls after conditions and cooldown checks, before mutations.</small></label>
+						</div>
+					{:else}
+						<label class="field proc-chance-field">PROC CHANCE · %<input type="number" min="0" max="100" step="any" value={clause.procChancePercent ?? ''} oninput={(event) => updateClause(clauseIndex,{procChancePercent:event.currentTarget.value ? Number(event.currentTarget.value) : undefined})}/><small>Rolls after conditions and cooldown checks, before mutations.</small></label>
+					{/if}
 				</div>
 				<div class="reducer-controls">
 					<SegmentedChoice
@@ -1002,43 +1184,82 @@
 					{:else if clause.reducer.kind === 'periodic'}
 						<label class="field">INTERVAL · SECONDS<input type="number" min="0.01" step="any" value={typeof clause.reducer.intervalSeconds === 'number' ? clause.reducer.intervalSeconds : 1} oninput={(event) => setReducerNumber(clauseIndex,'intervalSeconds',event.currentTarget.value)}/></label>
 					{:else if clause.reducer.kind === 'derived_scalar'}
-						<label class="field">DERIVED VALUE<input type="number" step="any" value={typeof clause.reducer.value === 'number' ? clause.reducer.value : 1} oninput={(event) => setReducerNumber(clauseIndex,'value',event.currentTarget.value)}/></label>
+						<SegmentedChoice
+							legend="DERIVED VALUE SOURCE"
+							name={`${idPrefix}-derived-source-${clauseIndex}`}
+							options={[
+								{value:'static',label:'STATIC'},
+								{value:'event',label:'EVENT FIELD',disabled:numericEventFields(clause).length === 0},
+								...(derivedScalarModel(clause) === 'advanced' ? [{value:'advanced',label:'ADVANCED',disabled:true}] : [])
+							]}
+							value={derivedScalarModel(clause)}
+							onchange={(values) => setDerivedScalarModel(clauseIndex,values[0])}
+						/>
+						{#if derivedScalarModel(clause) === 'event'}
+							<SegmentedChoice
+								legend="NUMERIC EVENT FIELD"
+								name={`${idPrefix}-derived-event-${clauseIndex}`}
+								options={numericEventFields(clause).map((field) => ({value:field.path,label:field.label.toUpperCase()}))}
+								value={readEventFieldNumericExpression(clause.reducer.value) ?? ''}
+								columns={Math.min(3,numericEventFields(clause).length)}
+								onchange={(values) => setDerivedScalarEventField(clauseIndex,values[0])}
+							/>
+						{:else if derivedScalarModel(clause) === 'static'}
+							<label class="field">DERIVED VALUE<input type="number" step="any" value={typeof clause.reducer.value === 'number' ? clause.reducer.value : 1} oninput={(event) => setReducerNumber(clauseIndex,'value',event.currentTarget.value)}/></label>
+						{/if}
 					{/if}
 				</div>
 
 				<div class="mutation-panel">
-					<div class="outcome-heading"><div><span>STATE CHANGES</span><strong>{clause.mutations.length}</strong></div><button type="button" class="secondary compact-action" onclick={() => addMutation(clauseIndex)} disabled={!rule.pools.length}>ADD STATE CHANGE ＋</button></div>
+					<div class="outcome-heading"><div><span>STATE CHANGES</span><strong>{clause.mutations.length}</strong></div><div class="mutation-actions"><button type="button" class="secondary compact-action" onclick={() => addMutation(clauseIndex)} disabled={!rule.pools.length}>ADD STATE CHANGE ＋</button>{#if allowAssignedAbility}<button type="button" class="secondary compact-action" onclick={() => addAbilityDurationExtension(clauseIndex)}>EXTEND ABILITY ＋</button>{/if}<button type="button" class="secondary compact-action" onclick={() => addCooldownOnMax(clauseIndex)} disabled={rule.pools.filter((pool) => pool.max && pool.max > 0).length < 2}>ADD MAX COOLDOWN ＋</button></div></div>
 					{#each clause.mutations as mutation, mutationIndex}
-						<div class="mutation-row">
-							<SegmentedChoice
-								legend="OPERATION"
-								name={`${idPrefix}-mutation-kind-${clauseIndex}-${mutationIndex}`}
-								options={[{value:'add',label:'ADD'},{value:'set',label:'SET'},{value:'consume',label:'CONSUME'},{value:'clear',label:'CLEAR'}]}
-								value={mutation.kind === 'none' || mutation.kind === 'derive' || mutation.kind === 'transfer' ? 'add' : mutation.kind}
-								onchange={(values) => updateMutation(clauseIndex,mutationIndex,values[0] as 'add'|'set'|'consume'|'clear')}
-							/>
-							<SegmentedChoice
-								legend="STATE POOL"
-								name={`${idPrefix}-mutation-pool-${clauseIndex}-${mutationIndex}`}
-								options={rule.pools.map((pool) => ({value:pool.key,label:pool.label.toUpperCase()}))}
-								value={'pool' in mutation ? mutation.pool : rule.pools[0]?.key ?? ''}
-								columns={Math.min(4,Math.max(1,rule.pools.length))}
-								onchange={(values) => updateMutation(clauseIndex,mutationIndex,mutation.kind === 'clear' ? 'clear' : mutation.kind === 'set' || mutation.kind === 'consume' ? mutation.kind : 'add',values[0])}
-							/>
-							{#if mutation.kind !== 'clear'}
-								<label class="field">VALUE<input type="number" step="any" value={'value' in mutation && typeof mutation.value === 'number' ? mutation.value : 1} oninput={(event) => updateMutation(clauseIndex,mutationIndex,mutation.kind === 'set' || mutation.kind === 'consume' ? mutation.kind : 'add',undefined,Number(event.currentTarget.value))}/></label>
-							{/if}
-							{#if 'pool' in mutation && rule.pools.find((pool) => pool.key === mutation.pool)?.scope === 'target'}
+						{#if mutation.kind === 'extend_duration'}
+							<div class="mutation-row ability-mutation-row">
+								<div class="branch-readout"><span>OPERATION</span><strong>EXTEND ASSIGNED ABILITY</strong></div>
+								<label class="field">SECONDS<input type="number" min="0" step="any" value={typeof mutation.seconds === 'number' ? mutation.seconds : 0} oninput={(event) => updateAbilityDurationExtension(clauseIndex,mutationIndex,event.currentTarget.value)}/><small>Applies only while the assigned ability remains active.</small></label>
+								<button type="button" class="remove" onclick={() => updateClause(clauseIndex,{mutations:clause.mutations.filter((_,index) => index !== mutationIndex)})}>REMOVE</button>
+							</div>
+						{:else if mutation.kind === 'start_cooldown_on_max'}
+							<div class="mutation-row cooldown-mutation-row">
+								<div class="branch-readout"><span>OPERATION</span><strong>START COOLDOWN ON MAX</strong></div>
+								<SegmentedChoice legend="STACK POOL" name={`${idPrefix}-cooldown-stack-${clauseIndex}-${mutationIndex}`} options={rule.pools.filter((pool) => pool.max && pool.max > 0).map((pool) => ({value:pool.key,label:pool.label.toUpperCase()}))} value={mutation.stackPool} onchange={(values) => updateCooldownOnMax(clauseIndex,mutationIndex,{stackPool:values[0]})}/>
+								<SegmentedChoice legend="COOLDOWN POOL" name={`${idPrefix}-cooldown-pool-${clauseIndex}-${mutationIndex}`} options={rule.pools.filter((pool) => pool.scope === 'agent' && pool.expiresAfterSeconds && pool.key !== mutation.stackPool).map((pool) => ({value:pool.key,label:pool.label.toUpperCase()}))} value={mutation.cooldownPool} onchange={(values) => updateCooldownOnMax(clauseIndex,mutationIndex,{cooldownPool:values[0]})}/>
+								<button type="button" class="remove" onclick={() => updateClause(clauseIndex,{mutations:clause.mutations.filter((_,index) => index !== mutationIndex)})}>REMOVE</button>
+							</div>
+						{:else}
+							<div class="mutation-row">
 								<SegmentedChoice
-									legend="STATE OWNER"
-									name={`${idPrefix}-mutation-entity-${clauseIndex}-${mutationIndex}`}
-									options={[{value:'event_target',label:'EVENT TARGET'},{value:'event_actor',label:'EVENT ACTOR'}]}
-									value={'entity' in mutation && mutation.entity?.kind === 'event_actor' ? 'event_actor' : 'event_target'}
-									onchange={(values) => updateMutationEntity(clauseIndex,mutationIndex,values[0] as 'event_target'|'event_actor')}
+									legend="OPERATION"
+									name={`${idPrefix}-mutation-kind-${clauseIndex}-${mutationIndex}`}
+									options={[{value:'add',label:'ADD'},{value:'set',label:'SET'},{value:'consume',label:'CONSUME'},{value:'derive',label:'DERIVED VALUE'},{value:'clear',label:'CLEAR'}]}
+									value={mutation.kind === 'none' || mutation.kind === 'transfer' ? 'add' : mutation.kind}
+									onchange={(values) => updateMutation(clauseIndex,mutationIndex,values[0] as 'add'|'set'|'consume'|'derive'|'clear')}
 								/>
-							{/if}
-							<button type="button" class="remove" onclick={() => updateClause(clauseIndex,{mutations:clause.mutations.filter((_,index) => index !== mutationIndex)})}>REMOVE</button>
-						</div>
+								<SegmentedChoice
+									legend="STATE POOL"
+									name={`${idPrefix}-mutation-pool-${clauseIndex}-${mutationIndex}`}
+									options={rule.pools.map((pool) => ({value:pool.key,label:pool.label.toUpperCase()}))}
+									value={'pool' in mutation ? mutation.pool : rule.pools[0]?.key ?? ''}
+									columns={Math.min(4,Math.max(1,rule.pools.length))}
+									onchange={(values) => updateMutation(clauseIndex,mutationIndex,mutation.kind === 'clear' ? 'clear' : mutation.kind === 'derive' ? 'derive' : mutation.kind === 'set' || mutation.kind === 'consume' ? mutation.kind : 'add',values[0])}
+								/>
+								{#if mutation.kind !== 'clear' && mutation.kind !== 'derive'}
+									<label class="field">VALUE<input type="number" step="any" value={'value' in mutation && typeof mutation.value === 'number' ? mutation.value : 1} oninput={(event) => updateMutation(clauseIndex,mutationIndex,mutation.kind === 'set' || mutation.kind === 'consume' ? mutation.kind : 'add',undefined,Number(event.currentTarget.value))}/></label>
+								{:else if mutation.kind === 'derive'}
+									<div class="branch-readout"><span>VALUE</span><strong>DERIVED SCALAR</strong></div>
+								{/if}
+								{#if 'pool' in mutation && rule.pools.find((pool) => pool.key === mutation.pool)?.scope === 'target'}
+									<SegmentedChoice
+										legend="STATE OWNER"
+										name={`${idPrefix}-mutation-entity-${clauseIndex}-${mutationIndex}`}
+										options={[{value:'event_target',label:'EVENT TARGET'},{value:'event_actor',label:'EVENT ACTOR'}]}
+										value={'entity' in mutation && mutation.entity?.kind === 'event_actor' ? 'event_actor' : 'event_target'}
+										onchange={(values) => updateMutationEntity(clauseIndex,mutationIndex,values[0] as 'event_target'|'event_actor')}
+									/>
+								{/if}
+								<button type="button" class="remove" onclick={() => updateClause(clauseIndex,{mutations:clause.mutations.filter((_,index) => index !== mutationIndex)})}>REMOVE</button>
+							</div>
+						{/if}
 					{:else}
 						<p class="empty-state">This branch emits outcomes without changing shared state.</p>
 					{/each}
@@ -1049,25 +1270,24 @@
 					<div class="outcome-card">
 						<div class="outcome-grid">
 							<label class="field">LABEL<input value={outcome.label} oninput={(event) => updateOutcome(clauseIndex,outcomeIndex,{label:event.currentTarget.value,key:slug(event.currentTarget.value)})}/></label>
-							<SegmentedChoice legend="KIND" name={`${idPrefix}-kind-${clauseIndex}-${outcomeIndex}`} options={outcomeKinds} value={outcome.kind} onchange={(values) => updateOutcome(clauseIndex,outcomeIndex,{kind:values[0] as ConditionalMechanicOutcomeDraft['kind'],resource:values[0] === 'restoration' || values[0] === 'resource_cost' ? outcome.resource ?? 'health' : undefined,attributeId:values[0] === 'attribute_modifier' ? outcome.attributeId ?? '' : undefined,delivery:values[0] === 'restoration' ? outcome.delivery : undefined,durationSeconds:values[0] === 'restoration' ? outcome.durationSeconds : undefined})}/>
+							<SegmentedChoice legend="KIND" name={`${idPrefix}-kind-${clauseIndex}-${outcomeIndex}`} options={outcomeKinds} value={outcome.kind} onchange={(values) => setOutcomeKind(clauseIndex,outcomeIndex,values[0] as ConditionalMechanicOutcomeDraft['kind'])}/>
 							<label class="field">DESCRIPTION SLOT<input type="number" min="1" step="1" value={outcome.descriptionSlot ?? ''} oninput={(event) => updateOutcome(clauseIndex,outcomeIndex,{descriptionSlot:event.currentTarget.value ? Number(event.currentTarget.value) : undefined})}/></label>
 						</div>
-						<SegmentedChoice legend="TARGET SCOPE" name={`${idPrefix}-scope-${clauseIndex}-${outcomeIndex}`} options={scopeOptions} value={outcome.scope} columns={scopeOptions.length > 4 ? 4 : scopeOptions.length} onchange={(values) => updateOutcome(clauseIndex,outcomeIndex,{scope:values[0] as MechanicOutcomeScope})}/>
+						<SegmentedChoice legend="TARGET SCOPE" name={`${idPrefix}-scope-${clauseIndex}-${outcomeIndex}`} options={scopeOptions} value={outcome.scope} columns={scopeOptions.length > 4 ? 4 : scopeOptions.length} onchange={(values) => setOutcomeScope(clauseIndex,outcomeIndex,values[0] as MechanicOutcomeScope)}/>
 						{#if outcome.scope === 'allies' || outcome.scope === 'self_and_allies' || outcome.scope === 'target'}
 							<div class="delivery-controls">
 								<SegmentedChoice
 									legend="AREA TARGETING"
 									name={`${idPrefix}-targeting-${clauseIndex}-${outcomeIndex}`}
-									options={[{value:'none',label:'NONE'},{value:'allies',label:'ALLIES IN RADIUS'},{value:'enemies',label:'ENEMIES IN RADIUS'}]}
-									value={outcome.targeting?.population ?? 'none'}
-									onchange={(values) => updateOutcome(clauseIndex,outcomeIndex,{
-										targeting: values[0] === 'none'
-											? undefined
-											: {kind:'within_radius',population:values[0] as 'allies'|'enemies',radiusMeters:outcome.targeting?.radiusMeters ?? 20}
-									})}
+									options={targetingOptions(clause,outcome)}
+									value={mechanicTargetingMode(outcome.targeting)}
+									onchange={(values) => setOutcomeTargeting(clauseIndex,outcomeIndex,values[0] as MechanicTargetingMode)}
 								/>
 								{#if outcome.targeting}
 									<label class="field">RADIUS (METERS)<input type="number" min="0.01" step="any" value={outcome.targeting.radiusMeters} oninput={(event) => updateOutcome(clauseIndex,outcomeIndex,{targeting:{...outcome.targeting!,radiusMeters:Number(event.currentTarget.value)}})}/></label>
+									{#if outcome.targeting.kind === 'event_target_area'}
+										<p class="area-targeting-note"><strong>EVENT TARGET CENTER</strong><span>Damages each valid enemy at or inside the radius once. Runtime events must supply the authoritative target sample.</span></p>
+									{/if}
 								{/if}
 							</div>
 						{/if}
@@ -1154,8 +1374,9 @@
 								<label class="field">{column.label} VALUE<input type="number" step="any" value={outcome.variants[column.variantKey]?.value ?? 0} oninput={(event) => updateVariant(clauseIndex,outcomeIndex,column.variantKey,event.currentTarget.value)}/></label>
 							{/each}
 						</div>
+						<label class="field probability-field">OUTCOME CHANCE · %<input type="number" min="0" max="100" step="any" value={outcome.probabilityPercent ?? ''} oninput={(event) => updateOutcome(clauseIndex,outcomeIndex,{probabilityPercent:event.currentTarget.value ? Number(event.currentTarget.value) : undefined})}/><small>Each eligible outcome rolls independently. Maximum Potential resolves each nonzero chance as successful.</small></label>
 						<div class="outcome-footer">
-							<SegmentedChoice legend="PHASE" name={`${idPrefix}-phase-${clauseIndex}-${outcomeIndex}`} options={[{value:'on_event',label:'ON EVENT'},{value:'after_event',label:'AFTER EVENT'},{value:'while_active',label:'WHILE ACTIVE'},{value:'on_enter',label:'ON ENTER'},{value:'on_exit',label:'ON EXIT'}]} value={outcome.phase} onchange={(values) => updateOutcome(clauseIndex,outcomeIndex,{phase:values[0] as OutcomePhase})}/>
+							<SegmentedChoice legend="PHASE" name={`${idPrefix}-phase-${clauseIndex}-${outcomeIndex}`} options={phaseOptions(outcome)} value={outcome.phase} onchange={(values) => updateOutcome(clauseIndex,outcomeIndex,{phase:values[0] as OutcomePhase})}/>
 							<button type="button" class="remove" onclick={() => updateClause(clauseIndex,{outcomes:clause.outcomes.filter((_,index) => index !== outcomeIndex)})}>REMOVE OUTCOME</button>
 						</div>
 					</div>
@@ -1198,6 +1419,8 @@
 	.branch>header>div{display:flex;align-items:end;gap:9px}.branch>header>div>span{align-self:center;color:var(--shd-orange);font:900 var(--shd-type-telemetry)/1 var(--shd-font-mono)}.branch>header .field{min-width:min(360px,55vw);margin:0}
 	.branch-grid{display:grid;grid-template-columns:repeat(2,minmax(240px,1fr)) minmax(160px,.45fr);align-items:end;gap:var(--shd-gap-sm);padding:var(--shd-gap-sm)}
 	.condition-controls{display:grid;grid-template-columns:minmax(260px,.7fr) minmax(320px,1.3fr);align-items:end;gap:var(--shd-gap-sm);padding:0 var(--shd-gap-sm) var(--shd-gap-sm)}
+	.ability-proc-controls{display:grid;grid-template-columns:minmax(240px,.7fr) minmax(180px,.4fr);align-items:end;gap:var(--shd-gap-sm)}
+	.ability-proc-controls .field small,.proc-chance-field small,.probability-field small,.ability-mutation-row .field small{display:block;margin-top:4px;color:var(--shd-text-muted);font-size:var(--shd-type-telemetry);line-height:1.3}
 	.health-boundaries{display:grid;grid-template-columns:repeat(2,minmax(150px,1fr));gap:var(--shd-gap-sm)}
 	.health-boundaries .field small{display:block;margin-top:4px;color:var(--shd-text-muted);font-size:var(--shd-type-telemetry);line-height:1.3}
 	.predicate-fields{display:grid;grid-template-columns:minmax(170px,1fr) minmax(190px,.8fr);align-items:end;gap:var(--shd-gap-sm)}
@@ -1207,12 +1430,15 @@
 	.branch-readout{display:grid;align-content:center;gap:3px;min-height:44px;padding:7px 9px;border:1px solid var(--shd-border);background:var(--shd-surface-raised)}.branch-readout span{color:var(--shd-text-muted);font-size:var(--shd-type-telemetry);font-weight:900;letter-spacing:.7px}.branch-readout strong{font-size:var(--shd-type-supporting)}
 	.reducer-controls{display:grid;grid-template-columns:minmax(0,1fr) repeat(2,minmax(130px,.25fr));align-items:end;gap:var(--shd-gap-sm);padding:0 var(--shd-gap-sm) var(--shd-gap-sm)}
 	.mutation-panel{margin:0 var(--shd-gap-sm) var(--shd-gap-sm);border:1px solid var(--shd-border-soft)}
+	.mutation-actions{display:flex;flex-wrap:wrap;justify-content:flex-end;gap:6px}
 	.mutation-row{display:grid;grid-template-columns:minmax(260px,1fr) minmax(220px,1fr) minmax(110px,.35fr) minmax(240px,1fr) auto;align-items:end;gap:8px;padding:8px;border-bottom:1px solid var(--shd-border-soft)}
+	.ability-mutation-row{grid-template-columns:minmax(240px,1fr) minmax(180px,.5fr) auto}.cooldown-mutation-row{grid-template-columns:minmax(210px,.8fr) minmax(220px,1fr) minmax(220px,1fr) auto}.probability-field{max-width:260px}
 	.outcome-card{display:grid;gap:8px;margin:var(--shd-gap-sm);padding:9px;border:1px solid var(--shd-border);border-left:2px solid var(--shd-info);background:var(--shd-surface-raised)}
 	.outcome-grid{display:grid;grid-template-columns:minmax(200px,1fr) minmax(360px,1.4fr) minmax(120px,.3fr);align-items:end;gap:8px}
 	.variant-grid{display:grid;grid-template-columns:repeat(auto-fit,minmax(150px,1fr));gap:8px}
 	.state-scaling{display:grid;grid-template-columns:minmax(0,1fr) minmax(260px,.75fr) repeat(2,minmax(110px,.3fr));align-items:end;gap:8px}
 	.delivery-controls{display:grid;grid-template-columns:minmax(260px,1fr) minmax(150px,.35fr);align-items:end;gap:8px}.delivery-controls>.field{margin:0}
+	.area-targeting-note{grid-column:1/-1;display:grid;gap:2px;margin:0;padding:7px 9px;border-left:2px solid var(--shd-info);background:var(--shd-model-surface);color:var(--shd-text-muted);font-size:var(--shd-type-supporting);line-height:1.4}.area-targeting-note strong{color:var(--shd-info);font-size:var(--shd-type-telemetry);letter-spacing:.7px}
 	.outcome-footer{display:flex;align-items:end;justify-content:space-between;gap:8px}
 	.remove,.danger-quiet{min-height:38px;padding:0 10px;border:1px solid var(--shd-danger);background:transparent;color:var(--shd-danger);font-size:var(--shd-type-telemetry);font-weight:900;cursor:pointer}
 	.remove:hover,.remove:focus-visible,.danger-quiet:hover,.danger-quiet:focus-visible{background:var(--shd-danger);color:var(--shd-surface)}

src/lib/database/items.ts

@@ -3,6 +3,11 @@ import type { GameDataTargetType } from '$lib/game-data-targets';
 
 export type DatabaseBadge = { label: string; tone?: string };
 export type DatabaseMeter = { label: string; value: number };
+export type DatabaseWeaponModSlot = {
+  slot: string;
+  unlockedAtTierOne: boolean;
+  iconUrl?: string;
+};
 export type DatabaseFact = {
   label: string;
   value: string;
@@ -26,8 +31,10 @@ export type DatabaseItem = {
   renderUrl?: string;
   gameIcon?: GameIconName;
   headerBadge?: string;
+  headerBadgeTone?: string;
   headerBadges?: string[];
   headerMetaIcon?: GameIconName;
+  topBorderTone?: string;
   badges?: DatabaseBadge[];
   facts: DatabaseFact[];
   factLayout?: 'grid' | 'stack';
@@ -35,9 +42,17 @@ export type DatabaseItem = {
   lines?: DatabaseFact[];
   afterLines?: DatabaseFact[];
   iconGroups?: DatabaseIconGroup[];
+  weaponModSlots?: DatabaseWeaponModSlot[];
   description?: string;
   secondaryDescription?: string;
   descriptionStyle?: 'prose' | 'data';
+  protocolPreview?: {
+    primaryStat: string;
+    primaryUnit: string;
+    primaryBaseValue: number;
+    talentDescription?: string;
+    talentEffects: Array<{ baseValue: number; unit: string }>;
+  };
 };
 
 export type DatabaseRelatedItem = {

src/lib/mods/secondary-pool.test.ts

@@ -0,0 +1,115 @@
+import { describe, expect, it } from 'vitest';
+import {
+  MOD_SECONDARY_CAPACITY,
+  normalizeModSecondaryPool,
+} from './secondary-pool';
+
+const endpoints = (
+  level1Min: number | string,
+  level1Max: number | string,
+  level20Min: number | string,
+  level20Max: number | string,
+) => ({ level1Min, level1Max, level20Min, level20Max });
+
+const range = (statId: string) => ({
+  statId,
+  values: {
+    Specialized: endpoints('1.5', '2.5', '3.5', '4.5'),
+    Superior: endpoints(2, 3, 4, 5),
+    'High-end': endpoints(3, 4, 5, 6),
+  },
+});
+
+describe('shared Mod secondary pool', () => {
+  it('defines secondary capacity for every Mod quality', () => {
+    expect(MOD_SECONDARY_CAPACITY).toEqual({
+      Standard: 0,
+      Specialized: 1,
+      Superior: 2,
+      'High-end': 2,
+    });
+  });
+
+  it('normalizes Attribute IDs and valid Level 1/20 endpoints', () => {
+    const result = normalizeModSecondaryPool([
+      range('  critical-hit-chance  '),
+      range('critical-hit-damage'),
+    ]);
+
+    expect(result.error).toBeNull();
+    expect(result.pool).toEqual([
+      {
+        statId: 'critical-hit-chance',
+        values: {
+          Specialized: endpoints(1.5, 2.5, 3.5, 4.5),
+          Superior: endpoints(2, 3, 4, 5),
+          'High-end': endpoints(3, 4, 5, 6),
+        },
+      },
+      {
+        statId: 'critical-hit-damage',
+        values: {
+          Specialized: endpoints(1.5, 2.5, 3.5, 4.5),
+          Superior: endpoints(2, 3, 4, 5),
+          'High-end': endpoints(3, 4, 5, 6),
+        },
+      },
+    ]);
+  });
+
+  it('rejects duplicate Attributes after ID normalization', () => {
+    const result = normalizeModSecondaryPool([
+      range('critical-hit-chance'),
+      range(' critical-hit-chance '),
+    ]);
+
+    expect(result).toEqual({
+      pool: [],
+      error: 'Choose a unique Attribute for every shared pool option.',
+    });
+  });
+
+  it.each([
+    [
+      'missing quality ranges',
+      {
+        ...range('critical-hit-chance'),
+        values: {
+          Specialized: endpoints(1, 2, 3, 4),
+          Superior: endpoints(2, 3, 4, 5),
+        },
+      },
+    ],
+    [
+      'reversed ranges',
+      {
+        ...range('critical-hit-chance'),
+        values: {
+          ...range('critical-hit-chance').values,
+          Specialized: endpoints(2, 1, 3, 4),
+        },
+      },
+    ],
+    [
+      'Level 20 regression',
+      {
+        ...range('critical-hit-chance'),
+        values: {
+          ...range('critical-hit-chance').values,
+          Specialized: endpoints(2, 3, 1, 2),
+        },
+      },
+    ],
+  ])('rejects %s', (_label, invalidRange) => {
+    const result = normalizeModSecondaryPool([
+      invalidRange,
+      range('critical-hit-damage'),
+    ]);
+
+    expect(result).toEqual({
+      pool: [],
+      error:
+        'Configure valid Level 1 and Level 20 ranges for Specialized, Superior, and High-end quality.',
+    });
+  });
+});

src/lib/mods/secondary-pool.ts

@@ -0,0 +1,102 @@
+export const MOD_QUALITIES = [
+  'Standard',
+  'Specialized',
+  'Superior',
+  'High-end',
+] as const;
+
+export const MOD_SECONDARY_QUALITIES = [
+  'Specialized',
+  'Superior',
+  'High-end',
+] as const;
+
+export const MOD_SECONDARY_CAPACITY = {
+  Standard: 0,
+  Specialized: 1,
+  Superior: 2,
+  'High-end': 2,
+} as const satisfies Record<(typeof MOD_QUALITIES)[number], number>;
+
+export type ModSecondaryQuality = (typeof MOD_SECONDARY_QUALITIES)[number];
+
+export type ModSecondaryRange = {
+  statId: string;
+  values: Record<
+    ModSecondaryQuality,
+    {
+      level1Min: number;
+      level1Max: number;
+      level20Min: number;
+      level20Max: number;
+    }
+  >;
+};
+
+export function normalizeModSecondaryPool(input: unknown): {
+  pool: ModSecondaryRange[];
+  error: string | null;
+} {
+  if (!Array.isArray(input) || input.length < 2 || input.length > 50) {
+    return {
+      pool: [],
+      error: 'Configure between two and 50 shared secondary Attributes.',
+    };
+  }
+
+  const pool = input.map((candidate) => {
+    const range = candidate as Partial<ModSecondaryRange>;
+    return {
+      statId: typeof range.statId === 'string' ? range.statId.trim() : '',
+      values: Object.fromEntries(
+        MOD_SECONDARY_QUALITIES.map((quality) => {
+          const values = range.values?.[quality] as
+            | Partial<ModSecondaryRange['values'][ModSecondaryQuality]>
+            | undefined;
+          return [
+            quality,
+            {
+              level1Min: Number(values?.level1Min),
+              level1Max: Number(values?.level1Max),
+              level20Min: Number(values?.level20Min),
+              level20Max: Number(values?.level20Max),
+            },
+          ];
+        }),
+      ) as ModSecondaryRange['values'],
+    };
+  });
+
+  if (
+    pool.some((range) => !range.statId) ||
+    new Set(pool.map((range) => range.statId)).size !== pool.length
+  ) {
+    return {
+      pool: [],
+      error: 'Choose a unique Attribute for every shared pool option.',
+    };
+  }
+
+  if (
+    pool.some((range) =>
+      MOD_SECONDARY_QUALITIES.some((quality) => {
+        const values = range.values[quality];
+        return (
+          Object.values(values).some((value) => !Number.isFinite(value)) ||
+          values.level1Max < values.level1Min ||
+          values.level20Max < values.level20Min ||
+          values.level20Min < values.level1Min ||
+          values.level20Max < values.level1Max
+        );
+      }),
+    )
+  ) {
+    return {
+      pool: [],
+      error:
+        'Configure valid Level 1 and Level 20 ranges for Specialized, Superior, and High-end quality.',
+    };
+  }
+
+  return { pool, error: null };
+}

src/lib/server/ai/mechanic-authoring-prompt.test.ts

@@ -94,7 +94,7 @@ describe('AI mechanic authoring prompt', () => {
       }),
     );
 
-    expect(AI_MECHANIC_PROMPT_VERSION).toBe(7);
+    expect(AI_MECHANIC_PROMPT_VERSION).toBe(11);
     expect(input.canonicalCatalog.grammar.outcome.optional).toEqual(
       expect.arrayContaining(['delivery', 'durationSeconds']),
     );
@@ -136,7 +136,7 @@ describe('AI mechanic authoring prompt', () => {
       ]),
     );
     expect(AI_MECHANIC_AUTHORING_INSTRUCTIONS).toContain(
-      'Prompt contract version: 7',
+      'Prompt contract version: 11',
     );
 
     const advertised = structuredClone(
@@ -185,7 +185,7 @@ describe('AI mechanic authoring prompt', () => {
     expect(parsed.ok).toBe(true);
   });
 
-  it('advertises the canonical Extra Health change event contract in version 7', () => {
+  it('advertises the canonical Extra Health change event contract in version 11', () => {
     const input = JSON.parse(
       buildAiMechanicAuthoringInput({
         request,
@@ -196,9 +196,9 @@ describe('AI mechanic authoring prompt', () => {
       }),
     );
 
-    expect(AI_MECHANIC_PROMPT_VERSION).toBe(7);
+    expect(AI_MECHANIC_PROMPT_VERSION).toBe(11);
     expect(AI_MECHANIC_AUTHORING_INSTRUCTIONS).toContain(
-      'Prompt contract version: 7',
+      'Prompt contract version: 11',
     );
     expect(input.canonicalCatalog.events).toContainEqual({
       key: 'extra_health_changed',
@@ -222,6 +222,144 @@ describe('AI mechanic authoring prompt', () => {
     });
   });
 
+  it('advertises assigned-ability activity for kill and assist predicates', () => {
+    const input = JSON.parse(
+      buildAiMechanicAuthoringInput({
+        request,
+        attributes: [],
+        events: [
+          MECHANIC_EVENT_REGISTRY.enemy_killed,
+          MECHANIC_EVENT_REGISTRY.assist,
+        ],
+        actions: [],
+        recipeKeys: [],
+      }),
+    );
+
+    for (const event of input.canonicalCatalog.events) {
+      expect(event.fields).toEqual(
+        expect.arrayContaining([
+          {
+            path: 'values.assignedAbilityActive',
+            label: 'Assigned ability active',
+            type: 'boolean',
+          },
+        ]),
+      );
+    }
+    expect(input.examplesAndRules).toEqual(
+      expect.arrayContaining([
+        expect.stringContaining('values.assignedAbilityActive'),
+      ]),
+    );
+  });
+
+  it('advertises and round-trips aimed event-target area damage', () => {
+    const protocolRequest: AiMechanicAuthoringRequest = {
+      ...request,
+      context: {
+        sourceKind: 'os_protocol_talent',
+        sourceName: 'Untitled mechanic',
+        sourceDescription:
+          'Critical Hits performed during aiming create an explosion with a radius of 5 meters around the target that deals damage equal to 2000% Firepower to them.',
+      },
+      valueColumns: [{ key: 'base', variantKey: 'base', label: 'BASE' }],
+      allowProtocolUpgradeScaling: true,
+    };
+    const input = JSON.parse(
+      buildAiMechanicAuthoringInput({
+        request: protocolRequest,
+        attributes: [
+          {
+            id: 'firepower-id',
+            name: 'Firepower',
+            description: null,
+            unit: '',
+            type: null,
+            category: null,
+            calculationType: null,
+          },
+        ],
+        events: [MECHANIC_EVENT_REGISTRY.weapon_hit],
+        actions: [],
+        recipeKeys: [],
+      }),
+    );
+
+    expect(input.canonicalCatalog.events[0].fields).toContainEqual({
+      path: 'values.aiming',
+      label: 'Aiming down sights',
+      type: 'boolean',
+    });
+    expect(
+      input.canonicalCatalog.grammar.outcome.targeting.eventTargetArea,
+    ).toMatchObject({
+      kind: 'event_target_area',
+      center: 'event_target',
+      validTargets: 'enemies',
+    });
+    expect(input.examplesAndRules).toEqual(
+      expect.arrayContaining([
+        expect.stringContaining('values.aiming'),
+        expect.stringContaining('event_target_area'),
+      ]),
+    );
+
+    const advertised = structuredClone(
+      input.canonicalCatalog.grammar.aimedCriticalAreaDamageShape,
+    );
+    const outcome = advertised.clauses[0].outcomes[0];
+    const base = JSON.parse(
+      JSON.stringify(
+        outcome.variants['replace-with-each-required-variant-key'],
+      ).replaceAll(
+        'replace-with-an-exact-catalog-attribute-id',
+        'firepower-id',
+      ),
+    );
+    outcome.variants = { base };
+    const parsed = parseConditionalMechanicDraft(advertised, {
+      variantKeys: ['base'],
+      allowedAttributeIds: new Set(['firepower-id']),
+    });
+    expect(parsed.ok).toBe(true);
+  });
+
+  it('advertises reproducible outcome and clause proc probabilities in version 11', () => {
+    const input = JSON.parse(
+      buildAiMechanicAuthoringInput({
+        request,
+        attributes: [],
+        events: [MECHANIC_EVENT_REGISTRY.skill_hit],
+        actions: [],
+        recipeKeys: [],
+      }),
+    );
+
+    expect(AI_MECHANIC_PROMPT_VERSION).toBe(11);
+    expect(input.canonicalCatalog.grammar.clause.optional).toEqual(
+      expect.arrayContaining([
+        'procChancePercent',
+        'requiresAssignedAbilityActive',
+      ]),
+    );
+    expect(input.canonicalCatalog.grammar.mutationKinds).toEqual(
+      expect.arrayContaining(['extend_duration', 'start_cooldown_on_max']),
+    );
+    expect(
+      input.canonicalCatalog.grammar.probabilityOutcomeShape,
+    ).toMatchObject({
+      probabilityPercent: 29,
+      resource: 'ammo',
+    });
+    expect(input.examplesAndRules).toEqual(
+      expect.arrayContaining([
+        expect.stringContaining('procChancePercent'),
+        expect.stringContaining('reproducible seeded random stream'),
+      ]),
+    );
+  });
+
   it('advertises authoritative current Health percentage with strict band semantics', () => {
     const input = JSON.parse(
       buildAiMechanicAuthoringInput({
@@ -351,4 +489,62 @@ describe('AI mechanic authoring prompt', () => {
     });
     expect(parsed.ok).toBe(true);
   });
+  it('advertises draft variant-value scaling and the typed proximity input in version 11', () => {
+    const input = JSON.parse(
+      buildAiMechanicAuthoringInput({
+        request: {
+          ...request,
+          context: {
+            ...request.context,
+            sourceName: 'Close and Personal',
+            sourceDescription:
+              'Increase Weapon Damage by (1)% plus (2)% for each nearby ally with a buff granted by you.',
+          },
+        },
+        attributes: [],
+        events: [MECHANIC_EVENT_REGISTRY.proximity_snapshot],
+        actions: [],
+        recipeKeys: [],
+      }),
+    );
+    const grammar = input.canonicalCatalog.grammar;
+    const proximityEvent = input.canonicalCatalog.events[0];
+
+    expect(AI_MECHANIC_PROMPT_VERSION).toBe(11);
+    expect(AI_MECHANIC_AUTHORING_INSTRUCTIONS).toContain(
+      'Prompt contract version: 11',
+    );
+    expect(grammar.valueReferences).toContain('variant_value');
+    expect(grammar.draftOutcomeExpressionReferences).toEqual(['variant_value']);
+    expect(grammar.referenceShapes).toContainEqual({
+      ref: { source: 'variant_value' },
+    });
+    expect(proximityEvent.fields).toContainEqual({
+      path: 'values.alliesWithin30MetersWithAgentGrantedBuff',
+      label: 'Allies within 30 meters with an Agent-granted buff',
+      type: 'number',
+      minimum: 0,
+      integer: true,
+    });
+    expect(proximityEvent.strictFields).toBeUndefined();
+    expect(AI_MECHANIC_AUTHORING_INSTRUCTIONS).toEqual(
+      expect.stringContaining('unresolved numbered source placeholder'),
+    );
+    expect(AI_MECHANIC_AUTHORING_INSTRUCTIONS).toEqual(
+      expect.stringContaining('{ref:{source:"variant_value"}}'),
+    );
+    expect(input.examplesAndRules).toEqual(
+      expect.arrayContaining([
+        expect.stringContaining('only inside an outcome variant expression'),
+        expect.stringContaining('outcome variants[variantKey].value'),
+        expect.stringContaining(
+          '{ref:{source:"event",path:"values.alliesWithin30MetersWithAgentGrantedBuff"}}',
+        ),
+        expect.stringContaining(
+          '{key:"allies-within-30m-with-agent-granted-buff"',
+        ),
+        expect.stringContaining('readiness:"ready",min:0'),
+      ]),
+    );
+  });
 });

src/lib/server/ai/mechanic-authoring-prompt.ts

@@ -3,7 +3,7 @@ import { CONDITIONAL_MECHANIC_OUTCOME_CAPABILITIES } from '$lib/calculations/mec
 import { MECHANIC_COMBAT_REFERENCE_REGISTRY } from '$lib/calculations/mechanic';
 import type { AiMechanicAttribute } from './mechanic-authoring-context';
 
-export const AI_MECHANIC_PROMPT_VERSION = 7;
+export const AI_MECHANIC_PROMPT_VERSION = 11;
 
 const mechanicsGrammar = {
   version: 1,
@@ -40,7 +40,14 @@ const mechanicsGrammar = {
   },
   clause: {
     required: ['key', 'event', 'if', 'reducer', 'mutations', 'outcomes'],
-    optional: ['label', 'recipeKey', 'cooldownSeconds', 'weight'],
+    optional: [
+      'label',
+      'recipeKey',
+      'cooldownSeconds',
+      'weight',
+      'procChancePercent',
+      'requiresAssignedAbilityActive',
+    ],
   },
   predicateKinds: ['true', 'exists', 'compare', 'all', 'any', 'not'],
   compareOperators: ['eq', 'ne', 'gt', 'gte', 'lt', 'lte'],
@@ -63,6 +70,8 @@ const mechanicsGrammar = {
     'derive',
     'clear',
     'transfer',
+    'extend_duration',
+    'start_cooldown_on_max',
   ],
   entitySelectors: ['agent', 'event_actor', 'event_target', 'event_field'],
   valueReferences: [
@@ -70,9 +79,11 @@ const mechanicsGrammar = {
     'scenario',
     'combat',
     'equipment',
+    'assigned_ability',
     'attribute',
     'reducer',
     'pool',
+    'variant_value',
   ],
   combatReferences: MECHANIC_COMBAT_REFERENCE_REGISTRY,
   numericExpressionOperators: [
@@ -85,7 +96,9 @@ const mechanicsGrammar = {
     'clamp',
     'floor',
   ],
+  draftOutcomeExpressionReferences: ['variant_value'],
   referenceShapes: [
+    { ref: { source: 'variant_value' } },
     { ref: { source: 'event', path: 'values.distanceMeters' } },
     { ref: { source: 'scenario', key: 'input-key' } },
     { ref: { source: 'combat', path: 'currentHealth', timing: 'current' } },
@@ -97,6 +110,7 @@ const mechanicsGrammar = {
       },
     },
     { ref: { source: 'equipment', path: 'protocolTalentUpgrades' } },
+    { ref: { source: 'assigned_ability', path: 'remainingDurationSeconds' } },
     {
       ref: {
         source: 'attribute',
@@ -200,6 +214,16 @@ const mechanicsGrammar = {
       value: 'all',
       clearSource: true,
     },
+    {
+      kind: 'extend_duration',
+      target: 'assigned_ability',
+      seconds: 0.3,
+    },
+    {
+      kind: 'start_cooldown_on_max',
+      stackPool: 'extension-stacks',
+      cooldownPool: 'extension-cooldown',
+    },
   ],
   outcome: CONDITIONAL_MECHANIC_OUTCOME_CAPABILITIES,
   continuousRestorationOutcomeShape: {
@@ -232,6 +256,83 @@ const mechanicsGrammar = {
       },
     },
   },
+  probabilityOutcomeShape: {
+    key: 'recover-ammo',
+    label: 'Recover Ammo',
+    phase: 'after_event',
+    kind: 'restoration',
+    scope: 'self',
+    basis: 'flat',
+    resource: 'ammo',
+    probabilityPercent: 29,
+    variants: {
+      'replace-with-each-required-variant-key': { value: 1 },
+    },
+  },
+  aimedCriticalAreaDamageShape: {
+    version: 1,
+    simulationReadiness: 'ready',
+    scenarioInputs: [],
+    pools: [],
+    clauses: [
+      {
+        key: 'aimed-critical-explosion',
+        label: 'Aimed critical hit explosion',
+        event: 'weapon_hit',
+        if: {
+          kind: 'all',
+          predicates: [
+            { kind: 'exists', value: { source: 'event', path: 'targetId' } },
+            {
+              kind: 'compare',
+              left: { source: 'event', path: 'values.critical' },
+              operator: 'eq',
+              right: true,
+            },
+            {
+              kind: 'compare',
+              left: { source: 'event', path: 'values.aiming' },
+              operator: 'eq',
+              right: true,
+            },
+          ],
+        },
+        reducer: { kind: 'none' },
+        mutations: [],
+        outcomes: [
+          {
+            key: 'critical-explosion-damage',
+            label: 'Critical explosion damage',
+            phase: 'after_event',
+            kind: 'direct_damage',
+            scope: 'target',
+            basis: 'flat',
+            targeting: {
+              kind: 'event_target_area',
+              center: 'event_target',
+              validTargets: 'enemies',
+              radiusMeters: 5,
+            },
+            variants: {
+              'replace-with-each-required-variant-key': {
+                value: 2000,
+                expression: {
+                  op: 'multiply',
+                  left: 20,
+                  right: {
+                    ref: {
+                      source: 'attribute',
+                      attributeId: 'replace-with-an-exact-catalog-attribute-id',
+                    },
+                  },
+                },
+              },
+            },
+          },
+        ],
+      },
+    ],
+  },
   preciseTraumaShape: {
     version: 1,
     simulationReadiness: 'ready',
@@ -400,6 +501,7 @@ Security and scope:
 - Use only the supplied event, action, recipe, attribute, scope, reference, expression, reducer, mutation, and outcome catalogs.
 - Never invent an Attribute ID, event, field path, source variant, or runtime behavior.
 - Ask focused questions when different answers would change the calculation. Do not guess material cadence, duration, target, stacking, reset, scope, damage basis, or value behavior.
+- An unresolved numbered source placeholder is a material missing value. Ask the human for the exact numeric value for every affected source variant; never infer or guess it.
 - If the behavior cannot be represented by the supplied grammar, return capability_gap with implementation-ready developer changes.
 
 Response rules:
@@ -409,6 +511,7 @@ Response rules:
 - All keys must be stable lower-case identifiers using letters, digits, dashes, or underscores and beginning with a letter.
 - A draft must define exactly the supplied value variants for every outcome.
 - The numeric variant value is the human-facing base value. Use expression only when runtime scaling or a live event/scenario/equipment value changes it.
+- Put each clarified placeholder answer in the corresponding outcome variant value as its human-facing value. When that value participates in a runtime expression, reference it exactly as {ref:{source:"variant_value"}}; never duplicate the numeric literal in the expression. variant_value is draft-only and valid only inside an outcome variant expression.
 - Use attribute_modifier only with an exact supplied Attribute ID.
 - Use direct_damage, restoration, or resource_cost rather than a fabricated Attribute when that is the actual mechanic.
 - Keep assumptions explicit. Use warnings for representable limitations that do not require code changes.
@@ -453,9 +556,21 @@ export function buildAiMechanicAuthoringInput(input: {
       'A target-scoped pool owns an independent value and expiry timer for each entity. Bind hit-created target state with entity:{kind:"event_target"}; do not collapse different enemies into one Agent-scoped pool.',
       'Writing a target-scoped pool refreshes only that target entity timer. An on_exit outcome runs when that entity expires and uses the entity previous state for stack bands and perStack multiplication, even though the stored pool value has already reset.',
       'When an outcome value is exactly a live Attribute amount, use the Attribute reference directly as the variant expression. Divide by 100 only when a displayed percentage is being used as a multiplier.',
+      'variant_value is draft-only and may appear only inside an outcome variant expression, with the exact shape {ref:{source:"variant_value"}}. It resolves to that same variant object’s human-facing numeric value at runtime.',
+      'If source wording contains an unresolved numbered placeholder such as {1} or {2}, return clarification_required and ask for the exact numeric answer for every affected source variant. Never guess a placeholder value.',
+      'After clarification, put each answer in the corresponding outcome variants[variantKey].value. If a runtime-scaled expression uses that answer, reference {ref:{source:"variant_value"}} rather than duplicating the numeric literal.',
+      'A weapon_hit may compare values.aiming with true only when the wording requires aiming down sights at hit resolution. Missing aiming evidence does not match; do not replace it with a scenario assumption.',
+      'An explosion centered on the hit target uses target-scoped direct_damage with targeting kind event_target_area, center event_target, validTargets enemies, and the stated positive radiusMeters. The runtime applies one equal damage emission to each authoritative valid enemy at or inside the radius. Do not use legacy within_radius metadata for explosion damage.',
       'Precise Trauma is representable as one target-scoped stack pool with a one-second expiry: body shots add one stack, headshots add two, and one on_exit direct-damage outcome uses the expiring target previous stack count. This models the stated one-second debuff without inventing generic repeated target ticks.',
+      'For proximity_snapshot, the optional values.alliesWithin30MetersWithAgentGrantedBuff field is a non-negative integer count of distinct allied Agents at or within 30 meters who possess at least one buff granted by the source Agent. Multiple qualifying buffs on one ally still count that ally once. Read it with {ref:{source:"event",path:"values.alliesWithin30MetersWithAgentGrantedBuff"}}.',
+      'When loadout timelines must supply values.alliesWithin30MetersWithAgentGrantedBuff, define the ready numeric scenario input exactly as {key:"allies-within-30m-with-agent-granted-buff",label:"Allies within 30 meters with an Agent-granted buff",kind:"number",readiness:"ready",min:0}. The loadout timeline copies that resolved count into each proximity_snapshot event, and runtime event validation rejects non-integers.',
       'OS Protocol upgrade scaling may use equipment.protocolTalentUpgrades only when allowProtocolUpgradeScaling is true.',
       'Assigned-ability scope may be used only when allowAssignedAbility is true.',
+      'When allowAssignedAbility is true, a kill or assist that must occur while the source item\'s assigned ability is active uses enemy_killed or assist with {source:"event",path:"values.assignedAbilityActive"} compared to true. This field is optional on the event; a missing value does not match.',
+      'When allowAssignedAbility is true, requiresAssignedAbilityActive gates a clause on the runtime assigned-ability state. skill_deployed and signature_ability_deployed may supply values.assignedAbilityDurationSeconds to begin that state. At an exact expiry timestamp, the ability expires before a later clause can extend it.',
+      'procChancePercent is a clause-level independent percentage roll after its predicate and cooldown checks but before the reducer, mutations, and outcomes. Use it when a successful proc changes state. probabilityPercent is an outcome-level independent percentage roll for one outcome only.',
+      'Custom simulation uses a reproducible seeded random stream. Maximum Potential resolves every nonzero chance as successful. Never use clause weight as a proc chance.',
+      'extend_duration may target only assigned_ability and does nothing while the ability is inactive. start_cooldown_on_max starts a configured expiring Agent cooldown pool only when a mutation in the same clause transitions its capped stack pool to its maximum.',
       'If cadence is not stated, ask rather than assuming a one-second interval.',
       'If wording contains separate actions such as restoration on a periodic snapshot and a health cost on every shot, represent them as separate clauses.',
       'A pool with expiresAfterSeconds refreshes the shared expiry for every current stack whenever any mutation writes that pool. Use it for mechanics where gaining a stack refreshes the duration of the full stack pool.',

src/lib/server/ai/mechanic-authoring-rate-limit.test.ts

@@ -9,21 +9,35 @@ describe('AI mechanic authoring rate limit', () => {
   beforeEach(() => resetAiMechanicRateLimitForTests());
 
   it('allows only one in-flight request per account', () => {
-    const release = reserveAiMechanicGeneration('agent-1', 1_000);
-    expect(() => reserveAiMechanicGeneration('agent-1', 1_001)).toThrow(
+    const release = reserveAiMechanicGeneration('agent-1', false, 1_000);
+    expect(() => reserveAiMechanicGeneration('agent-1', false, 1_001)).toThrow(
       AiMechanicRateLimitError,
     );
     release();
-    expect(() => reserveAiMechanicGeneration('agent-1', 1_002)).not.toThrow();
+    expect(() =>
+      reserveAiMechanicGeneration('agent-1', false, 1_002),
+    ).not.toThrow();
   });
 
   it('enforces the hourly account limit', () => {
     for (let request = 0; request < 10; request += 1) {
-      const release = reserveAiMechanicGeneration('agent-1', 10_000 + request);
+      const release = reserveAiMechanicGeneration(
+        'agent-1',
+        false,
+        10_000 + request,
+      );
       release();
     }
-    expect(() => reserveAiMechanicGeneration('agent-1', 10_100)).toThrow(
+    expect(() => reserveAiMechanicGeneration('agent-1', false, 10_100)).toThrow(
       'This account has reached the hourly mechanic authoring limit.',
     );
   });
+
+  it('does not limit administrators', () => {
+    const releases = Array.from({ length: 101 }, () =>
+      reserveAiMechanicGeneration('admin-1', true, 10_000),
+    );
+
+    for (const release of releases) release();
+  });
 });

src/lib/server/ai/mechanic-authoring-rate-limit.ts

@@ -27,7 +27,12 @@ const retryAfter = (requests: number[], now: number) =>
  * duplicate submissions and basic abuse; OpenAI project budgets remain the hard
  * cross-instance spending boundary.
  */
-export function reserveAiMechanicGeneration(userId: string, now = Date.now()) {
+export function reserveAiMechanicGeneration(
+  userId: string,
+  isAdmin = false,
+  now = Date.now(),
+) {
+  if (isAdmin) return () => {};
   if (inFlightUsers.has(userId)) {
     throw new AiMechanicRateLimitError(
       'A mechanic authoring request is already running for this account.',

src/lib/server/articles.ts

@@ -77,7 +77,7 @@ export async function syncArticleTags(database: Database) {
       `specialization-${item.id}`,
       'specialization',
       String(item.name),
-      `specialization-${slugify(String(item.name))}`,
+      `specialization-${slugify(String(item.name))}-${item.id}`,
       'specialization',
       item.id,
       Number(item.active) ? 1 : 0,
@@ -93,7 +93,7 @@ export async function syncArticleTags(database: Database) {
       `focus-${item.id}`,
       'focus',
       name,
-      `focus-${slugify(name)}`,
+      `focus-${slugify(name)}-${item.id}`,
       'focus',
       item.id,
       Number(item.active) ? 1 : 0,

src/lib/server/audit.ts

@@ -34,6 +34,7 @@ export async function recordIsacAudit(input: {
 export async function auditRecord(
   table: string,
   id: string,
+  suppliedDatabase?: Database,
 ): Promise<Record<string, unknown> | null> {
   if (
     ![
@@ -56,7 +57,7 @@ export async function auditRecord(
   ) {
     throw new Error('Unsupported audit table');
   }
-  const database = await getDatabase();
+  const database = suppliedDatabase ?? (await getDatabase());
   return (
     (await (
       await database.prepare(`SELECT * FROM ${table} WHERE id=?`)

src/lib/server/conditional-effects.test.ts

@@ -187,6 +187,7 @@ describe('conditional mechanic persistence adapter', () => {
 			value_scaling TEXT, unit TEXT, damage_basis TEXT, application_phase TEXT,
 			combat_timing TEXT, resource_kind TEXT, delivery_mode TEXT,
 			delivery_duration_seconds REAL, targeting_json TEXT, min_state_value REAL, max_state_value REAL,
+			probability_percent REAL,
 			description_slot INTEGER, sort_order INTEGER, created_at TEXT, updated_at TEXT
 		)`);
 
@@ -220,6 +221,8 @@ describe('conditional mechanic persistence adapter', () => {
             key: 'weapon-kill',
             label: 'Weapon kill',
             event: 'enemy_killed',
+            procChancePercent: 29,
+            requiresAssignedAbilityActive: true,
             if: {
               kind: 'compare',
               left: {
@@ -255,6 +258,7 @@ describe('conditional mechanic persistence adapter', () => {
                   population: 'allies',
                   radiusMeters: 40,
                 },
+                probabilityPercent: 29,
                 variants: {
                   I: { value: 240 },
                   II: { value: 336 },
@@ -263,12 +267,18 @@ describe('conditional mechanic persistence adapter', () => {
               {
                 key: 'target-detonation',
                 label: 'Target Detonation',
-                phase: 'on_exit',
+                phase: 'after_event',
                 kind: 'direct_damage',
                 scope: 'target',
                 basis: 'flat',
                 statePool: 'marked-target',
                 perStack: true,
+                targeting: {
+                  kind: 'event_target_area',
+                  center: 'event_target',
+                  validTargets: 'enemies',
+                  radiusMeters: 5,
+                },
                 variants: {
                   I: {
                     value: 240,
@@ -322,6 +332,23 @@ describe('conditional mechanic persistence adapter', () => {
             mutations: [],
             outcomes: [],
           },
+          {
+            key: 'tactical-link-assist',
+            label: 'Tactical Link assist',
+            event: 'assist',
+            if: {
+              kind: 'compare',
+              left: {
+                source: 'event',
+                path: 'values.assignedAbilityActive',
+              },
+              operator: 'eq',
+              right: true,
+            },
+            reducer: { kind: 'none' },
+            mutations: [],
+            outcomes: [],
+          },
         ],
       },
     );
@@ -366,11 +393,23 @@ describe('conditional mechanic persistence adapter', () => {
         population: 'allies',
         radiusMeters: 40,
       },
+      probabilityPercent: 29,
       variants: {
         I: { value: 240 },
         II: { value: 336 },
       },
     });
+    expect(loaded?.clauses[0].outcomes[1]).toMatchObject({
+      phase: 'after_event',
+      kind: 'direct_damage',
+      scope: 'target',
+      targeting: {
+        kind: 'event_target_area',
+        center: 'event_target',
+        validTargets: 'enemies',
+        radiusMeters: 5,
+      },
+    });
     expect(loaded?.clauses[0].if).toEqual({
       kind: 'compare',
       left: {
@@ -381,6 +420,10 @@ describe('conditional mechanic persistence adapter', () => {
       operator: 'lt',
       right: 75,
     });
+    expect(loaded?.clauses[0]).toMatchObject({
+      procChancePercent: 29,
+      requiresAssignedAbilityActive: true,
+    });
     expect(loaded?.pools[0]).toMatchObject({
       key: 'marked-target',
       stateKind: 'target_mark',
@@ -399,7 +442,7 @@ describe('conditional mechanic persistence adapter', () => {
       },
     ]);
     expect(loaded?.clauses[0].outcomes[1]).toMatchObject({
-      phase: 'on_exit',
+      phase: 'after_event',
       kind: 'direct_damage',
       scope: 'target',
       statePool: 'marked-target',
@@ -430,5 +473,14 @@ describe('conditional mechanic persistence adapter', () => {
         right: true,
       },
     });
+    expect(loaded?.clauses[2]).toMatchObject({
+      event: 'assist',
+      if: {
+        kind: 'compare',
+        left: { source: 'event', path: 'values.assignedAbilityActive' },
+        operator: 'eq',
+        right: true,
+      },
+    });
   });
 });

src/lib/server/conditional-effects.ts

@@ -90,6 +90,7 @@ const outcomeMetadataColumns = [
   'delivery_mode',
   'delivery_duration_seconds',
   'targeting_json',
+  'probability_percent',
   'state_pool_id',
   'min_state_value',
   'max_state_value',
@@ -205,6 +206,10 @@ export function conditionalRuleDraftFromRows(
     .filter((row) => row.rule_id === rule.id && Number(row.active ?? 1) === 1)
     .sort((left, right) => Number(left.sort_order) - Number(right.sort_order))
     .map((row): ConditionalMechanicClauseDraft => {
+      const parameters = parseJson<Record<string, unknown>>(
+        row.recipe_parameters_json,
+        {},
+      );
       const grouped = new Map<string, OutcomeRow[]>();
       for (const outcome of rowsByClause.get(String(row.id)) ?? []) {
         const key = String(outcome.effect_key);
@@ -268,6 +273,10 @@ export function conditionalRuleDraftFromRows(
             ...(first.targeting_json
               ? { targeting: parseJson(first.targeting_json, undefined) }
               : {}),
+            ...(first.probability_percent === null ||
+            first.probability_percent === undefined
+              ? {}
+              : { probabilityPercent: Number(first.probability_percent) }),
             ...(first.stat_attribute_id
               ? { attributeId: String(first.stat_attribute_id) }
               : {}),
@@ -329,6 +338,15 @@ export function conditionalRuleDraftFromRows(
               ),
             }
           : {}),
+        ...(typeof parameters.procChancePercent === 'number'
+          ? { procChancePercent: parameters.procChancePercent }
+          : {}),
+        ...(typeof parameters.requiresAssignedAbilityActive === 'boolean'
+          ? {
+              requiresAssignedAbilityActive:
+                parameters.requiresAssignedAbilityActive,
+            }
+          : {}),
         ...(row.cooldown_seconds === null || row.cooldown_seconds === undefined
           ? {}
           : { cooldownSeconds: Number(row.cooldown_seconds) }),
@@ -495,7 +513,17 @@ export async function saveConditionalRuleInTransaction(
       clause.label || clause.key,
       clause.event,
       clause.recipeKey ?? null,
-      '{}',
+      JSON.stringify({
+        ...(clause.procChancePercent === undefined
+          ? {}
+          : { procChancePercent: clause.procChancePercent }),
+        ...(clause.requiresAssignedAbilityActive === undefined
+          ? {}
+          : {
+              requiresAssignedAbilityActive:
+                clause.requiresAssignedAbilityActive,
+            }),
+      }),
       JSON.stringify(clause.if ?? { kind: 'true' }),
       JSON.stringify(clause.reducer),
       clause.weight === undefined ? null : JSON.stringify(clause.weight),
@@ -518,9 +546,9 @@ export async function saveConditionalRuleInTransaction(
 					 application_kind,effect_scope,stat_attribute_id,value,value_expression_json,
 					 value_basis,value_scaling,unit,damage_basis,application_phase,combat_timing,
 					 resource_kind,delivery_mode,delivery_duration_seconds,
-					 targeting_json,min_state_value,max_state_value,description_slot,sort_order,
+					 targeting_json,probability_percent,min_state_value,max_state_value,description_slot,sort_order,
 					 created_at,updated_at)
-					VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`)
+					 VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`)
         ).run(
           randomUUID(),
           ruleId,
@@ -552,6 +580,7 @@ export async function saveConditionalRuleInTransaction(
           outcome.targeting === undefined
             ? null
             : JSON.stringify(outcome.targeting),
+          outcome.probabilityPercent ?? null,
           outcome.minStacks ?? null,
           outcome.maxStacks ?? null,
           outcome.descriptionSlot ?? null,

src/lib/server/data-moderation.ts

@@ -37,14 +37,31 @@ const proposalResultKeys: Partial<
     saveAugmentProfile: { saved: 'augmentProfileSaved' },
   },
   weapons: { save: { saved: 'weaponSaved', mode: 'weaponMode' } },
-  weaponmods: { save: { saved: 'weaponModSaved', mode: 'weaponModMode' } },
-  gearmods: { save: { saved: 'gearModSaved', mode: 'gearModMode' } },
+  weaponmods: {
+    save: { saved: 'weaponModSaved', mode: 'weaponModMode' },
+    saveSlotIcon: { saved: 'weaponModSlotIconSaved' },
+    saveSecondaryPool: {
+      saved: 'weaponModSecondaryPoolSaved',
+      mode: 'weaponModSecondaryPoolMode',
+    },
+  },
+  gearmods: {
+    save: { saved: 'gearModSaved', mode: 'gearModMode' },
+    saveSecondaryPool: {
+      saved: 'gearModSecondaryPoolSaved',
+      mode: 'gearModSecondaryPoolMode',
+    },
+  },
   talents: { saveTalent: { saved: 'talentSaved', mode: 'talentMode' } },
   protocols: {
     save: { saved: 'protocolSaved', mode: 'protocolMode' },
     saveProfile: { saved: 'profileSaved' },
   },
-  skillchips: { save: { saved: 'skillChipSaved', mode: 'skillChipMode' } },
+  skillchips: {
+    save: { saved: 'skillChipSaved', mode: 'skillChipMode' },
+    savePrimaryProfile: { saved: 'skillChipPrimaryProfileSaved' },
+    saveSecondaryPool: { saved: 'skillChipSecondaryPoolSaved' },
+  },
   specializations: {
     saveProgression: { saved: 'progressionSaved' },
     saveSpecialization: {

src/lib/server/game-data-icons.ts

@@ -7,6 +7,7 @@ import {
   BackgroundRemovalError,
   removeBackgroundPreview,
 } from './remove-background';
+import { weaponModSlotDefinitionById } from '$lib/weapons/mod-slots';
 
 export const GAME_ICON_TYPES = [
   'talent',
@@ -16,6 +17,7 @@ export const GAME_ICON_TYPES = [
   'specialization',
   'specialization_ability',
   'specialization_node',
+  'weapon_mod_slot',
 ] as const;
 export type GameDataIconType = (typeof GAME_ICON_TYPES)[number];
 export const MAX_GAME_ICON_BYTES = 2 * 1024 * 1024;
@@ -23,7 +25,7 @@ export const MAX_GAME_ICON_PIXELS = 12_000_000;
 export const GAME_ICON_SIZE = 256;
 const ENTITY_ID_PATTERN = /^[0-9a-f-]{36}$/i;
 const STORAGE_KEY_PATTERN =
-  /^(talent|brand_set|os_protocol|skill_chip|specialization|specialization_ability|specialization_node)-[0-9a-f-]{36}\.webp$/i;
+  /^(talent|brand_set|os_protocol|skill_chip|specialization|specialization_ability|specialization_node|weapon_mod_slot)-[0-9a-f-]{36}\.webp$/i;
 const LIBRARY_CATEGORY: Record<GameDataIconType, string> = {
   talent: 'Talents',
   brand_set: 'Brands',
@@ -32,6 +34,7 @@ const LIBRARY_CATEGORY: Record<GameDataIconType, string> = {
   specialization: 'Specializations',
   specialization_ability: 'Specializations',
   specialization_node: 'Specializations',
+  weapon_mod_slot: 'Weapon Mods',
 };
 const LIBRARY_LABEL: Record<GameDataIconType, string> = {
   talent: 'Talent',
@@ -41,6 +44,7 @@ const LIBRARY_LABEL: Record<GameDataIconType, string> = {
   specialization: 'Specialization',
   specialization_ability: 'Specialization Ability',
   specialization_node: 'Specialization Tree Node',
+  weapon_mod_slot: 'Weapon Mod Slot',
 };
 
 export class GameDataIconValidationError extends Error {}
@@ -255,6 +259,13 @@ async function libraryMetadata(
         ],
       };
     }
+    case 'weapon_mod_slot': {
+      const definition = weaponModSlotDefinitionById(entityId);
+      return {
+        name: definition ? `${definition.name} Slot` : null,
+        tags: ['weapon mod', 'slot', definition?.name],
+      };
+    }
   }
   return { name: null, tags: [] };
 }

src/lib/server/managed-images.test.ts

@@ -1,17 +1,24 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import sharp from 'sharp';
 
-const { rmMock } = vi.hoisted(() => ({ rmMock: vi.fn() }));
+const { mkdirMock, rmMock, writeFileMock } = vi.hoisted(() => ({
+  mkdirMock: vi.fn(),
+  rmMock: vi.fn(),
+  writeFileMock: vi.fn(),
+}));
 
 vi.mock('node:fs/promises', async (importOriginal) => ({
   ...(await importOriginal<typeof import('node:fs/promises')>()),
+  mkdir: mkdirMock,
   rm: rmMock,
+  writeFile: writeFileMock,
 }));
 
 import { GAME_ICON_TYPES } from './game-data-icons';
 import {
   GAME_DATA_RENDER_TYPES,
   ManagedImageDeletionError,
+  applyGameDataRender,
   deleteManagedImage,
   processManagedImage,
 } from './managed-images';
@@ -26,6 +33,16 @@ class FakeDatabase {
   prepare(sql: string) {
     return Promise.resolve({
       get: async (...args: unknown[]) => {
+        if (
+          sql.startsWith('SELECT * FROM managed_images') &&
+          sql.includes('source_entity_type')
+        ) {
+          return [...this.images.values()].find(
+            (row) =>
+              row.source_entity_type === args[0] &&
+              row.source_entity_id === args[1],
+          );
+        }
         if (sql.startsWith('SELECT * FROM managed_images'))
           return this.images.get(String(args[0]));
         if (sql.startsWith('SELECT * FROM game_data_icons')) {
@@ -42,7 +59,64 @@ class FakeDatabase {
         }
         if (sql.startsWith('DELETE FROM managed_images')) {
           const row = this.images.get(String(args[0]));
-          if (row?.storage_key === args[1]) this.images.delete(String(args[0]));
+          if (!sql.includes('storage_key') || row?.storage_key === args[1])
+            this.images.delete(String(args[0]));
+          return;
+        }
+        if (sql.startsWith('UPDATE managed_images SET')) {
+          const row = this.images.get(String(args[7]));
+          if (!row) throw new Error('Missing managed image for update');
+          this.images.set(String(args[7]), {
+            ...row,
+            category: args[0],
+            tags_json: args[1],
+            is_icon: 0,
+            force_white: 0,
+            original_filename: args[2],
+            byte_size: args[3],
+            width: args[4],
+            height: args[5],
+            updated_at: args[6],
+          });
+          return;
+        }
+        if (sql.startsWith('INSERT INTO managed_images')) {
+          const [
+            id,
+            name,
+            category,
+            tagsJson,
+            isIcon,
+            forceWhite,
+            storageKey,
+            originalFilename,
+            byteSize,
+            width,
+            height,
+            sourceType,
+            sourceEntityId,
+            createdBy,
+            createdAt,
+            updatedAt,
+          ] = args;
+          this.images.set(String(id), {
+            id,
+            name,
+            category,
+            tags_json: tagsJson,
+            is_icon: isIcon,
+            force_white: forceWhite,
+            storage_key: storageKey,
+            original_filename: originalFilename,
+            byte_size: byteSize,
+            width,
+            height,
+            source_entity_type: sourceType,
+            source_entity_id: sourceEntityId,
+            created_by: createdBy,
+            created_at: createdAt,
+            updated_at: updatedAt,
+          });
           return;
         }
         throw new Error(`Unexpected run: ${sql}`);
@@ -210,3 +284,94 @@ describe('processManagedImage', () => {
     expect(metadata.height).toBe(1000);
   });
 });
+
+describe('applyGameDataRender', () => {
+  beforeEach(() => {
+    mkdirMock.mockReset().mockResolvedValue(undefined);
+    rmMock.mockReset().mockResolvedValue(undefined);
+    writeFileMock.mockReset().mockResolvedValue(undefined);
+  });
+
+  it.each(GAME_DATA_RENDER_TYPES)(
+    'persists and returns authoritative %s render metadata',
+    async (type) => {
+      const database = new FakeDatabase();
+      const result = await applyGameDataRender(
+        database as never,
+        type,
+        sourceId,
+        'Test Entity',
+        {
+          file: new File(['source'], 'source.png', { type: 'image/png' }),
+          remove: false,
+          processed: {
+            output: Buffer.from('processed-render'),
+            width: 1000,
+            height: 1000,
+          },
+        },
+        'operator-1',
+      );
+
+      expect(result).toMatchObject({
+        original_filename: 'source.png',
+        byte_size: Buffer.byteLength('processed-render'),
+        width: 1000,
+        height: 1000,
+        source_entity_type: `${type}_render`,
+        source_entity_id: sourceId,
+        created_by: 'operator-1',
+        created_at: expect.any(String),
+        updated_at: expect.any(String),
+      });
+      expect(writeFileMock).toHaveBeenCalledOnce();
+    },
+  );
+
+  it('returns refreshed replacement metadata without rewriting creator provenance', async () => {
+    const database = new FakeDatabase();
+    database.images.set(imageId, {
+      id: imageId,
+      name: 'Ability render',
+      category: 'Specializations',
+      tags_json: '[]',
+      is_icon: 0,
+      force_white: 0,
+      storage_key: `library-${imageId}.webp`,
+      original_filename: 'old.png',
+      byte_size: 3,
+      width: 100,
+      height: 100,
+      source_entity_type: 'specialization_ability_render',
+      source_entity_id: sourceId,
+      created_by: 'original-operator',
+      created_at: '2026-01-01T00:00:00.000Z',
+      updated_at: '2026-01-01T00:00:00.000Z',
+    });
+
+    const result = await applyGameDataRender(
+      database as never,
+      'specialization_ability',
+      sourceId,
+      'Ability',
+      {
+        file: new File(['new'], 'new.png', { type: 'image/png' }),
+        remove: false,
+        processed: {
+          output: Buffer.from('replacement'),
+          width: 1000,
+          height: 1000,
+        },
+      },
+      'replacement-operator',
+    );
+
+    expect(result).toMatchObject({
+      id: imageId,
+      original_filename: 'new.png',
+      byte_size: Buffer.byteLength('replacement'),
+      created_by: 'original-operator',
+      created_at: '2026-01-01T00:00:00.000Z',
+    });
+  });
+});

src/lib/server/managed-images.ts

@@ -41,7 +41,7 @@ export type GameDataRenderType = (typeof GAME_DATA_RENDER_TYPES)[number];
 const MAX_PIXELS = 24_000_000;
 const ID_PATTERN = /^[0-9a-f-]{36}$/i;
 const KEY_PATTERN =
-  /^(?:library|talent|brand_set|os_protocol|skill_chip|specialization|specialization_ability|specialization_node)-[0-9a-f-]{36}\.webp$/i;
+  /^(?:library|talent|brand_set|os_protocol|skill_chip|specialization|specialization_ability|specialization_node|weapon_mod_slot)-[0-9a-f-]{36}\.webp$/i;
 
 export class ManagedImageValidationError extends Error {}
 export class ManagedImageDeletionError extends Error {}
@@ -250,7 +250,7 @@ export async function applyGameDataRender(
     );
     await (
       await database.prepare(`UPDATE managed_images SET category=?,tags_json=?,is_icon=0,force_white=0,
-			original_filename=?,byte_size=?,width=?,height=?,created_by=?,updated_at=? WHERE id=?`)
+			original_filename=?,byte_size=?,width=?,height=?,updated_at=? WHERE id=?`)
     ).run(
       category[type],
       tags,
@@ -258,19 +258,14 @@ export async function applyGameDataRender(
       processed.output.length,
       processed.width,
       processed.height,
-      actorId,
       now,
       existing.id,
     );
-    return {
-      ...existing,
-      category: category[type],
-      tags_json: tags,
-      byte_size: processed.output.length,
-      width: processed.width,
-      height: processed.height,
-      updated_at: now,
-    };
+    return (
+      (await (
+        await database.prepare('SELECT * FROM managed_images WHERE id=?')
+      ).get(existing.id)) ?? null
+    );
   }
   const id = randomUUID();
   const storageKey = await saveManagedImageFile(id, processed.output);
@@ -298,20 +293,11 @@ export async function applyGameDataRender(
     now,
     now,
   );
-  return {
-    id,
-    name,
-    category: category[type],
-    tags_json: tags,
-    is_icon: 0,
-    storage_key: storageKey,
-    byte_size: processed.output.length,
-    width: processed.width,
-    height: processed.height,
-    source_entity_type: sourceType,
-    source_entity_id: entityId,
-    updated_at: now,
-  };
+  return (
+    (await (
+      await database.prepare('SELECT * FROM managed_images WHERE id=?')
+    ).get(id)) ?? null
+  );
 }
 
 export async function deleteManagedImage(database: Database, id: string) {

src/lib/server/mod-secondary-pools.ts

@@ -0,0 +1,100 @@
+import type { Database } from '@tursodatabase/database';
+import {
+  MOD_SECONDARY_QUALITIES,
+  normalizeModSecondaryPool,
+  type ModSecondaryRange,
+} from '$lib/mods/secondary-pool';
+
+export type ModSecondaryPoolKind = 'weapon' | 'gear';
+
+function tables(kind: ModSecondaryPoolKind) {
+  return {
+    options: `${kind}_mod_secondary_options`,
+    values: `${kind}_mod_secondary_quality_values`,
+  };
+}
+
+export async function getModSecondaryPool(
+  database: Database,
+  kind: ModSecondaryPoolKind,
+): Promise<ModSecondaryRange[]> {
+  const table = tables(kind);
+  const [options, values] = await Promise.all([
+    (
+      await database.prepare(`SELECT stat_attribute_id FROM ${table.options}
+      ORDER BY stat_attribute_id`)
+    ).all(),
+    (
+      await database.prepare(`SELECT * FROM ${table.values}
+      ORDER BY stat_attribute_id,quality`)
+    ).all(),
+  ]);
+
+  const pool = options.map((option) => {
+    const optionValues = values.filter(
+      (value) => value.stat_attribute_id === option.stat_attribute_id,
+    );
+    if (
+      optionValues.length !== MOD_SECONDARY_QUALITIES.length ||
+      MOD_SECONDARY_QUALITIES.some(
+        (quality) => !optionValues.some((value) => value.quality === quality),
+      )
+    ) {
+      throw new Error(
+        `${kind} Mod secondary Attribute ${String(option.stat_attribute_id)} does not have a complete quality profile.`,
+      );
+    }
+    return {
+      statId: String(option.stat_attribute_id),
+      values: Object.fromEntries(
+        optionValues.map((value) => [
+          String(value.quality),
+          {
+            level1Min: Number(value.level_1_min),
+            level1Max: Number(value.level_1_max),
+            level20Min: Number(value.level_20_min),
+            level20Max: Number(value.level_20_max),
+          },
+        ]),
+      ) as ModSecondaryRange['values'],
+    };
+  });
+  if (!pool.length) return [];
+  const normalized = normalizeModSecondaryPool(pool);
+  if (normalized.error) {
+    throw new Error(`${kind} Mod secondary pool: ${normalized.error}`);
+  }
+  return normalized.pool;
+}
+
+export async function replaceModSecondaryPool(
+  database: Database,
+  kind: ModSecondaryPoolKind,
+  pool: ModSecondaryRange[],
+) {
+  const table = tables(kind);
+  await database.exec(`DELETE FROM ${table.values}`);
+  await database.exec(`DELETE FROM ${table.options}`);
+  for (const range of pool) {
+    await (
+      await database.prepare(
+        `INSERT INTO ${table.options}(stat_attribute_id) VALUES(?)`,
+      )
+    ).run(range.statId);
+    for (const quality of MOD_SECONDARY_QUALITIES) {
+      const values = range.values[quality];
+      await (
+        await database.prepare(`INSERT INTO ${table.values}
+            (stat_attribute_id,quality,level_1_min,level_1_max,level_20_min,level_20_max)
+            VALUES(?,?,?,?,?,?)`)
+      ).run(
+        range.statId,
+        quality,
+        values.level1Min,
+        values.level1Max,
+        values.level20Min,
+        values.level20Max,
+      );
+    }
+  }
+}

src/lib/server/os-protocol-profiles.test.ts

@@ -0,0 +1,96 @@
+import { connect } from '@tursodatabase/database';
+import { afterEach, describe, expect, it } from 'vitest';
+import {
+  getOsProtocolProfileAttributeIds,
+  type OsProtocolAttributeType,
+} from './os-protocol-profiles';
+
+const databases: Array<Awaited<ReturnType<typeof connect>>> = [];
+
+afterEach(async () => {
+  await Promise.all(databases.splice(0).map((database) => database.close()));
+});
+
+async function databaseWithAttributes() {
+  const database = await connect(':memory:');
+  databases.push(database);
+  await database.exec(`CREATE TABLE stat_attributes (
+    id TEXT PRIMARY KEY,
+    name TEXT NOT NULL,
+    unit TEXT NOT NULL,
+    active INTEGER NOT NULL
+  )`);
+  for (const [id, name, unit] of [
+    ['firepower-flat', 'Firepower', ''],
+    ['firepower-percent', 'Firepower', '%'],
+    ['toughness-flat', 'Toughness', ''],
+    ['toughness-percent', 'Toughness', '%'],
+    ['engineering-flat', 'Engineering', ''],
+    ['weapon-damage-flat', 'Weapon Damage', ''],
+    ['weapon-damage-percent', 'Weapon Damage', '%'],
+    ['skill-damage-percent', 'Skill Damage', '%'],
+    ['health-flat', 'Health', ''],
+  ]) {
+    await (
+      await database.prepare(
+        'INSERT INTO stat_attributes(id,name,unit,active) VALUES(?,?,?,1)',
+      )
+    ).run(id, name, unit);
+  }
+  return database;
+}
+
+describe('OS Protocol profile Attributes', () => {
+  it.each([
+    [
+      'Firepower',
+      {
+        Core: 'firepower-flat',
+        Damage: 'weapon-damage-flat',
+        Health: 'health-flat',
+      },
+    ],
+    [
+      'Toughness',
+      {
+        Core: 'toughness-flat',
+        Damage: 'weapon-damage-flat',
+        Health: 'health-flat',
+      },
+    ],
+    [
+      'Engineering',
+      {
+        Core: 'engineering-flat',
+        Damage: 'skill-damage-percent',
+        Health: 'health-flat',
+      },
+    ],
+  ] as const)('resolves the exact %s role rows', async (type, expected) => {
+    const database = await databaseWithAttributes();
+
+    await expect(
+      getOsProtocolProfileAttributeIds(
+        database,
+        type as OsProtocolAttributeType,
+      ),
+    ).resolves.toEqual(expected);
+  });
+
+  it('reports a missing required role without selecting a similarly named row', async () => {
+    const database = await databaseWithAttributes();
+    await (
+      await database.prepare(
+        "DELETE FROM stat_attributes WHERE id='weapon-damage-flat'",
+      )
+    ).run();
+
+    await expect(
+      getOsProtocolProfileAttributeIds(database, 'Firepower'),
+    ).resolves.toEqual({
+      Core: 'firepower-flat',
+      Damage: null,
+      Health: 'health-flat',
+    });
+  });
+});

src/lib/server/os-protocol-profiles.ts

@@ -0,0 +1,48 @@
+import type { Database } from '@tursodatabase/database';
+
+export const OS_PROTOCOL_PROFILE_ATTRIBUTE_SPECS = {
+  Firepower: {
+    Core: { name: 'Firepower', unit: '' },
+    Damage: { name: 'Weapon Damage', unit: '' },
+    Health: { name: 'Health', unit: '' },
+  },
+  Toughness: {
+    Core: { name: 'Toughness', unit: '' },
+    Damage: { name: 'Weapon Damage', unit: '' },
+    Health: { name: 'Health', unit: '' },
+  },
+  Engineering: {
+    Core: { name: 'Engineering', unit: '' },
+    Damage: { name: 'Skill Damage', unit: '%' },
+    Health: { name: 'Health', unit: '' },
+  },
+} as const;
+
+export type OsProtocolAttributeType =
+  keyof typeof OS_PROTOCOL_PROFILE_ATTRIBUTE_SPECS;
+export type OsProtocolSecondaryRole = 'Core' | 'Damage' | 'Health';
+
+export async function getOsProtocolProfileAttributeIds(
+  database: Database,
+  attributeType: OsProtocolAttributeType,
+) {
+  const specs = OS_PROTOCOL_PROFILE_ATTRIBUTE_SPECS[attributeType];
+  const entries = await Promise.all(
+    (
+      Object.entries(specs) as Array<
+        [OsProtocolSecondaryRole, { name: string; unit: string }]
+      >
+    ).map(async ([role, spec]) => {
+      const row = await (
+        await database.prepare(
+          'SELECT id FROM stat_attributes WHERE active=1 AND name=? COLLATE NOCASE AND unit=?',
+        )
+      ).get(spec.name, spec.unit);
+      return [role, row ? String(row.id) : null] as const;
+    }),
+  );
+  return Object.fromEntries(entries) as Record<
+    OsProtocolSecondaryRole,
+    string | null
+  >;
+}

src/lib/server/shared-build-summary.ts

@@ -1,5 +1,6 @@
 import type { Database } from '@tursodatabase/database';
 import { attachWeaponCategoryBonuses } from '$lib/weapons/category-bonuses';
+import { hydrateSkillChipProfileRows } from '$lib/skill-chips/profiles';
 
 export async function loadSharedBuildSummaryCatalog(database: Database) {
   const [
@@ -15,7 +16,12 @@ export async function loadSharedBuildSummaryCatalog(database: Database) {
     talentEffects,
     talentTemplates,
     chipSets,
+    abilitySkillChipLinks,
     chipTwoPiece,
+    chipPrimaryOptions,
+    chipPrimaryQualityValues,
+    chipSecondaryOptions,
+    chipSecondaryQualityValues,
     chipTalents,
     chipTalentEffects,
     protocols,
@@ -26,6 +32,8 @@ export async function loadSharedBuildSummaryCatalog(database: Database) {
     protocolTalentEffects,
     specializations,
     specializationFocuses,
+    specializationAbilities,
+    focusAbilities,
     specializationNodes,
     specializationRanks,
     specializationRankEffects,
@@ -80,9 +88,29 @@ export async function loadSharedBuildSummaryCatalog(database: Database) {
         'SELECT * FROM skill_chip_sets ORDER BY name COLLATE NOCASE',
       )
     ).all(),
+    (
+      await database.prepare(
+        `SELECT link.ability_id,link.compatible_ability_id
+         FROM specialization_ability_skill_chip_links link
+         JOIN specialization_abilities ability ON ability.id=link.ability_id AND ability.active=1
+         JOIN specialization_abilities compatible ON compatible.id=link.compatible_ability_id AND compatible.active=1`,
+      )
+    ).all(),
     (
       await database.prepare('SELECT * FROM skill_chip_two_piece_bonuses')
     ).all(),
+    (await database.prepare('SELECT * FROM skill_chip_primary_options')).all(),
+    (
+      await database.prepare('SELECT * FROM skill_chip_primary_quality_values')
+    ).all(),
+    (
+      await database.prepare('SELECT * FROM skill_chip_secondary_options')
+    ).all(),
+    (
+      await database.prepare(
+        'SELECT * FROM skill_chip_secondary_quality_values',
+      )
+    ).all(),
     (await database.prepare('SELECT * FROM skill_chip_talents')).all(),
     (
       await database.prepare(
@@ -119,6 +147,16 @@ export async function loadSharedBuildSummaryCatalog(database: Database) {
         'SELECT * FROM specialization_focuses ORDER BY specialization_id,display_order,name COLLATE NOCASE',
       )
     ).all(),
+    (
+      await database.prepare(
+        'SELECT * FROM specialization_abilities ORDER BY specialization_id,name COLLATE NOCASE',
+      )
+    ).all(),
+    (
+      await database.prepare(
+        'SELECT * FROM specialization_focus_abilities ORDER BY focus_id,ability_slot',
+      )
+    ).all(),
     (
       await database.prepare(
         'SELECT * FROM specialization_tree_nodes ORDER BY focus_id,row_number,column_number',
@@ -161,12 +199,32 @@ export async function loadSharedBuildSummaryCatalog(database: Database) {
           ),
         })),
     })),
+    skillChipProfile: {
+      primaryOptions: hydrateSkillChipProfileRows(
+        chipPrimaryOptions,
+        chipPrimaryQualityValues,
+      ),
+      secondaryOptions: hydrateSkillChipProfileRows(
+        chipSecondaryOptions,
+        chipSecondaryQualityValues,
+      ),
+    },
     chipSets: chipSets.map((set) => {
       const talent = chipTalents.find(
         (item) => item.skill_chip_set_id === set.id,
       );
       return {
         ...set,
+        compatibleAbilityIds: [
+          String(set.specialization_ability_id),
+          ...abilitySkillChipLinks.flatMap((link) =>
+            link.ability_id === set.specialization_ability_id
+              ? [String(link.compatible_ability_id)]
+              : link.compatible_ability_id === set.specialization_ability_id
+                ? [String(link.ability_id)]
+                : [],
+          ),
+        ],
         twoPiece:
           chipTwoPiece.find((item) => item.skill_chip_set_id === set.id) ??
           null,
@@ -215,6 +273,18 @@ export async function loadSharedBuildSummaryCatalog(database: Database) {
         .filter((focus) => focus.specialization_id === specialization.id)
         .map((focus) => ({
           ...focus,
+          abilities: focusAbilities
+            .filter((link) => link.focus_id === focus.id)
+            .sort(
+              (left, right) =>
+                Number(left.ability_slot) - Number(right.ability_slot),
+            )
+            .map((link) =>
+              specializationAbilities.find(
+                (ability) => ability.id === link.ability_id,
+              ),
+            )
+            .filter(Boolean),
           nodes: specializationNodes
             .filter((node) => node.focus_id === focus.id)
             .map((node) => ({

src/lib/server/shared-build.ts

@@ -59,7 +59,7 @@ export async function loadSharedBuildProjection(
       ).all(),
       (
         await database.prepare(
-          'SELECT id,name,category,is_exotic,rpm,magazine,reload_speed,damage_type FROM weapons',
+          'SELECT id,name,category,is_exotic,rpm,magazine,reload_speed,damage_type,exotic_talent_id FROM weapons',
         )
       ).all(),
       (await database.prepare('SELECT id,name FROM skill_chip_sets')).all(),

src/lib/server/skill-chip-profiles.ts

@@ -0,0 +1,117 @@
+import type { Database } from '@tursodatabase/database';
+import {
+  SKILL_CHIP_PRIMARY_ATTRIBUTE_NAMES,
+  SKILL_CHIP_QUALITIES,
+  SKILL_CHIP_SECONDARY_QUALITIES,
+  type SkillChipProfile,
+} from '$lib/skill-chips/profiles';
+
+export async function getSkillChipPrimaryAttributeIds(database: Database) {
+  const rows = await (
+    await database.prepare(
+      `SELECT id,name FROM stat_attributes
+       WHERE active=1 AND name IN (${SKILL_CHIP_PRIMARY_ATTRIBUTE_NAMES.map(() => '?').join(',')})
+       ORDER BY name COLLATE NOCASE`,
+    )
+  ).all(...SKILL_CHIP_PRIMARY_ATTRIBUTE_NAMES);
+  if (rows.length !== SKILL_CHIP_PRIMARY_ATTRIBUTE_NAMES.length)
+    throw new Error(
+      'All four fixed Skill Chip primary Attributes must be active.',
+    );
+  return rows.map((row) => String(row.id));
+}
+
+async function getProfiles(
+  database: Database,
+  optionTable: string,
+  valueTable: string,
+) {
+  const [options, values] = await Promise.all([
+    (
+      await database.prepare(
+        `SELECT stat_attribute_id FROM ${optionTable} ORDER BY stat_attribute_id`,
+      )
+    ).all(),
+    (
+      await database.prepare(
+        `SELECT * FROM ${valueTable} ORDER BY stat_attribute_id,quality`,
+      )
+    ).all(),
+  ]);
+  if (!options.length) return [];
+  return options.map((option) => ({
+    statId: String(option.stat_attribute_id),
+    values: Object.fromEntries(
+      values
+        .filter((value) => value.stat_attribute_id === option.stat_attribute_id)
+        .map((value) => [
+          String(value.quality),
+          { min: Number(value.min_value), max: Number(value.max_value) },
+        ]),
+    ),
+  }));
+}
+
+export const getSkillChipPrimaryProfiles = (database: Database) =>
+  getProfiles(
+    database,
+    'skill_chip_primary_options',
+    'skill_chip_primary_quality_values',
+  );
+
+export const getSkillChipSecondaryPool = (database: Database) =>
+  getProfiles(
+    database,
+    'skill_chip_secondary_options',
+    'skill_chip_secondary_quality_values',
+  );
+
+async function replaceProfiles(
+  database: Database,
+  optionTable: string,
+  valueTable: string,
+  profiles: SkillChipProfile[],
+  qualities: readonly string[],
+) {
+  await database.exec(`DELETE FROM ${valueTable}`);
+  await database.exec(`DELETE FROM ${optionTable}`);
+  for (const profile of profiles) {
+    await (
+      await database.prepare(
+        `INSERT INTO ${optionTable}(stat_attribute_id) VALUES(?)`,
+      )
+    ).run(profile.statId);
+    for (const quality of qualities) {
+      const range = profile.values[quality];
+      await (
+        await database.prepare(
+          `INSERT INTO ${valueTable}(stat_attribute_id,quality,min_value,max_value) VALUES(?,?,?,?)`,
+        )
+      ).run(profile.statId, quality, range.min, range.max);
+    }
+  }
+}
+
+export const replaceSkillChipPrimaryProfiles = (
+  database: Database,
+  profiles: SkillChipProfile[],
+) =>
+  replaceProfiles(
+    database,
+    'skill_chip_primary_options',
+    'skill_chip_primary_quality_values',
+    profiles,
+    SKILL_CHIP_QUALITIES,
+  );
+
+export const replaceSkillChipSecondaryPool = (
+  database: Database,
+  profiles: SkillChipProfile[],
+) =>
+  replaceProfiles(
+    database,
+    'skill_chip_secondary_options',
+    'skill_chip_secondary_quality_values',
+    profiles,
+    SKILL_CHIP_SECONDARY_QUALITIES,
+  );