continues efforts to moderniz zero

Author: stolinski

.beads/issues.jsonl

@@ -25,8 +25,8 @@
 {"id":"battle_mode-iwh","title":"Code based targets","description":"","status":"open","priority":2,"issue_type":"feature","created_at":"2025-12-11T17:07:14.597012-07:00","updated_at":"2025-12-11T17:07:14.597012-07:00"}
 {"id":"battle_mode-jbi","title":"Remove AI avatars, use GitHub avatars only","description":"Remove all AI avatar generation code and switch to using GitHub avatars exclusively. Clean up related API endpoints and UI components.","status":"closed","priority":1,"issue_type":"feature","created_at":"2025-12-11T17:07:14.843567-07:00","updated_at":"2025-12-18T13:19:43.893916-07:00","closed_at":"2025-12-18T13:19:43.893916-07:00"}
 {"id":"battle_mode-jji","title":"Remove default padding and margin on battle view","description":"Remove default padding and margin in src/routes/(blank)/battle/[id]/code/","status":"closed","priority":2,"issue_type":"bug","created_at":"2025-12-11T17:26:55.496068-07:00","updated_at":"2025-12-12T11:01:56.083143-07:00","closed_at":"2025-12-12T11:01:56.083143-07:00"}
-{"id":"battle_mode-lfg","title":"Playlists of challenges","description":"Allow users to create and share curated playlists of challenges/targets that can be played in sequence","status":"open","priority":1,"issue_type":"epic","created_at":"2025-12-18T10:16:10.757898-07:00","updated_at":"2025-12-18T11:13:47.41964-07:00"}
-{"id":"battle_mode-lfg.1","title":"Add playlists table to schema","description":"Create playlists table with id, name, description, creator_id, visibility (public/private), created_at","status":"open","priority":1,"issue_type":"task","created_at":"2025-12-18T10:16:14.684067-07:00","updated_at":"2025-12-18T10:16:14.684067-07:00","dependencies":[{"issue_id":"battle_mode-lfg.1","depends_on_id":"battle_mode-lfg","type":"parent-child","created_at":"2025-12-18T10:16:14.685634-07:00","created_by":"daemon"}]}
+{"id":"battle_mode-lfg","title":"Playlists of challenges","description":"Allow users to create and share curated playlists of challenges/targets that can be played in sequence","status":"closed","priority":1,"issue_type":"epic","created_at":"2025-12-18T10:16:10.757898-07:00","updated_at":"2025-12-18T17:57:44.044541-07:00","closed_at":"2025-12-18T17:57:44.044541-07:00"}
+{"id":"battle_mode-lfg.1","title":"Add playlists table to schema","description":"Create playlists table with id, name, description, creator_id, visibility (public/private), created_at","status":"closed","priority":1,"issue_type":"task","created_at":"2025-12-18T10:16:14.684067-07:00","updated_at":"2025-12-18T17:57:44.132265-07:00","closed_at":"2025-12-18T17:57:44.132265-07:00","dependencies":[{"issue_id":"battle_mode-lfg.1","depends_on_id":"battle_mode-lfg","type":"parent-child","created_at":"2025-12-18T10:16:14.685634-07:00","created_by":"daemon"}]}
 {"id":"battle_mode-lfg.2","title":"Add playlist_items junction table","description":"Create playlist_items table linking playlists to targets with ordering (playlist_id, target_id, position)","status":"open","priority":1,"issue_type":"task","created_at":"2025-12-18T10:16:15.772136-07:00","updated_at":"2025-12-18T10:16:15.772136-07:00","dependencies":[{"issue_id":"battle_mode-lfg.2","depends_on_id":"battle_mode-lfg","type":"parent-child","created_at":"2025-12-18T10:16:15.772851-07:00","created_by":"daemon"},{"issue_id":"battle_mode-lfg.2","depends_on_id":"battle_mode-lfg.1","type":"blocks","created_at":"2025-12-18T10:16:25.132299-07:00","created_by":"daemon"}]}
 {"id":"battle_mode-lfg.3","title":"Create playlist management UI","description":"UI for creating, editing, and deleting playlists. Include drag-and-drop reordering of challenges","status":"open","priority":1,"issue_type":"task","created_at":"2025-12-18T10:16:16.906176-07:00","updated_at":"2025-12-18T10:16:16.906176-07:00","dependencies":[{"issue_id":"battle_mode-lfg.3","depends_on_id":"battle_mode-lfg","type":"parent-child","created_at":"2025-12-18T10:16:16.906866-07:00","created_by":"daemon"},{"issue_id":"battle_mode-lfg.3","depends_on_id":"battle_mode-lfg.2","type":"blocks","created_at":"2025-12-18T10:16:25.248505-07:00","created_by":"daemon"}]}
 {"id":"battle_mode-lfg.4","title":"Add playlist browsing and discovery page","description":"Page to browse public playlists, search, and view playlist details","status":"open","priority":1,"issue_type":"task","created_at":"2025-12-18T10:16:17.951101-07:00","updated_at":"2025-12-18T10:16:17.951101-07:00","dependencies":[{"issue_id":"battle_mode-lfg.4","depends_on_id":"battle_mode-lfg","type":"parent-child","created_at":"2025-12-18T10:16:17.951705-07:00","created_by":"daemon"},{"issue_id":"battle_mode-lfg.4","depends_on_id":"battle_mode-lfg.2","type":"blocks","created_at":"2025-12-18T10:16:25.362494-07:00","created_by":"daemon"}]}

