src/server/consolidated/combat-manage.ts (1)

65-69: Consider centralizing side literals to prevent drift.

side values are currently repeated in schema and mapping logic; extracting shared constants improves maintainability.

Refactor sketch

+const PARTICIPANT_SIDES = ['party', 'enemy', 'hostile', 'ally', 'friendly', 'neutral'] as const;
+type ParticipantSide = (typeof PARTICIPANT_SIDES)[number];
+const ENEMY_SIDES: ReadonlySet<ParticipantSide> = new Set(['enemy', 'hostile']);

 const ParticipantSchema = z.object({
@@
-    side: z.enum(['party', 'enemy', 'hostile', 'ally', 'friendly', 'neutral']).optional(),
+    side: z.enum(PARTICIPANT_SIDES).optional(),
@@
-function deriveIsEnemy(p: { isEnemy?: boolean; side?: string }): boolean | undefined {
+function deriveIsEnemy(p: { isEnemy?: boolean; side?: ParticipantSide }): boolean | undefined {
     if (typeof p.isEnemy === 'boolean') return p.isEnemy;
     if (!p.side) return undefined;
-    return p.side === 'enemy' || p.side === 'hostile';
+    return ENEMY_SIDES.has(p.side);
 }

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@src/server/consolidated/combat-manage.ts` around lines 65 - 69, The
deriveIsEnemy function duplicates literal side strings; centralize these values
by introducing a shared enum or constant (e.g., SIDES or SideEnum) and replace
the string checks in deriveIsEnemy with references to those constants, and
update any related schema/mapping code that uses 'enemy' or 'hostile' so all
code (including deriveIsEnemy) reads from the same symbol(s) to avoid drift.

tests/server/consolidated/combat-manage.test.ts (1)

124-140: Optionally extend matrix to include friendly and neutral.

This would fully exercise all enum values introduced in the schema.

Suggested test extension

                 participants: [
                     { id: 'pc-vela', name: 'Vela', initiativeBonus: 0, hp: 38, maxHp: 38, side: 'party', position: { x: 1, y: 1 } },
                     { id: 'pc-tobin', name: 'Tobin', initiativeBonus: 4, hp: 28, maxHp: 28, side: 'ally', position: { x: 1, y: 2 } },
+                    { id: 'pc-lyra', name: 'Lyra', initiativeBonus: 1, hp: 24, maxHp: 24, side: 'friendly', position: { x: 2, y: 2 } },
+                    { id: 'npc-warden', name: 'Warden', initiativeBonus: 0, hp: 30, maxHp: 30, side: 'neutral', position: { x: 3, y: 2 } },
                     { id: 'enemy-rurk', name: 'Rurk', initiativeBonus: 1, hp: 22, maxHp: 22, side: 'enemy', position: { x: 5, y: 5 } },
                     { id: 'enemy-mira', name: 'Mira', initiativeBonus: 2, hp: 16, maxHp: 16, side: 'hostile', position: { x: 6, y: 5 } }
                 ]
             }, ctx);

             const data = parseResult(result);
             expect(data.success).toBe(true);

             const byId = Object.fromEntries(
                 (data.participants as Array<{ id: string; isEnemy: boolean }>).map((p) => [p.id, p.isEnemy])
             );
             expect(byId['pc-vela']).toBe(false);
             expect(byId['pc-tobin']).toBe(false);
+            expect(byId['pc-lyra']).toBe(false);
+            expect(byId['npc-warden']).toBe(false);
             expect(byId['enemy-rurk']).toBe(true);
             expect(byId['enemy-mira']).toBe(true);

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@tests/server/consolidated/combat-manage.test.ts` around lines 124 - 140,
Extend the test participant matrix to include entries using the new enum sides
(e.g., side: 'friendly' and side: 'neutral') so the participants parsing logic
is exercised for all enum values; update the array passed into the tested call
(the list containing pc-vela, pc-tobin, enemy-rurk, enemy-mira) to add two new
objects with unique ids (e.g., 'pc-ally-friendly' and 'npc-neutral'),
appropriate names/hp/position, and verify their resulting flags in the byId map
(checking (data.participants).map(...).map key lookup)—ensuring assertions
validate the expected isEnemy values for these new sides as well.