@proletariat/cli 0.3.35 → 0.3.40

package/dist/lib/pmo/storage/tickets.js

@@ -3,12 +3,14 @@
  * Tickets reference workflow statuses directly via status_id.
  * Tickets have a position column for force-ranked ordering within a status.
  * Positions use gapped integers (1000, 2000, 3000...) for stable reordering.
+ *
+ * This module uses Drizzle ORM for type-safe database queries.
  */
-import { PMO_TABLES } from '../schema.js';
+import { eq, and, like, or, asc, sql, gt } from 'drizzle-orm';
+import { pmoTickets, pmoProjects, pmoWorkflowStatuses, pmoSubtasks, pmoTicketMetadata, pmoCategories, pmoTicketLabels, pmoLabels, pmoLabelGroups, } from '../../database/drizzle-schema.js';
 import { PMOError } from '../types.js';
 import { slugify, generateEntityId } from '../utils.js';
 import { rowToTicket, wrapSqliteError } from './helpers.js';
-const T = PMO_TABLES;
 export class TicketStorage {
     ctx;
     constructor(ctx) {
@@ -21,15 +23,18 @@ export class TicketStorage {
     async validateCategory(category) {
         if (!category)
             return null;
-        // Check if category exists in DB for ticket type
-        const row = this.ctx.db.prepare(`
-      SELECT name FROM ${T.categories} WHERE LOWER(name) = LOWER(?) AND type = 'ticket'
-    `).get(category);
+        const row = this.ctx.drizzle
+            .select({ name: pmoCategories.name })
+            .from(pmoCategories)
+            .where(and(sql `LOWER(${pmoCategories.name}) = LOWER(${category})`, eq(pmoCategories.type, 'ticket')))
+            .get();
         if (!row) {
-            // Get valid categories for error message
-            const validCategories = this.ctx.db.prepare(`
-        SELECT name FROM ${T.categories} WHERE type = 'ticket' ORDER BY position
-      `).all();
+            const validCategories = this.ctx.drizzle
+                .select({ name: pmoCategories.name })
+                .from(pmoCategories)
+                .where(eq(pmoCategories.type, 'ticket'))
+                .orderBy(asc(pmoCategories.position))
+                .all();
             const validNames = validCategories.map(c => c.name).join(', ');
             throw new PMOError('INVALID', `Invalid category "${category}". Valid categories: ${validNames}`);
         }
@@ -48,33 +53,42 @@ export class TicketStorage {
         if (!identifier)
             return null;
         // 1. Exact ID match
-        const exactMatch = this.ctx.db.prepare(`
-      SELECT id FROM ${T.projects} WHERE id = ?
-    `).get(identifier);
+        const exactMatch = this.ctx.drizzle
+            .select({ id: pmoProjects.id })
+            .from(pmoProjects)
+            .where(eq(pmoProjects.id, identifier))
+            .get();
         if (exactMatch)
             return exactMatch.id;
         // 2. Case-insensitive ID match
-        const caseInsensitiveId = this.ctx.db.prepare(`
-      SELECT id FROM ${T.projects} WHERE LOWER(id) = LOWER(?)
-    `).get(identifier);
+        const caseInsensitiveId = this.ctx.drizzle
+            .select({ id: pmoProjects.id })
+            .from(pmoProjects)
+            .where(sql `LOWER(${pmoProjects.id}) = LOWER(${identifier})`)
+            .get();
         if (caseInsensitiveId)
             return caseInsensitiveId.id;
         // 3. Exact name match
-        const nameMatch = this.ctx.db.prepare(`
-      SELECT id FROM ${T.projects} WHERE name = ?
-    `).get(identifier);
+        const nameMatch = this.ctx.drizzle
+            .select({ id: pmoProjects.id })
+            .from(pmoProjects)
+            .where(eq(pmoProjects.name, identifier))
+            .get();
         if (nameMatch)
             return nameMatch.id;
         // 4. Case-insensitive name match
-        const caseInsensitiveName = this.ctx.db.prepare(`
-      SELECT id FROM ${T.projects} WHERE LOWER(name) = LOWER(?)
-    `).get(identifier);
+        const caseInsensitiveName = this.ctx.drizzle
+            .select({ id: pmoProjects.id })
+            .from(pmoProjects)
+            .where(sql `LOWER(${pmoProjects.name}) = LOWER(${identifier})`)
+            .get();
         if (caseInsensitiveName)
             return caseInsensitiveName.id;
         // 5. Slugified name match
-        const allProjects = this.ctx.db.prepare(`
-      SELECT id, name FROM ${T.projects}
-    `).all();
+        const allProjects = this.ctx.drizzle
+            .select({ id: pmoProjects.id, name: pmoProjects.name })
+            .from(pmoProjects)
+            .all();
         const identifierLower = identifier.toLowerCase();
         for (const project of allProjects) {
             const projectSlug = slugify(project.name);
@@ -98,48 +112,51 @@ export class TicketStorage {
         // Get status_id from project's workflow
         let statusId = ticket.statusId;
         // Get the project's workflow
-        const project = this.ctx.db.prepare(`
-      SELECT workflow_id FROM ${T.projects} WHERE id = ?
-    `).get(projectId);
+        const project = this.ctx.drizzle
+            .select({ workflowId: pmoProjects.workflowId })
+            .from(pmoProjects)
+            .where(eq(pmoProjects.id, projectId))
+            .get();
         if (!project) {
             throw new PMOError('NOT_FOUND', `Project not found: ${projectId}`);
         }
-        const workflowId = project.workflow_id || 'default';
+        const workflowId = project.workflowId || 'default';
         // If statusName is provided, look up status by name
         if (!statusId && ticket.statusName) {
-            const namedStatus = this.ctx.db.prepare(`
-        SELECT id FROM ${T.workflow_statuses}
-        WHERE workflow_id = ? AND LOWER(name) = LOWER(?)
-      `).get(workflowId, ticket.statusName);
+            const namedStatus = this.ctx.drizzle
+                .select({ id: pmoWorkflowStatuses.id })
+                .from(pmoWorkflowStatuses)
+                .where(and(eq(pmoWorkflowStatuses.workflowId, workflowId), sql `LOWER(${pmoWorkflowStatuses.name}) = LOWER(${ticket.statusName})`))
+                .get();
             if (namedStatus) {
                 statusId = namedStatus.id;
             }
         }
         if (!statusId) {
             // Get default status from workflow
-            const defaultStatus = this.ctx.db.prepare(`
-        SELECT id FROM ${T.workflow_statuses}
-        WHERE workflow_id = ? AND is_default = 1
-      `).get(workflowId);
+            const defaultStatus = this.ctx.drizzle
+                .select({ id: pmoWorkflowStatuses.id })
+                .from(pmoWorkflowStatuses)
+                .where(and(eq(pmoWorkflowStatuses.workflowId, workflowId), eq(pmoWorkflowStatuses.isDefault, true)))
+                .get();
             if (defaultStatus) {
                 statusId = defaultStatus.id;
             }
             else {
                 // Fall back to first status in workflow (by category then position)
-                const firstStatus = this.ctx.db.prepare(`
-          SELECT id FROM ${T.workflow_statuses}
-          WHERE workflow_id = ?
-          ORDER BY
-            CASE category
+                const firstStatus = this.ctx.drizzle
+                    .select({ id: pmoWorkflowStatuses.id })
+                    .from(pmoWorkflowStatuses)
+                    .where(eq(pmoWorkflowStatuses.workflowId, workflowId))
+                    .orderBy(sql `CASE ${pmoWorkflowStatuses.category}
               WHEN 'backlog' THEN 1
               WHEN 'unstarted' THEN 2
               WHEN 'started' THEN 3
               WHEN 'completed' THEN 4
               WHEN 'canceled' THEN 5
-            END,
-            position ASC
-          LIMIT 1
-        `).get(workflowId);
+            END`, asc(pmoWorkflowStatuses.position))
+                    .limit(1)
+                    .get();
                 if (firstStatus) {
                     statusId = firstStatus.id;
                 }
@@ -149,43 +166,60 @@ export class TicketStorage {
             }
         }
         // Get next position for the target status (append to end with gapped integer)
-        const maxPos = this.ctx.db.prepare(`
-      SELECT COALESCE(MAX(position), 0) as max_pos FROM ${T.tickets} WHERE status_id = ?
-    `).get(statusId);
-        const position = maxPos.max_pos + 1000;
+        const maxPos = this.ctx.drizzle
+            .select({ maxPos: sql `COALESCE(MAX(${pmoTickets.position}), 0)` })
+            .from(pmoTickets)
+            .where(eq(pmoTickets.statusId, statusId))
+            .get();
+        const position = (maxPos?.maxPos ?? 0) + 1000;
         // Insert ticket
         const labels = ticket.labels || [];
         try {
-            this.ctx.db.prepare(`
-        INSERT INTO ${T.tickets} (
-          id, project_id, title, description, priority, category,
-          status_id, owner, assignee, spec_id, epic_id, labels,
-          position, created_at, updated_at, last_synced_from_spec, last_synced_from_board
-        )
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-      `).run(id, projectId, title, ticket.description || null, ticket.priority || null, validatedCategory, statusId, ticket.owner || null, ticket.assignee || null, specId, ticket.epicId || null, JSON.stringify(labels), position, now, now, ticket.lastSyncedFromSpec || null, ticket.lastSyncedFromBoard || null);
+            const ticketValues = {
+                id,
+                projectId,
+                title,
+                description: ticket.description || null,
+                priority: ticket.priority || null,
+                category: validatedCategory,
+                status: 'backlog',
+                statusId: statusId,
+                owner: ticket.owner || null,
+                assignee: ticket.assignee || null,
+                specId,
+                epicId: ticket.epicId || null,
+                labels: JSON.stringify(labels),
+                position,
+                createdAt: String(now),
+                updatedAt: String(now),
+                lastSyncedFromSpec: ticket.lastSyncedFromSpec ? String(ticket.lastSyncedFromSpec) : null,
+                lastSyncedFromBoard: ticket.lastSyncedFromBoard ? String(ticket.lastSyncedFromBoard) : null,
+            };
+            this.ctx.drizzle.insert(pmoTickets).values(ticketValues).run();
         }
         catch (err) {
             wrapSqliteError('Ticket', 'create', err);
         }
         // Insert subtasks
         if (ticket.subtasks && ticket.subtasks.length > 0) {
-            const insertSubtask = this.ctx.db.prepare(`
-        INSERT INTO ${T.subtasks} (id, ticket_id, title, done, position)
-        VALUES (?, ?, ?, ?, ?)
-      `);
-            ticket.subtasks.forEach((st, idx) => {
-                insertSubtask.run(st.id || slugify(st.title), id, st.title, st.done ? 1 : 0, idx);
-            });
+            for (const [idx, st] of ticket.subtasks.entries()) {
+                this.ctx.drizzle.insert(pmoSubtasks).values({
+                    id: st.id || slugify(st.title),
+                    ticketId: id,
+                    title: st.title,
+                    done: st.done || false,
+                    position: idx,
+                }).run();
+            }
         }
         // Insert metadata
         if (ticket.metadata) {
-            const insertMeta = this.ctx.db.prepare(`
-        INSERT INTO ${T.ticket_metadata} (ticket_id, key, value)
-        VALUES (?, ?, ?)
-      `);
             for (const [key, value] of Object.entries(ticket.metadata)) {
-                insertMeta.run(id, key, value);
+                this.ctx.drizzle.insert(pmoTicketMetadata).values({
+                    ticketId: id,
+                    key,
+                    value,
+                }).run();
             }
         }
         this.ctx.updateBoardTimestamp(projectId);
@@ -203,18 +237,38 @@ export class TicketStorage {
      * Joins workflow_statuses to get column name (status name is the column).
      */
     async getTicketById(id) {
-        const row = this.ctx.db.prepare(`
-      SELECT t.*,
-             ws.id as column_id,
-             t.position as position,
-             ws.name as column_name
-      FROM ${T.tickets} t
-      LEFT JOIN ${T.workflow_statuses} ws ON t.status_id = ws.id
-      WHERE LOWER(t.id) = LOWER(?)
-    `).get(id);
-        if (!row)
+        const rows = this.ctx.drizzle
+            .select({
+            id: pmoTickets.id,
+            project_id: pmoTickets.projectId,
+            title: pmoTickets.title,
+            description: pmoTickets.description,
+            priority: pmoTickets.priority,
+            category: pmoTickets.category,
+            status_id: pmoTickets.statusId,
+            owner: pmoTickets.owner,
+            assignee: pmoTickets.assignee,
+            branch: pmoTickets.branch,
+            spec_id: pmoTickets.specId,
+            epic_id: pmoTickets.epicId,
+            labels: pmoTickets.labels,
+            position: pmoTickets.position,
+            created_at: pmoTickets.createdAt,
+            updated_at: pmoTickets.updatedAt,
+            last_synced_from_spec: pmoTickets.lastSyncedFromSpec,
+            last_synced_from_board: pmoTickets.lastSyncedFromBoard,
+            column_id: pmoWorkflowStatuses.id,
+            column_name: pmoWorkflowStatuses.name,
+            project_name: sql `NULL`,
+        })
+            .from(pmoTickets)
+            .leftJoin(pmoWorkflowStatuses, eq(pmoTickets.statusId, pmoWorkflowStatuses.id))
+            .where(sql `LOWER(${pmoTickets.id}) = LOWER(${id})`)
+            .all();
+        if (rows.length === 0)
             return null;
-        return rowToTicket(this.ctx.db, row);
+        const row = rows[0];
+        return rowToTicket(this.ctx.drizzle, row);
     }
     /**
      * Update a ticket.
@@ -230,82 +284,63 @@ export class TicketStorage {
         if (changes.category !== undefined) {
             validatedCategory = await this.validateCategory(changes.category);
         }
-        const updates = [];
-        const params = [];
-        if (changes.title !== undefined) {
-            updates.push('title = ?');
-            params.push(changes.title);
-        }
-        if (changes.description !== undefined) {
-            updates.push('description = ?');
-            params.push(changes.description);
-        }
-        if (changes.priority !== undefined) {
-            updates.push('priority = ?');
-            params.push(changes.priority);
-        }
-        if (validatedCategory !== undefined) {
-            updates.push('category = ?');
-            params.push(validatedCategory);
-        }
-        if (changes.statusId !== undefined) {
-            updates.push('status_id = ?');
-            params.push(changes.statusId);
-        }
-        if (changes.owner !== undefined) {
-            updates.push('owner = ?');
-            params.push(changes.owner);
-        }
-        if (changes.assignee !== undefined) {
-            updates.push('assignee = ?');
-            params.push(changes.assignee);
-        }
-        if (changes.branch !== undefined) {
-            updates.push('branch = ?');
-            params.push(changes.branch);
-        }
-        if (changes.specId !== undefined) {
-            updates.push('spec_id = ?');
-            params.push(changes.specId);
-        }
+        const updates = {};
+        if (changes.title !== undefined)
+            updates.title = changes.title;
+        if (changes.description !== undefined)
+            updates.description = changes.description;
+        if (changes.priority !== undefined)
+            updates.priority = changes.priority;
+        if (validatedCategory !== undefined)
+            updates.category = validatedCategory;
+        if (changes.statusId !== undefined)
+            updates.statusId = changes.statusId;
+        if (changes.owner !== undefined)
+            updates.owner = changes.owner;
+        if (changes.assignee !== undefined)
+            updates.assignee = changes.assignee;
+        if (changes.branch !== undefined)
+            updates.branch = changes.branch;
+        if (changes.specId !== undefined)
+            updates.specId = changes.specId;
         if (changes.lastSyncedFromSpec !== undefined) {
-            updates.push('last_synced_from_spec = ?');
-            params.push(changes.lastSyncedFromSpec);
+            updates.lastSyncedFromSpec = changes.lastSyncedFromSpec;
         }
         if (changes.lastSyncedFromBoard !== undefined) {
-            updates.push('last_synced_from_board = ?');
-            params.push(changes.lastSyncedFromBoard);
-        }
-        if (changes.labels !== undefined) {
-            updates.push('labels = ?');
-            params.push(JSON.stringify(changes.labels));
-        }
-        if (updates.length > 0) {
-            updates.push('updated_at = ?');
-            params.push(Date.now());
-            params.push(id);
-            this.ctx.db.prepare(`UPDATE ${T.tickets} SET ${updates.join(', ')} WHERE id = ?`).run(...params);
+            updates.lastSyncedFromBoard = changes.lastSyncedFromBoard;
+        }
+        if (changes.labels !== undefined)
+            updates.labels = JSON.stringify(changes.labels);
+        if (Object.keys(updates).length > 0) {
+            updates.updatedAt = String(Date.now());
+            this.ctx.drizzle
+                .update(pmoTickets)
+                .set(updates)
+                .where(eq(pmoTickets.id, id))
+                .run();
         }
         // Update subtasks if provided
         if (changes.subtasks !== undefined) {
-            this.ctx.db.prepare(`DELETE FROM ${T.subtasks} WHERE ticket_id = ?`).run(id);
-            const insertSubtask = this.ctx.db.prepare(`
-        INSERT INTO ${T.subtasks} (id, ticket_id, title, done, position)
-        VALUES (?, ?, ?, ?, ?)
-      `);
-            changes.subtasks.forEach((st, idx) => {
-                insertSubtask.run(st.id || slugify(st.title), id, st.title, st.done ? 1 : 0, idx);
-            });
+            this.ctx.drizzle.delete(pmoSubtasks).where(eq(pmoSubtasks.ticketId, id)).run();
+            for (const [idx, st] of changes.subtasks.entries()) {
+                this.ctx.drizzle.insert(pmoSubtasks).values({
+                    id: st.id || slugify(st.title),
+                    ticketId: id,
+                    title: st.title,
+                    done: st.done || false,
+                    position: idx,
+                }).run();
+            }
         }
         // Update metadata if provided
         if (changes.metadata !== undefined) {
-            this.ctx.db.prepare(`DELETE FROM ${T.ticket_metadata} WHERE ticket_id = ?`).run(id);
-            const insertMeta = this.ctx.db.prepare(`
-        INSERT INTO ${T.ticket_metadata} (ticket_id, key, value)
-        VALUES (?, ?, ?)
-      `);
+            this.ctx.drizzle.delete(pmoTicketMetadata).where(eq(pmoTicketMetadata.ticketId, id)).run();
             for (const [key, value] of Object.entries(changes.metadata)) {
-                insertMeta.run(id, key, value);
+                this.ctx.drizzle.insert(pmoTicketMetadata).values({
+                    ticketId: id,
+                    key,
+                    value,
+                }).run();
             }
         }
         // Update board timestamp for the ticket's actual project
@@ -318,11 +353,11 @@ export class TicketStorage {
      * Update the timestamp for a specific project.
      */
     updateProjectTimestamp(projectId) {
-        this.ctx.db.prepare(`
-      UPDATE ${T.projects}
-      SET updated_at = ?
-      WHERE id = ?
-    `).run(Date.now(), projectId);
+        this.ctx.drizzle
+            .update(pmoProjects)
+            .set({ updatedAt: String(Date.now()) })
+            .where(eq(pmoProjects.id, projectId))
+            .run();
     }
     /**
      * Move a ticket to a different status (column).
@@ -336,18 +371,21 @@ export class TicketStorage {
             throw new PMOError('NOT_FOUND', `Ticket not found: ${id}`, id);
         }
         // Get project's workflow
-        const project = this.ctx.db.prepare(`
-      SELECT workflow_id FROM ${T.projects} WHERE id = ?
-    `).get(projectId);
+        const project = this.ctx.drizzle
+            .select({ workflowId: pmoProjects.workflowId })
+            .from(pmoProjects)
+            .where(eq(pmoProjects.id, projectId))
+            .get();
         if (!project) {
             throw new PMOError('NOT_FOUND', `Project not found: ${projectId}`);
         }
-        const workflowId = project.workflow_id || 'default';
+        const workflowId = project.workflowId || 'default';
         // Find target status by ID or name
-        const targetStatus = this.ctx.db.prepare(`
-      SELECT id FROM ${T.workflow_statuses}
-      WHERE workflow_id = ? AND (id = ? OR LOWER(name) = LOWER(?))
-    `).get(workflowId, column, column);
+        const targetStatus = this.ctx.drizzle
+            .select({ id: pmoWorkflowStatuses.id })
+            .from(pmoWorkflowStatuses)
+            .where(and(eq(pmoWorkflowStatuses.workflowId, workflowId), or(eq(pmoWorkflowStatuses.id, column), sql `LOWER(${pmoWorkflowStatuses.name}) = LOWER(${column})`)))
+            .get();
         if (!targetStatus) {
             throw new PMOError('NOT_FOUND', `Status not found: ${column}`);
         }
@@ -357,17 +395,23 @@ export class TicketStorage {
             newPosition = position;
         }
         else {
-            const maxPos = this.ctx.db.prepare(`
-        SELECT COALESCE(MAX(position), 0) as max_pos FROM ${T.tickets} WHERE status_id = ?
-      `).get(targetStatus.id);
-            newPosition = maxPos.max_pos + 1000;
+            const maxPos = this.ctx.drizzle
+                .select({ maxPos: sql `COALESCE(MAX(${pmoTickets.position}), 0)` })
+                .from(pmoTickets)
+                .where(eq(pmoTickets.statusId, targetStatus.id))
+                .get();
+            newPosition = (maxPos?.maxPos ?? 0) + 1000;
         }
         // Update ticket's status_id and position
-        this.ctx.db.prepare(`
-      UPDATE ${T.tickets}
-      SET status_id = ?, position = ?, updated_at = ?
-      WHERE id = ?
-    `).run(targetStatus.id, newPosition, Date.now(), id);
+        this.ctx.drizzle
+            .update(pmoTickets)
+            .set({
+            statusId: targetStatus.id,
+            position: newPosition,
+            updatedAt: String(Date.now()),
+        })
+            .where(eq(pmoTickets.id, id))
+            .run();
         this.ctx.updateBoardTimestamp(projectId);
         return (await this.getTicketById(id));
     }
@@ -395,12 +439,13 @@ export class TicketStorage {
             }
             const afterPosition = afterTicket.position ?? 0;
             // Find the next ticket after the target
-            const nextTicket = this.ctx.db.prepare(`
-        SELECT position FROM ${T.tickets}
-        WHERE status_id = ? AND position > ? AND id != ?
-        ORDER BY position ASC
-        LIMIT 1
-      `).get(existing.statusId, afterPosition, id);
+            const nextTicket = this.ctx.drizzle
+                .select({ position: pmoTickets.position })
+                .from(pmoTickets)
+                .where(and(eq(pmoTickets.statusId, existing.statusId), gt(pmoTickets.position, afterPosition), sql `${pmoTickets.id} != ${id}`))
+                .orderBy(asc(pmoTickets.position))
+                .limit(1)
+                .get();
             if (nextTicket) {
                 // Place between afterTicket and nextTicket
                 const gap = nextTicket.position - afterPosition;
@@ -413,12 +458,13 @@ export class TicketStorage {
                     // Re-read the after ticket position after regapping
                     const refreshedAfter = await this.getTicketById(opts.afterTicketId);
                     const refreshedAfterPos = refreshedAfter?.position ?? 0;
-                    const refreshedNext = this.ctx.db.prepare(`
-            SELECT position FROM ${T.tickets}
-            WHERE status_id = ? AND position > ? AND id != ?
-            ORDER BY position ASC
-            LIMIT 1
-          `).get(existing.statusId, refreshedAfterPos, id);
+                    const refreshedNext = this.ctx.drizzle
+                        .select({ position: pmoTickets.position })
+                        .from(pmoTickets)
+                        .where(and(eq(pmoTickets.statusId, existing.statusId), gt(pmoTickets.position, refreshedAfterPos), sql `${pmoTickets.id} != ${id}`))
+                        .orderBy(asc(pmoTickets.position))
+                        .limit(1)
+                        .get();
                     newPosition = refreshedNext
                         ? refreshedAfterPos + Math.floor((refreshedNext.position - refreshedAfterPos) / 2)
                         : refreshedAfterPos + 1000;
@@ -435,11 +481,14 @@ export class TicketStorage {
         else {
             throw new PMOError('INVALID', 'Must provide either position or after_ticket_id');
         }
-        this.ctx.db.prepare(`
-      UPDATE ${T.tickets}
-      SET position = ?, updated_at = ?
-      WHERE id = ?
-    `).run(newPosition, Date.now(), id);
+        this.ctx.drizzle
+            .update(pmoTickets)
+            .set({
+            position: newPosition,
+            updatedAt: String(Date.now()),
+        })
+            .where(eq(pmoTickets.id, id))
+            .run();
         if (existing.projectId) {
             this.ctx.updateBoardTimestamp(existing.projectId);
         }
@@ -450,24 +499,24 @@ export class TicketStorage {
      * Optionally excludes a ticket (e.g., the one being moved).
      */
     regapPositions(statusId, excludeTicketId) {
-        let query = `
-      SELECT id FROM ${T.tickets}
-      WHERE status_id = ?
-    `;
-        const params = [statusId];
+        const conditions = [eq(pmoTickets.statusId, statusId)];
         if (excludeTicketId) {
-            query += ' AND id != ?';
-            params.push(excludeTicketId);
-        }
-        query += ' ORDER BY position ASC, created_at ASC';
-        const tickets = this.ctx.db.prepare(query).all(...params);
-        const update = this.ctx.db.prepare(`UPDATE ${T.tickets} SET position = ? WHERE id = ?`);
-        const regap = this.ctx.db.transaction(() => {
+            conditions.push(sql `${pmoTickets.id} != ${excludeTicketId}`);
+        }
+        const tickets = this.ctx.drizzle
+            .select({ id: pmoTickets.id })
+            .from(pmoTickets)
+            .where(and(...conditions))
+            .orderBy(asc(pmoTickets.position), asc(pmoTickets.createdAt))
+            .all();
+        this.ctx.drizzle.transaction((tx) => {
             tickets.forEach((ticket, idx) => {
-                update.run((idx + 1) * 1000, ticket.id);
+                tx.update(pmoTickets)
+                    .set({ position: (idx + 1) * 1000 })
+                    .where(eq(pmoTickets.id, ticket.id))
+                    .run();
             });
         });
-        regap();
     }
     /**
      * Delete a ticket.
@@ -485,10 +534,10 @@ export class TicketStorage {
         // Delete ticket (by ID only, since IDs are globally unique)
         // Related data (subtasks, metadata) are deleted via CASCADE
         try {
-            const result = this.ctx.db.prepare(`
-        DELETE FROM ${T.tickets}
-        WHERE id = ?
-      `).run(id);
+            const result = this.ctx.drizzle
+                .delete(pmoTickets)
+                .where(eq(pmoTickets.id, id))
+                .run();
             if (result.changes === 0) {
                 throw new PMOError('NOT_FOUND', `Ticket not found: ${id}`, id);
             }
@@ -507,7 +556,6 @@ export class TicketStorage {
      * @param filter - Additional filters to apply.
      */
     async listTickets(projectIdOrName, filter) {
-        const params = [];
         // Resolve project identifier to actual ID if provided
         let resolvedProjectId;
         if (projectIdOrName !== undefined) {
@@ -517,91 +565,94 @@ export class TicketStorage {
                 resolvedProjectId = projectIdOrName;
             }
         }
-        // Build the base query using workflow_statuses
-        let query = `
-      SELECT t.*,
-             ws.id as column_id,
-             t.position as position,
-             ws.name as column_name,
-             p.name as project_name
-      FROM ${T.tickets} t
-      LEFT JOIN ${T.workflow_statuses} ws ON t.status_id = ws.id
-      LEFT JOIN ${T.projects} p ON t.project_id = p.id
-      WHERE 1=1
-    `;
+        // Build conditions array for dynamic WHERE clause
+        const conditions = [];
         // Apply project scoping
         if (resolvedProjectId !== undefined) {
-            query += ' AND t.project_id = ?';
-            params.push(resolvedProjectId);
+            conditions.push(eq(pmoTickets.projectId, resolvedProjectId));
         }
-        // If projectId is undefined, list all tickets across all projects
         if (filter?.statusId) {
-            query += ' AND t.status_id = ?';
-            params.push(filter.statusId);
+            conditions.push(eq(pmoTickets.statusId, filter.statusId));
         }
         if (filter?.statusCategory) {
-            query += ' AND ws.category = ?';
-            params.push(filter.statusCategory);
+            conditions.push(eq(pmoWorkflowStatuses.category, filter.statusCategory));
         }
         if (filter?.priority) {
-            query += ' AND t.priority = ?';
-            params.push(filter.priority);
+            conditions.push(eq(pmoTickets.priority, filter.priority));
         }
         if (filter?.category) {
-            query += ' AND t.category = ?';
-            params.push(filter.category);
+            conditions.push(eq(pmoTickets.category, filter.category));
         }
         if (filter?.owner) {
-            query += ' AND t.owner = ?';
-            params.push(filter.owner);
+            conditions.push(eq(pmoTickets.owner, filter.owner));
         }
         if (filter?.assignee) {
-            query += ' AND t.assignee = ?';
-            params.push(filter.assignee);
+            conditions.push(eq(pmoTickets.assignee, filter.assignee));
         }
         if (filter?.search) {
-            query += ' AND (t.title LIKE ? OR t.description LIKE ?)';
-            params.push(`%${filter.search}%`, `%${filter.search}%`);
+            conditions.push(or(like(pmoTickets.title, `%${filter.search}%`), like(pmoTickets.description, `%${filter.search}%`)));
         }
         if (filter?.spec) {
-            query += ' AND t.spec_id = ?';
-            params.push(filter.spec);
+            conditions.push(eq(pmoTickets.specId, filter.spec));
         }
         if (filter?.epic) {
-            query += ' AND t.epic_id = ?';
-            params.push(filter.epic);
+            conditions.push(eq(pmoTickets.epicId, filter.epic));
         }
         if (filter?.column) {
-            // Column filter now uses status name
-            query += ' AND ws.name = ?';
-            params.push(filter.column);
+            conditions.push(eq(pmoWorkflowStatuses.name, filter.column));
         }
         if (filter?.label) {
-            query += ` AND t.id IN (
-        SELECT tl.ticket_id FROM ${T.ticket_labels} tl
-        JOIN ${T.labels} l ON tl.label_id = l.id
-        WHERE LOWER(l.name) = LOWER(?)
-      )`;
-            params.push(filter.label);
+            conditions.push(sql `${pmoTickets.id} IN (
+          SELECT ${pmoTicketLabels.ticketId} FROM ${pmoTicketLabels}
+          JOIN ${pmoLabels} ON ${pmoTicketLabels.labelId} = ${pmoLabels.id}
+          WHERE LOWER(${pmoLabels.name}) = LOWER(${filter.label})
+        )`);
         }
         if (filter?.labelGroup) {
-            query += ` AND t.id IN (
-        SELECT tl.ticket_id FROM ${T.ticket_labels} tl
-        JOIN ${T.labels} l ON tl.label_id = l.id
-        JOIN ${T.label_groups} lg ON l.group_id = lg.id
-        WHERE LOWER(lg.name) = LOWER(?)
-      )`;
-            params.push(filter.labelGroup);
-        }
-        // Order by status column position, then ticket position within status
-        if (projectIdOrName === undefined) {
-            query += ` ORDER BY p.name, ws.position, t.position ASC, t.created_at ASC`;
-        }
-        else {
-            query += ` ORDER BY ws.position, t.position ASC, t.created_at ASC`;
-        }
-        const rows = this.ctx.db.prepare(query).all(...params);
-        return Promise.all(rows.map((row) => rowToTicket(this.ctx.db, row)));
+            conditions.push(sql `${pmoTickets.id} IN (
+          SELECT ${pmoTicketLabels.ticketId} FROM ${pmoTicketLabels}
+          JOIN ${pmoLabels} ON ${pmoTicketLabels.labelId} = ${pmoLabels.id}
+          JOIN ${pmoLabelGroups} ON ${pmoLabels.groupId} = ${pmoLabelGroups.id}
+          WHERE LOWER(${pmoLabelGroups.name}) = LOWER(${filter.labelGroup})
+        )`);
+        }
+        // Build order clause
+        const orderClauses = projectIdOrName === undefined
+            ? [asc(pmoProjects.name), asc(pmoWorkflowStatuses.position), asc(pmoTickets.position), asc(pmoTickets.createdAt)]
+            : [asc(pmoWorkflowStatuses.position), asc(pmoTickets.position), asc(pmoTickets.createdAt)];
+        let query = this.ctx.drizzle
+            .select({
+            id: pmoTickets.id,
+            project_id: pmoTickets.projectId,
+            title: pmoTickets.title,
+            description: pmoTickets.description,
+            priority: pmoTickets.priority,
+            category: pmoTickets.category,
+            status_id: pmoTickets.statusId,
+            owner: pmoTickets.owner,
+            assignee: pmoTickets.assignee,
+            branch: pmoTickets.branch,
+            spec_id: pmoTickets.specId,
+            epic_id: pmoTickets.epicId,
+            labels: pmoTickets.labels,
+            position: pmoTickets.position,
+            created_at: pmoTickets.createdAt,
+            updated_at: pmoTickets.updatedAt,
+            last_synced_from_spec: pmoTickets.lastSyncedFromSpec,
+            last_synced_from_board: pmoTickets.lastSyncedFromBoard,
+            column_id: pmoWorkflowStatuses.id,
+            column_name: pmoWorkflowStatuses.name,
+            project_name: pmoProjects.name,
+        })
+            .from(pmoTickets)
+            .leftJoin(pmoWorkflowStatuses, eq(pmoTickets.statusId, pmoWorkflowStatuses.id))
+            .leftJoin(pmoProjects, eq(pmoTickets.projectId, pmoProjects.id))
+            .$dynamic();
+        if (conditions.length > 0) {
+            query = query.where(and(...conditions));
+        }
+        const rows = query.orderBy(...orderClauses).all();
+        return Promise.all(rows.map((row) => rowToTicket(this.ctx.drizzle, row)));
     }
     /**
      * Move a ticket to a different project.
@@ -617,55 +668,64 @@ export class TicketStorage {
             throw new PMOError('INVALID', `Ticket ${ticketId} has no associated project`, ticketId);
         }
         // Check if target project exists and get its workflow
-        const targetProject = this.ctx.db.prepare(`
-      SELECT id, workflow_id FROM ${T.projects} WHERE id = ?
-    `).get(newProjectId);
+        const targetProject = this.ctx.drizzle
+            .select({ id: pmoProjects.id, workflowId: pmoProjects.workflowId })
+            .from(pmoProjects)
+            .where(eq(pmoProjects.id, newProjectId))
+            .get();
         if (!targetProject) {
             throw new PMOError('NOT_FOUND', `Project not found: ${newProjectId}`, newProjectId);
         }
-        const workflowId = targetProject.workflow_id || 'default';
+        const workflowId = targetProject.workflowId || 'default';
         // Get default status for target project's workflow
         let newStatusId;
-        const defaultStatus = this.ctx.db.prepare(`
-      SELECT id FROM ${T.workflow_statuses}
-      WHERE workflow_id = ? AND is_default = 1
-    `).get(workflowId);
+        const defaultStatus = this.ctx.drizzle
+            .select({ id: pmoWorkflowStatuses.id })
+            .from(pmoWorkflowStatuses)
+            .where(and(eq(pmoWorkflowStatuses.workflowId, workflowId), eq(pmoWorkflowStatuses.isDefault, true)))
+            .get();
         if (defaultStatus) {
             newStatusId = defaultStatus.id;
         }
         else {
             // Get first status in workflow
-            const firstStatus = this.ctx.db.prepare(`
-        SELECT id FROM ${T.workflow_statuses}
-        WHERE workflow_id = ?
-        ORDER BY
-          CASE category
+            const firstStatus = this.ctx.drizzle
+                .select({ id: pmoWorkflowStatuses.id })
+                .from(pmoWorkflowStatuses)
+                .where(eq(pmoWorkflowStatuses.workflowId, workflowId))
+                .orderBy(sql `CASE ${pmoWorkflowStatuses.category}
             WHEN 'backlog' THEN 1
             WHEN 'unstarted' THEN 2
             WHEN 'started' THEN 3
             WHEN 'completed' THEN 4
             WHEN 'canceled' THEN 5
-          END,
-          position ASC
-        LIMIT 1
-      `).get(workflowId);
+          END`, asc(pmoWorkflowStatuses.position))
+                .limit(1)
+                .get();
             if (firstStatus) {
                 newStatusId = firstStatus.id;
             }
         }
         // Get next position for the target status
         const targetStatusId = newStatusId || existing.statusId;
-        const maxPos = this.ctx.db.prepare(`
-      SELECT COALESCE(MAX(position), 0) as max_pos FROM ${T.tickets} WHERE status_id = ?
-    `).get(targetStatusId);
-        const newTicketPosition = maxPos.max_pos + 1000;
+        const maxPos = this.ctx.drizzle
+            .select({ maxPos: sql `COALESCE(MAX(${pmoTickets.position}), 0)` })
+            .from(pmoTickets)
+            .where(eq(pmoTickets.statusId, targetStatusId))
+            .get();
+        const newTicketPosition = (maxPos?.maxPos ?? 0) + 1000;
         // Update ticket's project_id, status_id, and position
         const now = Date.now();
-        this.ctx.db.prepare(`
-      UPDATE ${T.tickets}
-      SET project_id = ?, status_id = ?, position = ?, updated_at = ?
-      WHERE id = ?
-    `).run(newProjectId, targetStatusId, newTicketPosition, now, ticketId);
+        this.ctx.drizzle
+            .update(pmoTickets)
+            .set({
+            projectId: newProjectId,
+            statusId: targetStatusId,
+            position: newTicketPosition,
+            updatedAt: String(now),
+        })
+            .where(eq(pmoTickets.id, ticketId))
+            .run();
         // Update timestamps for both projects
         this.updateProjectTimestamp(oldProjectId);
         this.updateProjectTimestamp(newProjectId);