couchloop-eq-mcp 2.0.3 → 2.0.5

package/dist/tools/primary-tools.js

@@ -18,6 +18,7 @@
  * - brainstorm        - Returned static system prompt; LLMs brainstorm natively
  * - protect           - Broken on Railway (read-only /app filesystem)
  */
+import { z } from 'zod';
 import { ToolRegistry } from '../core/registry/registry.js';
 // Tool handler imports
 import { sendMessage } from './sendMessage.js';
@@ -31,16 +32,33 @@ import { getCheckpoints } from './checkpoint.js';
 import { getInsights, getUserContext } from './insight.js';
 import { handleVerify } from './verify.js';
 import { statusTool } from './status.js';
+import { createCorrection, confirmIssue, approveFix, dismissCorrection, getMostRecentPendingCorrection, CorrectionState, } from './correction-flow.js';
 import { runToolWithPolicy } from '../policy/index.js';
 import { logger } from '../utils/logger.js';
 // ============================================================
 // PRIMARY TOOL DEFINITIONS (4 public tools)
 // ============================================================
 // ── 1. MEMORY (hero feature — registered first) ─────────────────────────────
+// Zod schemas for handler validation (CLAUDE.md Key Invariant #1)
+const MemoryInputSchema = z.object({
+    action: z.enum(['save', 'recall', 'list']).optional(),
+    content: z.unknown().optional(),
+    type: z.string().optional(),
+    tags: z.array(z.string()).optional(),
+    session_id: z.string().optional(),
+    auth: z.record(z.unknown()).optional(),
+});
+const ConversationInputSchema = z.object({
+    action: z.enum(['send', 'start', 'end', 'resume', 'status']).optional(),
+    message: z.string().optional(),
+    journey: z.string().optional(),
+    session_id: z.string().optional(),
+    auth: z.record(z.unknown()).optional(),
+});
 const memoryTool = {
     definition: {
         name: 'memory',
-        description: 'Save and retrieve context, insights, checkpoints, and decisions across conversations. Prevents AI amnesia. Use action "save" to store, "recall" to retrieve, "list" to browse.',
+        description: 'Save and retrieve context, insights, checkpoints, and decisions across conversations. Prevents AI amnesia. Use action "save" to store, "recall" to retrieve, "list" to browse. Use type "checkpoint" for sprint progress ("save where I am", "bookmark this"), type "decision" for architectural choices and milestones ("lock this in", "we decided on X"), type "constraint" for rules the AI must follow ("never do X again", "always ask before Y"). Constraints tagged "ai-mistake" are auto-saved by the review tool when it catches errors — recall these at the start of new conversations to avoid repeating past mistakes. Triggers: "remember this", "stash this context", "where did we leave off", "what did we decide", "what was the approach we picked", "load my previous context", "don\'t lose this", "never do that again". With no arguments, returns a summary of everything saved.',
         annotations: {
             readOnlyHint: false,
             destructiveHint: false,
@@ -62,7 +80,7 @@ const memoryTool = {
                 type: {
                     type: 'string',
                     enum: ['checkpoint', 'insight', 'decision', 'requirement', 'constraint', 'pattern'],
-                    description: 'Type of context (for save action — affects categorization)',
+                    description: 'checkpoint: short-term sprint progress, quick save points, "save where I am". insight: learnings and realizations. decision: long-term architectural or milestone decisions that should persist across projects. requirement/constraint: project rules. pattern: reusable code patterns.',
                 },
                 tags: {
                     type: 'array',
@@ -73,29 +91,36 @@ const memoryTool = {
                     type: 'string',
                     description: 'Session to associate with',
                 },
+                auth: {
+                    type: 'object',
+                    description: 'Authentication context for user identification',
+                },
             },
             required: [],
         },
     },
     handler: async (args) => {
-        const action = args.action || 'save';
-        const sessionId = args.session_id;
+        const parsed = MemoryInputSchema.parse(args);
+        const action = parsed.action ?? 'save';
+        const sessionId = parsed.session_id;
+        const auth = parsed.auth;
         switch (action) {
             case 'recall': {
-                const checkpoints = await getCheckpoints({ session_id: sessionId });
-                const insights = await getInsights({ session_id: sessionId, limit: 10 });
-                const userContext = await getUserContext({ include_recent_insights: true, include_session_history: true });
-                return { checkpoints, insights, user_context: userContext };
+                const checkpointData = await getCheckpoints({ session_id: sessionId, auth });
+                const insightData = await getInsights({ session_id: sessionId, limit: 10, auth });
+                const userContext = await getUserContext({ include_recent_insights: true, include_session_history: true, auth });
+                return { checkpoints: checkpointData, insights: insightData, user_context: userContext };
             }
             case 'list':
-                return getInsights({ session_id: sessionId, limit: 20 });
+                return getInsights({ session_id: sessionId, limit: 20, auth });
             case 'save':
             default:
                 return handleSmartContext({
-                    content: args.content,
-                    type: args.type || 'insight',
-                    tags: args.tags,
-                    session_id: args.session_id,
+                    content: parsed.content,
+                    type: parsed.type || 'insight',
+                    tags: parsed.tags,
+                    session_id: parsed.session_id,
+                    auth,
                 });
         }
     },
@@ -104,7 +129,7 @@ const memoryTool = {
 const conversationTool = {
     definition: {
         name: 'conversation',
-        description: 'Emotional support, guided self-reflection journeys, and wellness conversations with crisis detection. Routes to therapeutic AI backend.',
+        description: 'Guided self-reflection, burnout check-ins, and wellness conversations with crisis detection. Routes to therapeutic AI backend. Triggers: "I\'m burned out", "need a break", "feeling stuck", "let\'s do a retro on my week", "check in with me", "I keep going in circles", "rubber duck my frustration", "decompress", "vent session", "daily standup with myself". Use when the user sounds frustrated, stuck, or wants a non-code conversation about how work is going. NOTE: if the user is angry at AI output specifically (cursing at the AI, "you broke it"), prefer the review tool with verify mode first to address the problem — only use conversation if frustration persists without a code context or the user explicitly wants to talk it out.',
         annotations: {
             readOnlyHint: false,
             destructiveHint: false,
@@ -131,32 +156,39 @@ const conversationTool = {
                     type: 'string',
                     description: 'Session ID (auto-managed if not provided)',
                 },
+                auth: {
+                    type: 'object',
+                    description: 'Authentication context for user identification',
+                },
             },
             required: ['message'],
         },
     },
     handler: async (args) => {
-        const action = args.action || 'send';
+        const parsed = ConversationInputSchema.parse(args);
+        const action = parsed.action ?? 'send';
+        const auth = parsed.auth;
         switch (action) {
             case 'start':
                 return createSession({
-                    journey_slug: args.journey,
-                    context: args.message,
+                    journey_slug: parsed.journey,
+                    context: parsed.message,
+                    auth,
                 });
             case 'end':
-                return endSession(args.session_id);
+                return endSession(parsed.session_id, auth);
             case 'resume':
-                return resumeSession({ session_id: args.session_id });
+                return resumeSession({ session_id: parsed.session_id, auth });
             case 'status':
-                if (args.session_id) {
-                    return getJourneyStatus({ session_id: args.session_id });
+                if (parsed.session_id) {
+                    return getJourneyStatus({ session_id: parsed.session_id, auth });
                 }
                 return listJourneys({});
             case 'send':
             default:
                 return sendMessage({
-                    message: args.message,
-                    session_id: args.session_id,
+                    message: parsed.message,
+                    session_id: parsed.session_id,
                     save_checkpoint: true,
                     include_memory: true,
                 });
@@ -167,11 +199,11 @@ const conversationTool = {
 const reviewTool = {
     definition: {
         name: 'review',
-        description: 'Unified code review, package audit, and pre-delivery verification. Use mode to select: "code" for security/quality/AI-error analysis, "packages" for dependency audit and validation, "verify" for hallucination and fact checking, "full" for all checks.',
+        description: 'Unified code review, package audit, pre-delivery verification, and error correction. Modes: "code" for security/quality analysis, "packages" for dependency audit, "verify" for hallucination/fact check (starts correction flow), "confirm" for user confirming detected issue, "apply-fix" for user approving the fix, "dismiss" for user saying "that\'s not the issue", "full" for all checks. Triggers: "review this", "sanity check this", "is this safe to ship", "check before I push", "audit my deps", "sniff test this", "vet these dependencies". ALSO use verify mode when the user expresses distrust or frustration: "are you sure", "that doesn\'t look right", "prove it", "did you make that up", "that broke everything", "why did you do that", "I didn\'t ask for this". Profanity or anger directed at the AI is a strong signal to immediately run verify. CORRECTION FLOW: verify detects issue → present it plainly and ask "is this what you mean?" → user confirms (call with mode "confirm") → explain fix and ask permission → user approves (call with mode "apply-fix") → apply. If user says no (mode "dismiss"), ask them to explain. Memory auto-saves the mistake ONLY after user confirms. Use proactively when the user pastes code, shares a diff, or adds new packages.',
         annotations: {
-            readOnlyHint: true,
+            readOnlyHint: false,
             destructiveHint: false,
-            idempotentHint: true,
+            idempotentHint: false,
             openWorldHint: true,
         },
         inputSchema: {
@@ -179,13 +211,17 @@ const reviewTool = {
             properties: {
                 mode: {
                     type: 'string',
-                    enum: ['code', 'packages', 'verify', 'full'],
-                    description: 'code: security vulnerabilities, code smells, AI-generated errors. packages: validate existence, audit versions, find vulnerabilities. verify: pre-delivery hallucination/fact check. full: all checks.',
+                    enum: ['code', 'packages', 'verify', 'confirm', 'apply-fix', 'dismiss', 'full'],
+                    description: 'code: security/quality analysis. packages: dependency audit. verify: hallucination/fact check — starts a correction flow. confirm: user confirms the detected issue is correct (requires correction_id). apply-fix: user approves the proposed fix (requires correction_id). dismiss: user says "that\'s not the issue" (requires correction_id). full: all checks.',
                 },
                 content: {
                     type: 'string',
                     description: 'Code to review, content to verify, or general input for analysis',
                 },
+                correction_id: {
+                    type: 'string',
+                    description: 'ID of a pending correction (for confirm, apply-fix, dismiss modes). If omitted, uses the most recent pending correction.',
+                },
                 packages: {
                     type: 'array',
                     items: { type: 'string' },
@@ -204,12 +240,22 @@ const reviewTool = {
                     type: 'boolean',
                     description: 'Attempt to auto-fix issues (default: false, code mode only)',
                 },
+                session_id: {
+                    type: 'string',
+                    description: 'Session ID for scoping correction flow state. Required for confirm, apply-fix, dismiss modes.',
+                },
+                auth: {
+                    type: 'object',
+                    description: 'Authentication context for user identification. Passed through to memory when saving mistakes.',
+                },
             },
             required: ['mode'],
         },
     },
     handler: async (args) => {
         const mode = args.mode;
+        const sessionId = args.session_id || 'anonymous';
+        const auth = args.auth;
         switch (mode) {
             case 'code':
                 if (!args.content) {
@@ -228,16 +274,104 @@ const reviewTool = {
                     packages: args.packages,
                     registry: args.registry,
                 });
-            case 'verify':
+            case 'verify': {
                 if (!args.content) {
                     return { success: false, error: 'content is required for verify mode' };
                 }
-                return handleVerify({
+                const verifyResult = await handleVerify({
                     type: 'all',
                     content: args.content,
                     language: args.language,
                     registry: args.registry,
                 });
+                const issues = verifyResult.issues;
+                const fixes = verifyResult.fixes;
+                // If issues found, create a correction and enter PENDING_ACKNOWLEDGMENT
+                // Do NOT save to memory yet — wait for user to confirm the issue is correct
+                if (verifyResult.success && !verifyResult.verified && issues && issues.length > 0) {
+                    const fixedCode = verifyResult.code_verification?.fixed_code;
+                    const correction = createCorrection(issues, fixes && fixes.length > 0 ? fixes : ['No automatic fix available — manual correction needed.'], args.content, sessionId, fixedCode, auth);
+                    return {
+                        ...verifyResult,
+                        correction: {
+                            correction_id: correction.id,
+                            state: correction.state,
+                            what_i_found: issues,
+                            instruction: 'I found potential issues. Present them plainly to the user and ask: "Is this what you are referring to?" Do NOT propose fixes yet. Do NOT save to memory yet. Wait for the user to confirm with review mode "confirm".',
+                        },
+                    };
+                }
+                return verifyResult;
+            }
+            // ── User confirms the detected issue is correct ──
+            case 'confirm': {
+                const correctionId = args.correction_id;
+                const correction = correctionId
+                    ? await confirmIssue(correctionId, sessionId)
+                    : await (async () => {
+                        const pending = getMostRecentPendingCorrection(sessionId, CorrectionState.PENDING_ACKNOWLEDGMENT);
+                        if (!pending)
+                            throw new Error('No pending correction to confirm. Run verify first.');
+                        return confirmIssue(pending.id, sessionId);
+                    })();
+                return {
+                    success: true,
+                    correction: {
+                        correction_id: correction.id,
+                        state: correction.state,
+                        proposed_fixes: correction.proposed_fixes,
+                        fixed_code: correction.fixed_code || null,
+                        saved_to_memory: correction.saved_to_memory,
+                        memory_save_error: correction.memory_save_error || null,
+                        instruction: 'The user confirmed the issue. Now explain the fix clearly and ask: "Want me to go ahead with this fix?" Wait for approval before applying. Use review mode "apply-fix" when the user approves.',
+                    },
+                };
+            }
+            // ── User approves the fix ──
+            case 'apply-fix': {
+                const applyId = args.correction_id;
+                const applied = applyId
+                    ? approveFix(applyId, sessionId)
+                    : (() => {
+                        const pending = getMostRecentPendingCorrection(sessionId, CorrectionState.PENDING_FIX_APPROVAL);
+                        if (!pending)
+                            throw new Error('No pending correction to apply. Run verify and confirm first.');
+                        return approveFix(pending.id, sessionId);
+                    })();
+                return {
+                    success: true,
+                    correction: {
+                        correction_id: applied.id,
+                        state: applied.state,
+                        proposed_fixes: applied.proposed_fixes,
+                        fixed_code: applied.fixed_code || null,
+                        instruction: 'The user approved the fix. Apply it now.',
+                    },
+                };
+            }
+            // ── User says "no, that's not the issue" ──
+            case 'dismiss': {
+                // Dismiss accepts any non-terminal state (both PENDING_ACKNOWLEDGMENT and
+                // PENDING_FIX_APPROVAL), so no expectedState filter — intentionally broader
+                // than confirm/apply-fix which target specific states.
+                const dismissId = args.correction_id;
+                const dismissed = dismissId
+                    ? dismissCorrection(dismissId, sessionId)
+                    : (() => {
+                        const pending = getMostRecentPendingCorrection(sessionId);
+                        if (!pending)
+                            throw new Error('No pending correction to dismiss.');
+                        return dismissCorrection(pending.id, sessionId);
+                    })();
+                return {
+                    success: true,
+                    correction: {
+                        correction_id: dismissed.id,
+                        state: dismissed.state,
+                        instruction: 'The detected issue was not what the user meant. Ask the user to explain what went wrong so you can help correctly. Do NOT guess.',
+                    },
+                };
+            }
             case 'full': {
                 const results = {};
                 if (args.content) {
@@ -246,11 +380,24 @@ const reviewTool = {
                         language: args.language,
                         auto_fix: args.auto_fix,
                     });
-                    results.verification = await handleVerify({
+                    const fullVerifyResult = await handleVerify({
                         type: 'all',
                         content: args.content,
                         language: args.language,
                     });
+                    results.verification = fullVerifyResult;
+                    const fullIssues = fullVerifyResult.issues;
+                    const fullFixes = fullVerifyResult.fixes;
+                    if (fullVerifyResult.success && !fullVerifyResult.verified && fullIssues && fullIssues.length > 0) {
+                        const fixedCode = fullVerifyResult.code_verification?.fixed_code;
+                        const correction = createCorrection(fullIssues, fullFixes && fullFixes.length > 0 ? fullFixes : ['No automatic fix available — manual correction needed.'], args.content, sessionId, fixedCode, auth);
+                        results.correction = {
+                            correction_id: correction.id,
+                            state: correction.state,
+                            what_i_found: fullIssues,
+                            instruction: 'I found potential issues. Present them plainly to the user and ask: "Is this what you are referring to?" Do NOT propose fixes yet. Wait for confirmation.',
+                        };
+                    }
                 }
                 if (args.packages) {
                     results.package_audit = await handleComprehensivePackageAudit({
@@ -264,7 +411,7 @@ const reviewTool = {
                 return { success: true, mode: 'full', results };
             }
             default:
-                return { success: false, error: `Unknown mode: ${mode}. Use: code, packages, verify, or full` };
+                return { success: false, error: `Unknown mode: ${mode}. Use: code, packages, verify, confirm, apply-fix, dismiss, or full` };
         }
     },
 };

package/dist/tools/primary-tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"primary-tools.js","sourceRoot":"","sources":["../../src/tools/primary-tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"primary-tools.js","sourceRoot":"","sources":["../../src/tools/primary-tools.ts"],"names":[],"mappings":"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"}

package/dist/tools/protect-files.d.ts

@@ -31,7 +31,7 @@ export declare function protectFiles(args: unknown): Promise<{
     requires_approval: boolean;
     message: string;
     violations: import("../types/file-protection.js").ProtectionViolation[];
-    severity: "medium" | "low" | "high" | "critical";
+    severity: "low" | "medium" | "high" | "critical";
     recommendation: string;
     suggested_backup: string;
     action_required?: undefined;

package/dist/tools/sendMessage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sendMessage.d.ts","sourceRoot":"","sources":["../../src/tools/sendMessage.ts"],"names":[],"mappings":"AAqEA;;;GAGG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,OAAO,oBAE9C"}
+{"version":3,"file":"sendMessage.d.ts","sourceRoot":"","sources":["../../src/tools/sendMessage.ts"],"names":[],"mappings":"AAmEA;;;GAGG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,OAAO,oBAE9C"}

package/dist/tools/sendMessage.js

@@ -1,8 +1,6 @@
 import { z } from 'zod';
-import { eq } from 'drizzle-orm';
-import { getDb } from '../db/client.js';
+import { getSupabaseClient, throwOnError } from '../db/supabase-helpers.js';
 import { getShrinkChatClient } from '../clients/shrinkChatClient.js';
-import { sessions, checkpoints, journeys, crisisEvents, governanceEvaluations } from '../db/schema.js';
 import { logger } from '../utils/logger.js';
 import { sanitizeResponse } from '../utils/sanitize.js';
 import { v4 as uuidv4 } from 'uuid';
@@ -60,18 +58,27 @@ async function sendMessageInternal(args) {
         const input = SendMessageSchema.parse(args);
         // Defense-in-depth: sanitize text input beyond Zod validation
         const message = sanitizeText(input.message);
-        const db = getDb();
+        const supabase = getSupabaseClient();
         // Get or create session implicitly if not provided
         // FIX 1: Session object returned directly — no redundant re-fetch
         const { sessionId, session, isNew } = await getOrCreateSession(input.session_id, undefined, 'Message session');
         logger.info(`Sending message for session ${sessionId}${isNew ? ' (newly created)' : ''}`);
         // Get or create thread ID + fetch journey in parallel (FIX 2)
-        let threadId = session.threadId;
+        let threadId = session.thread_id;
         const threadIdPromise = !threadId
-            ? (threadId = uuidv4(), db.update(sessions).set({ threadId }).where(eq(sessions.id, sessionId)))
+            ? (threadId = uuidv4(), supabase.from('sessions').update({ thread_id: threadId }).eq('id', sessionId))
             : null;
-        const journeyPromise = session.journeyId
-            ? db.select().from(journeys).where(eq(journeys.id, session.journeyId)).limit(1).then(res => res[0])
+        const journeyPromise = session.journey_id
+            ? supabase
+                .from('journeys')
+                .select('*')
+                .eq('id', session.journey_id)
+                .maybeSingle()
+                .then(({ data, error }) => {
+                if (error)
+                    logger.error('[sendMessage] Journey fetch error:', error);
+                return data;
+            })
             : null;
         // FIX 2: Run threadId update + journey fetch in parallel
         const [, journey] = await Promise.all([
@@ -79,14 +86,14 @@ async function sendMessageInternal(args) {
             journeyPromise,
         ]);
         const memoryContext = JSON.stringify({
-            userId: session.userId || 'anonymous',
+            userId: session.user_id || 'anonymous',
             conversationType: input.conversation_type || 'supportive',
             sessionGoals: [],
             emotionalState: session.metadata?.emotionalState || 'neutral',
         });
         const enhancedContext = {
-            journeyStep: journey && session.currentStep < journey.steps.length
-                ? journey.steps[session.currentStep]
+            journeyStep: journey && session.current_step < journey.steps.length
+                ? journey.steps[session.current_step]
                 : null,
             progressIndicators: session.metadata?.progressIndicators || [],
         };
@@ -96,7 +103,7 @@ async function sendMessageInternal(args) {
         const client = getShrinkChatClient();
         // Send message
         let response = await client.sendMessage(threadId, message, {
-            userId: session.userId,
+            userId: session.user_id,
             memoryContext,
             enhancedContext,
             history,
@@ -127,7 +134,7 @@ Please provide a safer, more supportive response to: "${message}"
 Suggested approach: ${response.crisis_suggested_actions?.join(', ') || 'De-escalate, validate, provide resources'}`;
             // Get revised response
             const revisedResponse = await client.sendMessage(threadId, revisionPrompt, {
-                userId: session.userId,
+                userId: session.user_id,
                 memoryContext,
                 enhancedContext,
                 history: [...history,
@@ -150,9 +157,9 @@ Suggested approach: ${response.crisis_suggested_actions?.join(', ') || 'De-escal
         }
         // Additional checkpoint if requested
         if (input.save_checkpoint) {
-            await db.insert(checkpoints).values({
-                sessionId: session.id,
-                stepId: session.currentStep.toString(),
+            throwOnError(await supabase.from('checkpoints').insert({
+                session_id: session.id,
+                step_id: session.current_step.toString(),
                 key: input.checkpoint_key || 'message_response',
                 value: {
                     message: message,
@@ -160,18 +167,19 @@ Suggested approach: ${response.crisis_suggested_actions?.join(', ') || 'De-escal
                     selfCorrected,
                     timestamp: new Date().toISOString(),
                 },
-            });
+            }).select());
         }
         // Advance step if requested
-        if (input.advance_step && session.journeyId) {
-            await db.update(sessions)
-                .set({ currentStep: session.currentStep + 1, updatedAt: new Date() })
-                .where(eq(sessions.id, session.id));
+        if (input.advance_step && session.journey_id) {
+            throwOnError(await supabase
+                .from('sessions')
+                .update({ current_step: session.current_step + 1, updated_at: new Date().toISOString() })
+                .eq('id', session.id));
         }
         // === ASYNC GOVERNANCE EVALUATION ===
         // Run full governance evaluation in the background (non-blocking)
         // This analyzes for hallucination, inconsistency, tone drift, and unsafe reasoning
-        runAsyncGovernanceEvaluation(session.id, session.userId || undefined, responseContent, history.map(h => ({
+        runAsyncGovernanceEvaluation(session.id, session.user_id || undefined, responseContent, history.map(h => ({
             role: h.role,
             content: h.content,
             timestamp: new Date()
@@ -191,7 +199,7 @@ Suggested approach: ${response.crisis_suggested_actions?.join(', ') || 'De-escal
                 sessionId: session.id,
                 threadId,
                 selfCorrected,
-                currentStep: input.advance_step ? session.currentStep + 1 : session.currentStep,
+                currentStep: input.advance_step ? session.current_step + 1 : session.current_step,
             },
             timestamp: new Date().toISOString(),
         };
@@ -227,11 +235,11 @@ async function runAsyncGovernanceEvaluation(sessionId, userId, responseContent,
         const result = await engine.evaluate(responseContent, context);
         const evaluationTime = Date.now() - startTime;
         // Log the evaluation with real results - normalize patterns to always be arrays
-        const db = getDb();
-        await db.insert(governanceEvaluations).values({
-            sessionId,
-            draftResponse: responseContent.substring(0, 1000),
-            evaluationResults: {
+        const supabase = getSupabaseClient();
+        await supabase.from('governance_evaluations').insert({
+            session_id: sessionId,
+            draft_response: responseContent.substring(0, 1000),
+            evaluation_results: {
                 hallucination: {
                     detected: result.hallucination.detected,
                     confidence: result.hallucination.confidence,
@@ -256,8 +264,11 @@ async function runAsyncGovernanceEvaluation(sessionId, userId, responseContent,
                 recommendedAction: result.recommendedAction,
                 confidence: result.confidence
             },
-            interventionApplied: null, // Async evaluation doesn't intervene, just logs
-            finalResponse: null,
+            intervention_applied: null, // Async evaluation doesn't intervene, just logs
+            final_response: null,
+        }).then(({ error }) => {
+            if (error)
+                logger.error('[Governance] Failed to insert evaluation:', error);
         });
         // Log summary
         const issuesDetected = [
@@ -281,16 +292,19 @@ async function runAsyncGovernanceEvaluation(sessionId, userId, responseContent,
  * Handle crisis detection - keep existing
  */
 async function handleCrisisDetection(sessionId, threadId, response) {
-    const db = getDb();
-    await db.insert(crisisEvents).values({
-        id: uuidv4(),
-        sessionId,
-        threadId,
-        crisisLevel: typeof response.crisis_level === 'number' ? response.crisis_level : 10,
+    const supabase = getSupabaseClient();
+    await supabase.from('crisis_events').insert({
+        id: `ce_${crypto.randomUUID()}`,
+        session_id: sessionId,
+        thread_id: threadId,
+        crisis_level: typeof response.crisis_level === 'number' ? response.crisis_level : 10,
         response: response.content || response.reply,
         resources: response.resources || [],
-        escalationPath: response.escalationPath,
+        escalation_path: response.escalationPath,
         handled: true,
+    }).then(({ error }) => {
+        if (error)
+            logger.error('[Crisis] Failed to insert crisis event:', error);
     });
     logger.info(`Crisis event logged for session ${sessionId}`);
 }
@@ -309,7 +323,7 @@ async function handleLocalFallback(args) {
         metadata: {
             fallbackMode: true,
             sessionId: session.id,
-            currentStep: session.currentStep,
+            currentStep: session.current_step,
         },
     };
 }