@aeolus-fleet/core 0.20.2 → 0.20.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aeolus-fleet/core",
-  "version": "0.20.2",
+  "version": "0.20.3",
   "description": "Aeolus server: the tRPC API and the fleet domain on Postgres.",
   "license": "Apache-2.0",
   "type": "module",
@@ -42,7 +42,7 @@
     "postpack": "rm LICENSE"
   },
   "dependencies": {
-    "@aeolus-fleet/common": "0.20.2",
+    "@aeolus-fleet/common": "0.20.3",
     "@fastify/websocket": "^11.3.1",
     "@modelcontextprotocol/server": "^2.3.0",
     "@prisma/adapter-pg": "^7.10.0",

package/src/adapters/prisma/migrations/20261009090000_crew_request_give_backs/migration.sql

@@ -0,0 +1,26 @@
+-- A trierarch that gave a crew request back before its crew was final (#382),
+-- one per request and trierarch, cleared on every new settings version.
+-- Every foreign key leads an index.
+-- CreateTable
+CREATE TABLE "crew_request_give_backs" (
+    "fleet_id" TEXT NOT NULL,
+    "ship_id" TEXT NOT NULL,
+    "trierarch_ship_id" TEXT NOT NULL,
+    "settings_version" INTEGER NOT NULL,
+    "reason" TEXT NOT NULL,
+    "given_back_at" TIMESTAMPTZ(3) NOT NULL,
+
+    CONSTRAINT "crew_request_give_backs_pkey" PRIMARY KEY ("fleet_id","ship_id","trierarch_ship_id")
+);
+
+-- CreateIndex
+CREATE INDEX "crew_request_give_backs_fleet_id_trierarch_ship_id_idx" ON "crew_request_give_backs"("fleet_id", "trierarch_ship_id");
+
+-- AddForeignKey
+ALTER TABLE "crew_request_give_backs" ADD CONSTRAINT "crew_request_give_backs_fleet_id_fkey" FOREIGN KEY ("fleet_id") REFERENCES "fleets"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "crew_request_give_backs" ADD CONSTRAINT "crew_request_give_backs_fleet_id_ship_id_fkey" FOREIGN KEY ("fleet_id", "ship_id") REFERENCES "crew_requests"("fleet_id", "ship_id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "crew_request_give_backs" ADD CONSTRAINT "crew_request_give_backs_fleet_id_trierarch_ship_id_fkey" FOREIGN KEY ("fleet_id", "trierarch_ship_id") REFERENCES "ships"("fleet_id", "id") ON DELETE RESTRICT ON UPDATE CASCADE;

package/src/adapters/prisma/schema.prisma

@@ -46,6 +46,7 @@ model Fleet {
   ships            Ship[]
   leases           Lease[]
   crewRequests     CrewRequest[]
+  crewRequestGiveBacks CrewRequestGiveBack[]
   clearRequests    WorktreeClearRequest[]
   labels           Label[]
   labelValues      LabelValue[]
@@ -101,6 +102,7 @@ model Ship {
   events            Event[]          @relation("EventShip")
   crewRequest       CrewRequest?     @relation("CrewRequestShip")
   assignedCrews     CrewRequest[]    @relation("CrewRequestAssignee")
+  givenBackCrews    CrewRequestGiveBack[] @relation("CrewRequestGiveBackTrierarch")
   clearRequests     WorktreeClearRequest[] @relation("WorktreeClearRequestTrierarch")
   clearedWorktrees  WorktreeClearRequest[] @relation("WorktreeClearRequestShip")
   requestedClears   WorktreeClearRequest[] @relation("WorktreeClearRequestRequester")
@@ -212,6 +214,7 @@ model CrewRequest {
   fleet    Fleet @relation(fields: [fleetId], references: [id])
   ship     Ship  @relation("CrewRequestShip", fields: [fleetId, shipId], references: [fleetId, id])
   assignee Ship? @relation("CrewRequestAssignee", fields: [fleetId, assignedTo], references: [fleetId, id])
+  givenBack CrewRequestGiveBack[]
 
   @@unique([fleetId, shipId])
   /// A trierarch reads the requests assigned to it.
@@ -219,6 +222,24 @@ model CrewRequest {
   @@map("crew_requests")
 }
 
+/// A trierarch that gave a crew request back before its crew was final (#382): one per trierarch, until the next settings version.
+model CrewRequestGiveBack {
+  fleetId         String   @map("fleet_id")
+  shipId          String   @map("ship_id")
+  trierarchShipId String   @map("trierarch_ship_id")
+  settingsVersion Int      @map("settings_version")
+  reason          String
+  givenBackAt     DateTime @map("given_back_at") @db.Timestamptz(3)
+
+  fleet       Fleet       @relation(fields: [fleetId], references: [id])
+  crewRequest CrewRequest @relation(fields: [fleetId, shipId], references: [fleetId, shipId])
+  trierarch   Ship        @relation("CrewRequestGiveBackTrierarch", fields: [fleetId, trierarchShipId], references: [fleetId, id])
+
+  @@id([fleetId, shipId, trierarchShipId])
+  @@index([fleetId, trierarchShipId])
+  @@map("crew_request_give_backs")
+}
+
 /// A pending request that a trierarch clear a worktree it kept (decision 0032),
 /// named by the ship it belonged to and its repository: never a path.
 model WorktreeClearRequest {