16 files changed, 118 insertions, 78 deletions

diff --git a/api/src/main/java/market/guess/api/GuessMarketContext.java b/api/src/main/java/market/guess/api/GuessMarketContext.java
index e11defb..4edb437 100644
--- a/api/src/main/java/market/guess/api/GuessMarketContext.java
+++ b/api/src/main/java/market/guess/api/GuessMarketContext.java
@@ -2,6 +2,7 @@ package market.guess.api;
 
 import java.math.BigDecimal;
 import market.guess.model.event.EventDetailDTO;
+import market.guess.model.market.PurchaseReceiptDTO;
 
 public interface GuessMarketContext {
   Result<PurchaseReceiptDTO> placeOrder(
diff --git a/api/src/main/java/market/guess/model/event/EventDetailDTO.java b/api/src/main/java/market/guess/model/event/EventDetailDTO.java
index 9f59b53..f5c4edf 100644
--- a/api/src/main/java/market/guess/model/event/EventDetailDTO.java
+++ b/api/src/main/java/market/guess/model/event/EventDetailDTO.java
@@ -1,8 +1,8 @@
 package market.guess.model.event;
 
 import java.util.List;
-import market.guess.api.MarketStateDTO;
-import market.guess.api.TradeRowDTO;
+import market.guess.model.market.MarketStateDTO;
+import market.guess.model.market.TradeRowDTO;
 
 public record EventDetailDTO(
     EventSummaryDTO summary,
diff --git a/api/src/main/java/market/guess/api/AccountDTO.java b/api/src/main/java/market/guess/model/ledger/LedgerDTO.java
index 134c88b..d527c12 100644
--- a/api/src/main/java/market/guess/api/AccountDTO.java
+++ b/api/src/main/java/market/guess/model/ledger/LedgerDTO.java
@@ -1,7 +1,6 @@
-package market.guess.api;
+package market.guess.model.ledger;
 
 import java.util.List;
-import market.guess.model.ledger.LedgerEntryDTO;
 
-public record AccountDTO(
+public record LedgerDTO(
     String owner, String balance, boolean blocked, List<LedgerEntryDTO> entries) {}
diff --git a/api/src/main/java/market/guess/api/MarketDTO.java b/api/src/main/java/market/guess/model/market/MarketDTO.java
index b7c48a2..6b31375 100644
--- a/api/src/main/java/market/guess/api/MarketDTO.java
+++ b/api/src/main/java/market/guess/model/market/MarketDTO.java
@@ -1,3 +1,3 @@
-package market.guess.api;
+package market.guess.model.market;
 
 public record MarketDTO(String key, String name, String price, String volume) {}
diff --git a/api/src/main/java/market/guess/api/MarketStateDTO.java b/api/src/main/java/market/guess/model/market/MarketStateDTO.java
index da2fff0..3e9b967 100644
--- a/api/src/main/java/market/guess/api/MarketStateDTO.java
+++ b/api/src/main/java/market/guess/model/market/MarketStateDTO.java
@@ -1,4 +1,4 @@
-package market.guess.api;
+package market.guess.model.market;
 
 import java.util.List;
 import market.guess.model.event.MechanismType;
diff --git a/api/src/main/java/market/guess/api/PurchaseReceiptDTO.java b/api/src/main/java/market/guess/model/market/PurchaseReceiptDTO.java
index 02e8007..0341542 100644
--- a/api/src/main/java/market/guess/api/PurchaseReceiptDTO.java
+++ b/api/src/main/java/market/guess/model/market/PurchaseReceiptDTO.java
@@ -1,4 +1,4 @@
-package market.guess.api;
+package market.guess.model.market;
 
 import java.util.List;
 
diff --git a/api/src/main/java/market/guess/api/TradeRowDTO.java b/api/src/main/java/market/guess/model/market/TradeRowDTO.java
index 68d159a..d3053b3 100644
--- a/api/src/main/java/market/guess/api/TradeRowDTO.java
+++ b/api/src/main/java/market/guess/model/market/TradeRowDTO.java
@@ -1,4 +1,4 @@
-package market.guess.api;
+package market.guess.model.market;
 
 public record TradeRowDTO(
     String at, String userName, String optionName, String quantity, String pricePaid) {}
diff --git a/service/src/main/java/market/guess/service/LocalGuessMarketContext.java b/service/src/main/java/market/guess/service/LocalGuessMarketContext.java
index f04324b..c85dadf 100644
--- a/service/src/main/java/market/guess/service/LocalGuessMarketContext.java
+++ b/service/src/main/java/market/guess/service/LocalGuessMarketContext.java
@@ -3,10 +3,10 @@ package market.guess.service;
 import java.math.BigDecimal;
 import java.time.Instant;
 import market.guess.api.GuessMarketContext;
-import market.guess.api.PurchaseReceiptDTO;
 import market.guess.api.Result;
-import market.guess.api.TradeRowDTO;
 import market.guess.model.event.EventDetailDTO;
+import market.guess.model.market.PurchaseReceiptDTO;
+import market.guess.model.market.TradeRowDTO;
 import market.guess.service.catalog.infrastructure.MarketContext;
 import market.guess.service.domain.Order;
 import market.guess.service.fulfillment.FulfillmentContext;
diff --git a/service/src/main/java/market/guess/service/catalog/infrastructure/adapter/LedgerMapper.java b/service/src/main/java/market/guess/service/catalog/infrastructure/adapter/LedgerMapper.java
new file mode 100644
index 0000000..5a46540
--- /dev/null
+++ b/service/src/main/java/market/guess/service/catalog/infrastructure/adapter/LedgerMapper.java
@@ -0,0 +1,10 @@
+package market.guess.service.catalog.infrastructure.adapter;
+
+import market.guess.model.ledger.LedgerDTO;
+import market.guess.service.ledger.Ledger;
+import org.mapstruct.Mapper;
+
+@Mapper
+public interface LedgerMapper {
+  LedgerDTO ledgerToLedgerDTO(Ledger ledger);
+}
diff --git a/service/src/main/java/market/guess/service/catalog/infrastructure/mapper/v2/LedgerMapper.java b/service/src/main/java/market/guess/service/catalog/infrastructure/mapper/v2/LedgerMapper.java
deleted file mode 100644
index fe0ea38..0000000
--- a/service/src/main/java/market/guess/service/catalog/infrastructure/mapper/v2/LedgerMapper.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package market.guess.service.catalog.infrastructure.mapper.v2;
-
-import market.guess.api.AccountDTO;
-import market.guess.service.ledger.Ledger;
-import org.mapstruct.Mapper;
-
-@Mapper
-public interface LedgerMapper {
-
-  AccountDTO ledgerToLedgerDTO(Ledger account);
-}
diff --git a/service/src/main/java/market/guess/service/domain/Event.java b/service/src/main/java/market/guess/service/domain/Event.java
index 1e17457..4517a4e 100644
--- a/service/src/main/java/market/guess/service/domain/Event.java
+++ b/service/src/main/java/market/guess/service/domain/Event.java
@@ -4,13 +4,13 @@ import java.math.BigDecimal;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
-import market.guess.api.MarketDTO;
-import market.guess.api.MarketStateDTO;
-import market.guess.api.TradeRowDTO;
 import market.guess.model.event.CommissionTiming;
 import market.guess.model.event.EventStatus;
 import market.guess.model.event.EventSummaryDTO;
 import market.guess.model.ledger.LedgerType;
+import market.guess.model.market.MarketDTO;
+import market.guess.model.market.MarketStateDTO;
+import market.guess.model.market.TradeRowDTO;
 import market.guess.service.helpers.BigDecimalOptions;
 import market.guess.service.helpers.InstantOptions;
 import market.guess.service.ledger.Ledger;
diff --git a/service/src/main/java/market/guess/service/domain/Market.java b/service/src/main/java/market/guess/service/domain/Market.java
index 3ff7e2d..c5960e3 100644
--- a/service/src/main/java/market/guess/service/domain/Market.java
+++ b/service/src/main/java/market/guess/service/domain/Market.java
@@ -1,7 +1,7 @@
 package market.guess.service.domain;
 
 import java.math.BigDecimal;
-import market.guess.api.MarketDTO;
+import market.guess.model.market.MarketDTO;
 
 public final class Market {
   private final String key;
diff --git a/service/src/test/java/market/guess/service/catalog/infrastructure/mapper/v2/LedgerMapperTest.java b/service/src/test/java/market/guess/service/catalog/infrastructure/adapter/LedgerMapperTest.java
index 9e00411..976442c 100644
--- a/service/src/test/java/market/guess/service/catalog/infrastructure/mapper/v2/LedgerMapperTest.java
+++ b/service/src/test/java/market/guess/service/catalog/infrastructure/adapter/LedgerMapperTest.java
@@ -1,4 +1,4 @@
-package market.guess.service.catalog.infrastructure.mapper.v2;
+package market.guess.service.catalog.infrastructure.adapter;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -8,7 +8,7 @@ import static org.junit.Assert.assertTrue;
 import java.math.BigDecimal;
 import java.time.Instant;
 import java.util.List;
-import market.guess.api.AccountDTO;
+import market.guess.model.ledger.LedgerDTO;
 import market.guess.model.ledger.LedgerEntryDTO;
 import market.guess.model.ledger.LedgerType;
 import market.guess.service.ledger.Ledger;
@@ -29,7 +29,7 @@ public class LedgerMapperTest {
   public void mapsOwnerAndBalanceAsStrings() {
     Ledger ledger = new Ledger("alice", new BigDecimal("100"));
 
-    AccountDTO dto = mapper.ledgerToLedgerDTO(ledger);
+    LedgerDTO dto = mapper.ledgerToLedgerDTO(ledger);
 
     assertEquals("alice", dto.owner());
     assertEquals("100.00", dto.balance());
@@ -39,7 +39,7 @@ public class LedgerMapperTest {
   public void emptyEntriesMapToEmptyList() {
     Ledger ledger = new Ledger("alice", new BigDecimal("0"));
 
-    AccountDTO dto = mapper.ledgerToLedgerDTO(ledger);
+    LedgerDTO dto = mapper.ledgerToLedgerDTO(ledger);
 
     assertTrue(dto.entries().isEmpty());
   }
@@ -49,12 +49,20 @@ public class LedgerMapperTest {
     Ledger ledger = new Ledger("bob", new BigDecimal("0"));
     ledger.record(
         new LedgerEntry(
-            1, Instant.parse("2026-01-01T00:00:00Z"), LedgerType.DEPOSIT,
-            new BigDecimal("50.00"), new BigDecimal("50.00"), "first"));
+            1,
+            Instant.parse("2026-01-01T00:00:00Z"),
+            LedgerType.DEPOSIT,
+            new BigDecimal("50.00"),
+            new BigDecimal("50.00"),
+            "first"));
     ledger.record(
         new LedgerEntry(
-            2, Instant.parse("2026-01-02T00:00:00Z"), LedgerType.PURCHASE,
-            new BigDecimal("-20.00"), new BigDecimal("30.00"), "second"));
+            2,
+            Instant.parse("2026-01-02T00:00:00Z"),
+            LedgerType.PURCHASE,
+            new BigDecimal("-20.00"),
+            new BigDecimal("30.00"),
+            "second"));
 
     List<LedgerEntryDTO> entries = mapper.ledgerToLedgerDTO(ledger).entries();
 
@@ -84,16 +92,18 @@ public class LedgerMapperTest {
 
   /**
    * LedgerEntry.id/time and Ledger's account-blocked state have no matching AccountDTO/
-   * LedgerEntryDTO source property, so MapStruct leaves them at their Java defaults. This
-   * pins that known gap; once the mapper is taught to fill seq/at/blocked, update these
-   * assertions instead of deleting them.
+   * LedgerEntryDTO source property, so MapStruct leaves them at their Java defaults. This pins that
+   * known gap; once the mapper is taught to fill seq/at/blocked, update these assertions instead of
+   * deleting them.
    */
   @Test
   public void unmappedTargetPropertiesFallBackToDefaults() {
     Ledger ledger = new Ledger("dave", new BigDecimal("0"));
-    ledger.record(new LedgerEntry(7, Instant.now(), LedgerType.COMMISSION, BigDecimal.ONE, BigDecimal.ONE, "n"));
+    ledger.record(
+        new LedgerEntry(
+            7, Instant.now(), LedgerType.COMMISSION, BigDecimal.ONE, BigDecimal.ONE, "n"));
 
-    AccountDTO dto = mapper.ledgerToLedgerDTO(ledger);
+    LedgerDTO dto = mapper.ledgerToLedgerDTO(ledger);
 
     assertFalse(dto.blocked());
     LedgerEntryDTO entry = dto.entries().get(0);
diff --git a/tools/_util.sh b/tools/_util.sh
index fde4797..a041f2d 100644
--- a/tools/_util.sh
+++ b/tools/_util.sh
@@ -5,15 +5,18 @@ case "$(uname -s)" in
   *) SEP=":" ;;
 esac
 
-MODULES="api service ui-console"
+MODULES="api service ui-console ui-desktop"
 
 DEPS_api=""
 DEPS_service="api"
 DEPS_ui_console="api service"
+DEPS_ui_desktop=""
 
-RUNTIME_LIB_DIRS="pico jaxb gson"
+RUNTIME_LIB_DIRS="pico jaxb gson openjfx"
 
-MAIN_CLASS="market.guess.ui.console.App"
+EXECUTABLES="ui-console ui-desktop"
+MAINCLASS_ui_console="market.guess.ui.console.App"
+MAINCLASS_ui_desktop="market.guess.ui.desktop.Launcher"
 
 JAVA_HOME_DIR=$(java -XshowSettings:properties -version 2>&1 | tr -d '\r' | sed -n 's/^ *java\.home = //p')
 case "$(uname -s)" in
@@ -45,6 +48,24 @@ deps_of() {
   eval "printf '%s' \"\${$v}\""
 }
 
+mainclass_of() {
+  local v="MAINCLASS_$(echo "$1" | tr '-' '_')"
+  eval "printf '%s' \"\${$v}\""
+}
+
+# JAR manifest lines are capped at 72 bytes; a raw "Key: value" line trips
+# `line too long` once enough jars are on the Class-Path (openjfx pushed us
+# over it). Fold per spec: continuation lines start with a single space.
+write_manifest_attr() {
+  local file="$1" line="$2: $3"
+  : >"$file"
+  while [ "${#line}" -gt 72 ]; do
+    printf '%s\n' "${line:0:72}" >>"$file"
+    line=" ${line:72}"
+  done
+  printf '%s\n\n' "$line" >>"$file"
+}
+
 module_cp() {
   local cp=""
   for d in "$@"; do cp="$cp${cp:+$SEP}build/classes/$d"; done
diff --git a/tools/package.sh b/tools/package.sh
index a85ee6c..186dab5 100644
--- a/tools/package.sh
+++ b/tools/package.sh
@@ -22,63 +22,74 @@ for d in $RUNTIME_LIB_DIRS; do
   echo "  lib/$d/ ($n jars)"
 done
 
-echo "=== Generating console manifest ==="
+echo "=== Generating executable manifests ==="
 # Generated from what is actually staged, never hand-maintained. Four silent
 # failure modes: wildcards match nothing; a missing trailing newline makes jar
 # drop the line; paths are relative to this jar; and java -jar ignores -cp, so
 # this line is the entire classpath at runtime.
-MF="$TMP/console-manifest.txt"
-CPLINE=""
-for m in $MODULES; do
-  [ "$m" = ui-console ] && continue
-  CPLINE="$CPLINE${CPLINE:+ }$m.jar"
-done
-for d in $RUNTIME_LIB_DIRS; do
-  for j in "$DIST"/lib/"$d"/*.jar; do
-    [ -f "$j" ] || continue
-    CPLINE="$CPLINE lib/$d/$(basename "$j")"
+for e in $EXECUTABLES; do
+  CPLINE=""
+  for m in $MODULES; do
+    [ "$m" = "$e" ] && continue
+    CPLINE="$CPLINE${CPLINE:+ }$m.jar"
+  done
+  for d in $RUNTIME_LIB_DIRS; do
+    for j in "$DIST"/lib/"$d"/*.jar; do
+      [ -f "$j" ] || continue
+      CPLINE="$CPLINE lib/$d/$(basename "$j")"
+    done
   done
+  write_manifest_attr "$TMP/$e-manifest.txt" "Class-Path" "$CPLINE"
+  echo "  $e: $CPLINE"
 done
-printf 'Class-Path: %s\n\n' "$CPLINE" >"$MF"
-echo "  $CPLINE"
 
 echo "=== Packaging ==="
 for m in $MODULES; do
-  if [ "$m" = ui-console ]; then
-    "$JAR" --create --file "$DIST/$m.jar" \
-      --main-class "$MAIN_CLASS" --manifest "$MF" -C "build/classes/$m" .
-  else
+  case " $EXECUTABLES " in
+  *" $m "*)
+    "$JAR" --create --file "$DIST/$m.jar" --main-class "$(mainclass_of "$m")" \
+      --manifest "$TMP/$m-manifest.txt" -C "build/classes/$m" .
+    ;;
+  *)
     "$JAR" --create --file "$DIST/$m.jar" -C "build/classes/$m" .
-  fi
+    ;;
+  esac
   echo "  $DIST/$m.jar"
 done
 
-cat >"$DIST/run.bat" <<'EOF'
+for e in $EXECUTABLES; do
+  cat >"$DIST/run-${e#ui-}.bat" <<EOF
 @echo off
 cd /d "%~dp0"
-java -jar "%~dp0ui-console.jar"
+java -jar "%~dp0$e.jar"
 if errorlevel 1 pause
 EOF
+done
 
 [ -f README.pdf ] && cp README.pdf "$DIST/"
 
 echo "=== Manifest as it actually landed in the jar ==="
 # Cheapest check that prevents a Level-0: if Main-Class or Class-Path didn't
 # survive, it surfaces here instead of on the grader's machine.
-rm -rf "$TMP/mf" && mkdir -p "$TMP/mf"
-(cd "$TMP/mf" && "$JAR" -xf "$OLDPWD/$DIST/ui-console.jar" META-INF/MANIFEST.MF)
-sed 's/^/  /' "$TMP/mf/META-INF/MANIFEST.MF"
+for e in $EXECUTABLES; do
+  rm -rf "$TMP/mf" && mkdir -p "$TMP/mf"
+  (cd "$TMP/mf" && "$JAR" -xf "$OLDPWD/$DIST/$e.jar" META-INF/MANIFEST.MF)
+  echo "-- $e.jar --"
+  sed 's/^/  /' "$TMP/mf/META-INF/MANIFEST.MF"
 
-grep -q '^Main-Class:' "$TMP/mf/META-INF/MANIFEST.MF" || {
-  echo "*** Main-Class missing ***"
-  exit 1
-}
-grep -q 'Class-Path:' "$TMP/mf/META-INF/MANIFEST.MF" || {
-  echo "*** Class-Path missing ***"
-  exit 1
-}
+  grep -q '^Main-Class:' "$TMP/mf/META-INF/MANIFEST.MF" || {
+    echo "*** Main-Class missing in $e.jar ***"
+    exit 1
+  }
+  grep -q 'Class-Path:' "$TMP/mf/META-INF/MANIFEST.MF" || {
+    echo "*** Class-Path missing in $e.jar ***"
+    exit 1
+  }
+done
 
 echo "======================================"
 echo "Self-contained output in $DIST"
-echo "  cd $DIST && java -jar ui-console.jar"
+for e in $EXECUTABLES; do
+  echo "  cd $DIST && java -jar $e.jar"
+done
 echo "======================================"
diff --git a/ui-console/src/main/java/market/guess/ui/console/io/InputProcessor.java b/ui-console/src/main/java/market/guess/ui/console/io/InputProcessor.java
index 3ff752c..69a9a9a 100644
--- a/ui-console/src/main/java/market/guess/ui/console/io/InputProcessor.java
+++ b/ui-console/src/main/java/market/guess/ui/console/io/InputProcessor.java
@@ -5,9 +5,9 @@ import java.nio.file.Path;
 import java.util.List;
 import java.util.Scanner;
 import java.util.function.Function;
-import market.guess.api.MarketStateDTO;
-import market.guess.api.PurchaseReceiptDTO;
-import market.guess.api.TradeRowDTO;
+import market.guess.model.market.MarketStateDTO;
+import market.guess.model.market.PurchaseReceiptDTO;
+import market.guess.model.market.TradeRowDTO;
 
 public final class InputProcessor {
   private static final int OPTION_WIDTH = 18;
@@ -192,4 +192,3 @@ public final class InputProcessor {
             padRight(at, AT_WIDTH));
   }
 }
-