Merge pull request #22 from jmbish04/claude/migrate-drizzle-orm-01RRGUxNh4c8T71fvks6KRL8

Migrate from raw D1 SQL to Drizzle ORM

Author: jmbish04

drizzle.config.ts

@@ -0,0 +1,11 @@
+import type { Config } from 'drizzle-kit'
+
+export default {
+  schema: './src/db/schema.ts',
+  out: './migrations',
+  driver: 'd1',
+  dbCredentials: {
+    wranglerConfigPath: './wrangler.jsonc',
+    dbName: 'core-github-api',
+  },
+} satisfies Config

package.json

@@ -9,7 +9,8 @@
     "migrate:local": "wrangler d1 migrations apply DB --local",
     "migrate:remote": "wrangler d1 migrations apply DB --remote",
     "deploy:only": "wrangler deploy",
-    "deploy": "npm run migrate:remote && npm run deploy:only"
+    "deploy": "npm run db:generate && npm run migrate:remote && npm run deploy:only",
+    "db:generate": "drizzle-kit generate:sqlite --config=drizzle.config.ts"
   },
   "dependencies": {
     "@cloudflare/containers": "latest",
@@ -34,7 +35,7 @@
   "devDependencies": {
     "@cloudflare/vitest-pool-workers": "^0.10.5",
     "@types/node": "^20.14.10",
-    "json5": "^2.2.3",
+    "drizzle-kit": "^0.23.0",
     "typescript": "^5.6.0",
     "vitest": "~3.2.0",
     "wrangler": "^4.45.0"

src/agents/orchestrator.ts

@@ -6,6 +6,8 @@
  */
 
 import { Agent } from 'agents'
+import { getDb, schema } from '../db'
+import { eq, desc } from 'drizzle-orm'
 // No longer need a direct import of the workflow class to call it
 
 export class OrchestratorAgent extends Agent {
@@ -16,21 +18,25 @@ export class OrchestratorAgent extends Agent {
   async start(prompt: string) {
     const sessionId = crypto.randomUUID()
     const searchIds = []
+    const db = getDb(this.env.DB)
 
     // 1. Persist the session to D1
-    await this.env.DB.prepare(
-      'INSERT INTO sessions (session_id, prompt) VALUES (?, ?)'
-    ).bind(sessionId, prompt).run()
+    await db.insert(schema.sessions).values({
+      sessionId,
+      prompt
+    })
 
     // 2. Generate search terms
     const searchTerms = await this.generateSearchTerms(prompt)
 
     // 3. Launch a workflow for each search term
     for (const searchTerm of searchTerms) {
-      const search = await this.env.DB.prepare(
-        'INSERT INTO searches (session_id, search_term) VALUES (?, ?)'
-      ).bind(sessionId, searchTerm).run()
-      const searchId = search.meta.last_row_id
+      const search = await db.insert(schema.searches).values({
+        sessionId,
+        searchTerm
+      }).returning({ id: schema.searches.id })
+
+      const searchId = search[0].id
       searchIds.push(searchId)
 
       // Use the binding's .create() method to start the workflow
@@ -57,9 +63,14 @@ export class OrchestratorAgent extends Agent {
       return { status: 'pending', results: [] }
     }
 
-    const { results } = await this.env.DB.prepare(
-      'SELECT * FROM repo_analysis WHERE session_id = ? ORDER BY relevancy_score DESC LIMIT 10'
-    ).bind(sessionId).all()
+    const db = getDb(this.env.DB)
+    const results = await db.select()
+      .from(schema.repoAnalysis)
+      .where(eq(schema.repoAnalysis.sessionId, sessionId))
+      .orderBy(desc(schema.repoAnalysis.relevancyScore))
+      .limit(10)
+      .all()
+
     return { status: 'completed', results }
   }
 

src/db/index.ts

@@ -0,0 +1,21 @@
+/**
+ * @file src/db/index.ts
+ * @description Drizzle ORM database client initialization
+ * @owner AI-Builder
+ */
+
+import { drizzle } from 'drizzle-orm/d1'
+import type { D1Database } from '@cloudflare/workers-types'
+import * as schema from './schema'
+
+/**
+ * Get a Drizzle client instance for the D1 database
+ * @param d1 - The D1Database instance from the Cloudflare Worker environment
+ * @returns A Drizzle client instance with the schema attached
+ */
+export function getDb(d1: D1Database) {
+  return drizzle(d1, { schema })
+}
+
+// Re-export the schema for convenience
+export { schema }

src/db/schema.ts

@@ -0,0 +1,86 @@
+/**
+ * @file src/db/schema.ts
+ * @description Drizzle ORM schema definitions for all D1 tables
+ * @owner AI-Builder
+ */
+
+import { sqliteTable, text, integer, real, index, uniqueIndex } from 'drizzle-orm/sqlite-core'
+
+/**
+ * Request logs table - stores HTTP request logs for monitoring
+ */
+export const requestLogs = sqliteTable('request_logs', {
+  id: integer('id').primaryKey({ autoIncrement: true }),
+  timestamp: text('timestamp').notNull(),
+  level: text('level').notNull(),
+  message: text('message').notNull(),
+  method: text('method').notNull(),
+  path: text('path').notNull(),
+  status: integer('status').notNull(),
+  latencyMs: integer('latency_ms').notNull(),
+  payloadSizeBytes: integer('payload_size_bytes').notNull(),
+  correlationId: text('correlation_id').notNull(),
+  metadata: text('metadata'),
+}, (table) => ({
+  timestampIdx: index('idx_request_logs_timestamp').on(table.timestamp),
+  correlationIdIdx: index('idx_request_logs_correlation_id').on(table.correlationId),
+}))
+
+/**
+ * Sessions table - stores user session information for agent workflows
+ */
+export const sessions = sqliteTable('sessions', {
+  id: integer('id').primaryKey({ autoIncrement: true }),
+  sessionId: text('session_id').unique(),
+  prompt: text('prompt'),
+  createdAt: text('created_at').default('CURRENT_TIMESTAMP'),
+})
+
+/**
+ * Searches table - stores search term information for repository discovery
+ */
+export const searches = sqliteTable('searches', {
+  id: integer('id').primaryKey({ autoIncrement: true }),
+  sessionId: text('session_id').references(() => sessions.sessionId),
+  searchTerm: text('search_term'),
+  status: text('status').default('pending'),
+  createdAt: text('created_at').default('CURRENT_TIMESTAMP'),
+})
+
+/**
+ * Repository analysis table - stores AI analysis results for discovered repositories
+ */
+export const repoAnalysis = sqliteTable('repo_analysis', {
+  id: integer('id').primaryKey({ autoIncrement: true }),
+  sessionId: text('session_id').references(() => sessions.sessionId),
+  searchId: integer('search_id').references(() => searches.id),
+  repoFullName: text('repo_full_name'),
+  repoUrl: text('repo_url'),
+  description: text('description'),
+  relevancyScore: real('relevancy_score'),
+  analyzedAt: text('analyzed_at').default('CURRENT_TIMESTAMP'),
+}, (table) => ({
+  // Unique constraint on session_id and repo_full_name combination
+  sessionRepoUnique: uniqueIndex('repo_analysis_session_id_repo_full_name_unique').on(
+    table.sessionId,
+    table.repoFullName
+  ),
+}))
+
+/**
+ * GitHub management config table - stores GitHub workflow retrofit operations
+ */
+export const ghManagementConfig = sqliteTable('gh_management_config', {
+  id: integer('id').primaryKey({ autoIncrement: true }),
+  timestamp: text('timestamp').notNull().default('CURRENT_TIMESTAMP'),
+  repoName: text('repo_name').notNull(),
+  action: text('action').notNull(),
+  status: text('status').notNull(),
+  statusDetails: text('status_details'),
+  createdAt: text('created_at').default('CURRENT_TIMESTAMP'),
+}, (table) => ({
+  timestampIdx: index('idx_gh_management_config_timestamp').on(table.timestamp),
+  repoNameIdx: index('idx_gh_management_config_repo_name').on(table.repoName),
+  actionIdx: index('idx_gh_management_config_action').on(table.action),
+  statusIdx: index('idx_gh_management_config_status').on(table.status),
+}))

src/flows/index.ts

@@ -5,11 +5,11 @@
  */
 
 import { OpenAPIHono, createRoute, z } from '@hono/zod-openapi'
-import type { D1Database } from '@cloudflare/workers-types'
 import { getOctokit } from '../octokit/core'
 import { Bindings } from '../utils/hono'
 import { DEFAULT_WORKFLOWS, shouldIncludeCloudflareWorkflow } from './workflowTemplates'
 import { encode } from '../utils/base64'
+import { getDb, schema } from '../db'
 
 // --- 1. Zod Schema Definitions ---
 
@@ -166,23 +166,20 @@ const flows = new OpenAPIHono<{ Bindings: Bindings }>()
  * Helper function to log retrofit operation to D1
  */
 async function logRetrofitOperation(
-  db: D1Database,
+  db: ReturnType<typeof getDb>,
   repoName: string,
   action: string,
   status: 'success' | 'skipped' | 'failure',
   statusDetails: Record<string, any>
 ): Promise<void> {
   try {
-    await db.prepare(
-      `INSERT INTO gh_management_config (timestamp, repo_name, action, status, status_details)
-       VALUES (?, ?, ?, ?, ?)`
-    ).bind(
-      new Date().toISOString(),
+    await db.insert(schema.ghManagementConfig).values({
+      timestamp: new Date().toISOString(),
       repoName,
       action,
       status,
-      JSON.stringify(statusDetails)
-    ).run()
+      statusDetails: JSON.stringify(statusDetails)
+    })
   } catch (error) {
     console.error('Failed to log retrofit operation:', error)
   }
@@ -403,10 +400,8 @@ flows.openapi(createNewRepoRoute, async (c) => {
   }
 
   // 4. Log the operation
-  // --- MODIFICATION: Changed c.env.CORE_GITHUB_API to c.env.DB ---
   await logRetrofitOperation(
-    c.env.DB,
-  // --- END MODIFICATION ---
+    getDb(c.env.DB),
     repo.full_name,
     'create_new_repo',
     'success',
@@ -491,6 +486,9 @@ flows.openapi(retrofitWorkflowsRoute, async (c) => {
   let skippedCount = 0
   let failedCount = 0
 
+  // Initialize DB instance once, outside the loop
+  const db = getDb(c.env.DB)
+
   for (const repo of targetRepos) {
     console.log(`[flows/retrofit-workflows] Processing ${repo.full_name}`)
 
@@ -561,10 +559,8 @@ flows.openapi(retrofitWorkflowsRoute, async (c) => {
       }
 
       // Log the operation
-      // --- MODIFICATION: Changed c.env.CORE_GITHUB_API to c.env.DB ---
       await logRetrofitOperation(
-        c.env.DB,
-      // --- END MODIFICATION ---
+        db,
         repo.full_name,
         'retrofit_workflows',
         repoStatus,
@@ -585,12 +581,10 @@ flows.openapi(retrofitWorkflowsRoute, async (c) => {
     } catch (error: any) {
       const errorMessage = error.message || 'Unknown error'
       console.error(`[flows/retrofit-workflows] Error processing ${repo.full_name}:`, errorMessage)
-      
+
       failedCount++
-      // --- MODIFICATION: Changed c.env.CORE_GITHUB_API to c.env.DB ---
       await logRetrofitOperation(
-        c.env.DB,
-      // --- END MODIFICATION ---
+        db,
         repo.full_name,
         'retrofit_workflows',
         'failure',