.opencode/agent/zero.md

@@ -94,7 +94,7 @@ queries:
 
 ```ts
 import { createBuilder, defineQueries, defineQuery } from '@rocicorp/zero';
-import { type } from 'arktype'; // or zod for validation
+import { type } from 'arktype'; 
 
 export const zql = createBuilder(schema);
 

AGENTS.md

@@ -152,3 +152,42 @@ example: `bd create --help` shows `--parent`, `--deps`, `--assignee`, etc.
 - ❌ Do NOT clutter repo root with planning documents
 
 For more details, see README.md and QUICKSTART.md.
+
+## Zero Query & Mutation Architecture
+
+This project uses Zero 0.25+ with **custom query and mutation endpoints** that
+provide auth context to every operation.
+
+### Query Context
+
+All queries receive `ctx: { userID, userRole }` from the server:
+
+```ts
+// src/routes/api/query/+server.ts
+return query.fn({ args, ctx: { userID, userRole } });
+```
+
+### Mutation Context
+
+All mutations receive `ctx: { userId, userRole }` from the server:
+
+```ts
+// src/routes/api/mutate/+server.ts
+return mutator.fn({ args, tx, ctx: { userId, userRole } });
+```
+
+### Key Files
+
+- `src/lib/queries.ts` - All query definitions using `defineQueries`
+- `src/lib/mutators.ts` - All mutation definitions using `defineMutators`
+- `src/routes/api/query/+server.ts` - Query endpoint (passes context)
+- `src/routes/api/mutate/+server.ts` - Mutation endpoint (passes context)
+
+### Important Notes
+
+- **DO NOT** use `definePermissions` from Zero - we handle permissions in
+  query/mutation definitions via context
+- Every query/mutation has access to `userID` and `userRole` via context
+- The context is populated from `locals.user` (set by BetterAuth in hooks)
+- Anonymous users have `userID: 'anon'` and `userRole: undefined`
+- Admin role is `'syntax'`

src/lib/battle_mode/BattlesInProgress.svelte

@@ -1,11 +1,9 @@
 <script lang="ts">
-	import { z } from '$lib/zero.svelte';
+	import { z, queries } from '$lib/zero.svelte';
 
-	let battle = z.createQuery(
-		z.query.battles.where('status', 'PENDING').related('target')
-	);
+	let battle = z.createQuery(queries.battles.byStatus({ status: 'PENDING' }));
 	let battles_started = z.createQuery(
-		z.query.battles.where('status', 'ACTIVE').related('target')
+		queries.battles.byStatus({ status: 'ACTIVE' })
 	);
 </script>
 

src/lib/battle_mode/JoinBattler.svelte

@@ -3,7 +3,7 @@
 	import { files } from '$lib/state/FileState.svelte';
 	import Avatar from '$lib/ui/Avatar.svelte';
 	import { s, to_snake_case } from '$lib/user/utils';
-	import { z } from '$lib/zero.svelte';
+	import { z, queries, mutators } from '$lib/zero.svelte';
 	import { type Battle, type Participants, type Target } from '$sync/schema';
 	import { fade, fly } from 'svelte/transition';
 
@@ -15,52 +15,60 @@
 		me_participant: Participants;
 	} = $props();
 
-	let me = z.createQuery(z.query.user.where('id', z.userID).one());
+	let me = z.createQuery(queries.user.current());
 
 	function join_battle() {
 		// Make sure target actually exists
 		if (battle?.target?.name) {
 			// Create hax with files
-			z.mutate.hax.insert({
-				id: crypto.randomUUID(),
-				user_id: z.userID,
-				target_id: battle?.target_id || '',
-				battle_id: battle?.id || '',
-				html: HTML_TEMPLATE,
-				css: CSS_TEMPLATE,
-				type: 'BATTLE'
-			});
+			z.mutate(
+				mutators.hax.insert({
+					id: crypto.randomUUID(),
+					user_id: z.userID,
+					target_id: battle?.target_id || '',
+					battle_id: battle?.id || '',
+					html: HTML_TEMPLATE,
+					css: CSS_TEMPLATE,
+					type: 'BATTLE'
+				})
+			);
 
 			// First create file structure for battle
 			files.create_hax_directory(to_snake_case(battle.target.name));
 
 			// Add self as a participant
-			z.mutate.battle_participants.insert({
-				id: crypto.randomUUID(),
-				battle_id: battle?.id || '',
-				user_id: z.userID,
-				status: 'PENDING' as const,
-				display_order: battle?.participants.length || 0
-			});
+			z.mutate(
+				mutators.battle_participants.insert({
+					id: crypto.randomUUID(),
+					battle_id: battle?.id || '',
+					user_id: z.userID,
+					status: 'PENDING' as const,
+					display_order: battle?.participants.length || 0
+				})
+			);
 		}
 	}
 
 	function leave_battle() {
 		if (me_participant && battle?.id) {
-			z.mutate.battle_participants.delete({
-				id: me_participant.id
-			});
+			z.mutate(
+				mutators.battle_participants.delete({
+					id: me_participant.id
+				})
+			);
 		}
 	}
 
 	function lock_in() {
 		if (me_participant) {
-			z.mutate.battle_participants.upsert({
-				id: me_participant.id,
-				battle_id: battle?.id || '',
-				user_id: z.userID,
-				status: 'READY' as const
-			});
+			z.mutate(
+				mutators.battle_participants.upsert({
+					id: me_participant.id,
+					battle_id: battle?.id || '',
+					user_id: z.userID,
+					status: 'READY' as const
+				})
+			);
 		}
 	}
 </script>

src/lib/battle_mode/Voting.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { BATTLE_AWARDS } from '$lib/constants';
-	import { z } from '$lib/zero.svelte';
+	import { z, queries, mutators } from '$lib/zero.svelte';
 	import type { Battle, Hax, Participants, User } from '$sync/schema';
 	import { remove_screaming } from '$utils/formatting';
 
@@ -15,32 +15,31 @@
 
 	let votes = $derived.by(() =>
 		z.createQuery(
-			z.query.battle_votes.where(({ and, cmp }) =>
-				and(
-					cmp('battle_id', battle?.id || ''),
-					cmp('voter_id', z.userID),
-					cmp('nominee_hax_id', participant?.hax?.id || '')
-				)
-			)
+			queries.battleVotes.myVotesForNominee({
+				battleId: battle?.id || '',
+				nomineeHaxId: participant?.hax?.id || ''
+			})
 		)
 	);
 
-	function vote(award: (typeof BATTLE_AWARDS)[number], value: number) {
+	async function vote(award: (typeof BATTLE_AWARDS)[number], value: number) {
 		const current_vote = votes.data?.find((v) => v.award_type === award);
 		if (participant.hax.id) {
-			z.mutate.battle_votes
-				.upsert({
-					id: current_vote?.id || crypto.randomUUID(),
-					battle_id: battle.id || '',
-					nominee_hax_id: participant.hax.id,
-					voter_id: z.userID,
-					award_type: award,
-					value
-				})
-				.catch((error) => {
-					console.error('Error voting in battle:', error);
-					alert('Failed to submit vote. Please try again.');
-				});
+			try {
+				await z.mutate(
+					mutators.battle_votes.upsert({
+						id: current_vote?.id || crypto.randomUUID(),
+						battle_id: battle.id || '',
+						nominee_hax_id: participant.hax.id,
+						voter_id: z.userID,
+						award_type: award,
+						value
+					})
+				).server;
+			} catch (error) {
+				console.error('Error voting in battle:', error);
+				alert('Failed to submit vote. Please try again.');
+			}
 		}
 	}
 </script>
@@ -53,7 +52,8 @@
 				value={votes.data?.find((v) => v.award_type === award)?.value || 0}
 				label="Rating"
 				style="font-size: 1.6rem;"
-				onchange={(e) => vote(award, e.target.value)}
+				onchange={(e: Event & { target: { value: number } }) =>
+					vote(award, e.target.value)}
 			></wa-rating>
 		</div>
 	{/each}