Client task source of truth & xml metadata helper (#419)

* remove client current_task_id

* client bump

Author: jptaylor

client/app/package.json

@@ -2,7 +2,7 @@
   "name": "@gradient-bang/app",
   "description": "Gradient Bang web client",
   "private": true,
-  "version": "0.10.2",
+  "version": "0.10.3",
   "type": "module",
   "scripts": {
     "dev": "vite --host",

client/app/src/GameContext.tsx

@@ -850,6 +850,7 @@ export function GameProvider({ children }: GameProviderProps) {
                     fighters: ship.fighters,
                     max_fighters: ship.max_fighters,
                     current_task_id: ship.current_task_id,
+                    current_task_actor: ship.current_task_actor,
                   })
                 }
               }
@@ -908,6 +909,7 @@ export function GameProvider({ children }: GameProviderProps) {
                   fighters: ship.fighters,
                   max_fighters: ship.max_fighters,
                   current_task_id: ship.current_task_id,
+                  current_task_actor: ship.current_task_actor,
                 })
               }
 
@@ -1541,9 +1543,9 @@ export function GameProvider({ children }: GameProviderProps) {
               const myId = useGameStore.getState().character_id
               const isMyTask = !data.actor_character_id || data.actor_character_id === myId
 
-              // Only track tasks initiated by this player in the task engine.
-              // Other corp members' tasks show ship "busy" status via the
-              // ship's current_task_id but don't fill our task engine badges.
+              // Only tasks initiated by this player get full task-engine
+              // metadata. Ship busy state is tracked separately so other
+              // corp members' tasks can still mark a ship occupied.
               if (taskId && isMyTask) {
                 useGameStore.getState().addActiveTask({
                   task_id: taskId,
@@ -1559,11 +1561,12 @@ export function GameProvider({ children }: GameProviderProps) {
                 })
               }
 
-              // Update corp ship's task state so ShipCard shows busy status
               if (taskId && data.ship_id && isKnownFleetShip(data.ship_id)) {
-                upsertCorporationShip(data.ship_id, {
-                  current_task_id: taskId,
-                  current_task_actor_name: data.actor_character_name ?? null,
+                useGameStore.getState().setShipTaskOccupancy(data.ship_id, {
+                  task_id: taskId,
+                  actor_name: data.actor_character_name ?? null,
+                  task_status: data.task_status === "waking" ? "waking" : "active",
+                  source: "live",
                 })
               }
               break
@@ -1574,28 +1577,35 @@ export function GameProvider({ children }: GameProviderProps) {
               const data = e.payload as Msg.TaskFinishMessage
 
               const taskId = normalizeTaskId(data.task_id)
+              if (!taskId) break
 
-              // Clear corp ship's task state regardless of who owns the task
-              if (data.ship_id && isKnownFleetShip(data.ship_id)) {
-                upsertCorporationShip(data.ship_id, {
-                  current_task_id: null,
-                  current_task_actor_name: null,
-                })
+              const activeTasks = useGameStore.getState().activeTasks
+              const selectedTaskId =
+                activeTasks[taskId] ? taskId : (
+                  Object.keys(activeTasks).find((activeTaskId) => activeTaskId.startsWith(taskId))
+                )
+              const activeTask = selectedTaskId ? activeTasks[selectedTaskId] : undefined
+              const shipId = data.ship_id ?? activeTask?.ship_id
+
+              if (shipId && isKnownFleetShip(shipId)) {
+                useGameStore.getState().clearShipTaskOccupancyByShipId(shipId)
+              } else {
+                useGameStore.getState().clearShipTaskOccupancyByTaskId(taskId)
               }
 
               // Only process task engine cleanup if this task is in our
               // active tasks (i.e. we tracked it on task.start because it
               // belongs to us).
-              if (taskId && useGameStore.getState().activeTasks[taskId]) {
-                useGameStore.getState().removeActiveTask(taskId)
+              if (selectedTaskId) {
+                useGameStore.getState().removeActiveTask(selectedTaskId)
 
                 // Backward compatibility while old short IDs may still exist in local state.
-                if (taskId.length > 6) {
-                  useGameStore.getState().removeActiveTask(taskId.slice(0, 6))
+                if (selectedTaskId.length > 6) {
+                  useGameStore.getState().removeActiveTask(selectedTaskId.slice(0, 6))
                 } else {
                   const activeTaskIds = Object.keys(useGameStore.getState().activeTasks)
                   for (const activeTaskId of activeTaskIds) {
-                    if (activeTaskId.startsWith(taskId)) {
+                    if (activeTaskId.startsWith(selectedTaskId)) {
                       useGameStore.getState().removeActiveTask(activeTaskId)
                     }
                   }
@@ -1628,10 +1638,9 @@ export function GameProvider({ children }: GameProviderProps) {
               const shipId = data.ship_id ?? activeTask?.ship_id
 
               if (shipId && isKnownFleetShip(shipId)) {
-                upsertCorporationShip(shipId, {
-                  current_task_id: null,
-                  current_task_actor_name: null,
-                })
+                useGameStore.getState().clearShipTaskOccupancyByShipId(shipId)
+              } else {
+                useGameStore.getState().clearShipTaskOccupancyByTaskId(taskId)
               }
 
               if (selectedTaskId) {

client/app/src/components/ShipStatusPopover.tsx

@@ -18,6 +18,7 @@ import {
   PopoverTitle,
   PopoverTrigger,
 } from "@/components/primitives/Popover"
+import type { ShipTaskOccupancy } from "@/stores/taskSlice"
 import { cn } from "@/utils/tailwind"
 
 import { Badge } from "./primitives/Badge"
@@ -40,7 +41,15 @@ function StatusRow({
   )
 }
 
-export const ShipStatusPopover = ({ ship, isActive }: { ship: Ship; isActive?: boolean }) => {
+export const ShipStatusPopover = ({
+  ship,
+  isActive,
+  taskOccupancy,
+}: {
+  ship: Ship
+  isActive?: boolean
+  taskOccupancy?: ShipTaskOccupancy
+}) => {
   const byoa = ship.byoa ?? null
   const isOnline = byoa?.presence?.online === true
   const actor = ship.current_task_actor ?? null
@@ -85,16 +94,17 @@ export const ShipStatusPopover = ({ ship, isActive }: { ship: Ship; isActive?: b
           <StatusRow
             label="Active actor"
             value={
+              taskOccupancy?.actor_name ??
               actor?.character_name ??
               actor?.character_id_prefix ?? <span className="text-subtle-foreground">—</span>
             }
           />
           <StatusRow
             label="Task"
             value={
-              ship.current_task_id ?
+              taskOccupancy?.task_id ?
                 <span className="font-mono">
-                  {ship.current_task_id.replace(/-/g, "").slice(0, 12)}
+                  {taskOccupancy.task_id.replace(/-/g, "").slice(0, 12)}
                 </span>
               : <span className="text-subtle-foreground">—</span>
             }

client/app/src/components/panels/PlayerShipPanel.tsx

@@ -8,6 +8,7 @@ import { ShipCardStat } from "@/components/ShipCardStat"
 import { CreditsIcon, CurrentSectorIcon, FighterIcon, FuelIcon } from "@/icons"
 import useAudioStore from "@/stores/audio"
 import useGameStore from "@/stores/game"
+import { selectShipTaskOccupancy } from "@/stores/taskSlice"
 import { isShipInCombat } from "@/utils/combat"
 import { formatCurrency } from "@/utils/formatting"
 import { shipTypeVerbose } from "@/utils/game"
@@ -53,9 +54,14 @@ const ShipCard = ({ ship }: { ship: ShipSelf }) => {
   const activeTask = useGameStore((state) =>
     Object.values(state.activeTasks).find((task) => task.ship_id === ship.ship_id)
   )
-  const isBusy = !!(activeTask || ship.current_task_id)
-  const isWaking = activeTask?.task_status === "waking"
-  const actorName = activeTask?.actor_character_name ?? ship.current_task_actor_name
+  const taskOccupancy = useGameStore((state) => selectShipTaskOccupancy(state, ship.ship_id))
+  const isBusy = !!taskOccupancy
+  const isWaking = taskOccupancy?.task_status === "waking"
+  const actorName =
+    activeTask?.actor_character_name ??
+    taskOccupancy?.actor_name ??
+    ship.current_task_actor?.character_name ??
+    ship.current_task_actor_name
   const isInCombat = useGameStore((state) => isShipInCombat(state, ship.ship_id))
 
   useEffect(() => {
@@ -76,7 +82,9 @@ const ShipCard = ({ ship }: { ship: ShipSelf }) => {
       </AnimatePresence>
       <div className="relative z-10 flex flex-col gap-2 flex-1 min-w-0">
         <div className="flex flex-row gap-1 items-center">
-          {ship.byoa && <ShipStatusPopover ship={ship} isActive={isBusy} />}
+          {ship.byoa && (
+            <ShipStatusPopover ship={ship} isActive={isBusy} taskOccupancy={taskOccupancy} />
+          )}
           <div className="flex flex-row gap-2 items-center">
             <div className="text-sm uppercase text-white font-semibold">{ship.ship_name}</div>
             <div className="text-xxs text-subtle-foreground">{shipTypeVerbose(ship.ship_type)}</div>

client/app/src/stores/game.ts

@@ -272,7 +272,7 @@ const createGameSlice: StateCreator<GameStoreState, [], [], GameSlice> = (set, g
       })
     ),
 
-  setShips: (ships: ShipSelf[]) =>
+  setShips: (ships: ShipSelf[]) => {
     set(
       produce((state) => {
         const now = new Date().toISOString()
@@ -294,7 +294,9 @@ const createGameSlice: StateCreator<GameStoreState, [], [], GameSlice> = (set, g
         }
         state.destroyedShips = ships.filter((s: ShipSelf) => !!s.destroyed_at)
       })
-    ),
+    )
+    get().hydrateShipTaskOccupancyFromSnapshot(ships)
+  },
 
   addShip: (ship: Partial<ShipSelf>) =>
     set(
@@ -442,6 +444,10 @@ const createGameSlice: StateCreator<GameStoreState, [], [], GameSlice> = (set, g
 
   setCorporation: (corporation: Corporation | undefined) => {
     const hadCorp = !!get().corporation
+    const previousCorpShipIds =
+      get()
+        .ships.data?.filter((ship) => ship.owner_type === "corporation")
+        .map((ship) => ship.ship_id) ?? []
     // Detect corp transition and invalidate map coverage so the next
     // map.local/map.region replaces stale data instead of merging.
     if (!hadCorp && corporation) {
@@ -489,6 +495,7 @@ const createGameSlice: StateCreator<GameStoreState, [], [], GameSlice> = (set, g
               fighters: ship.fighters,
               max_fighters: ship.max_fighters,
               current_task_id: ship.current_task_id,
+              current_task_actor: ship.current_task_actor,
               byoa:
                 ship.byoa === undefined ? existingShip?.byoa
                 : ship.byoa ?
@@ -514,6 +521,13 @@ const createGameSlice: StateCreator<GameStoreState, [], [], GameSlice> = (set, g
         }
       })
     )
+    if (corporation?.ships) {
+      get().hydrateShipTaskOccupancyFromSnapshot(corporation.ships)
+    } else if (hadCorp) {
+      for (const shipId of previousCorpShipIds) {
+        get().clearShipTaskOccupancyByShipId(shipId)
+      }
+    }
   },
 
   setStarfieldReady: (starfieldReady: boolean) => set({ starfieldReady }),