Packages Added
@@ -485,3 +502,34 @@ function getIconForFileChange(file: FileChange) {
);
}
}
+
+// SQL Query item with expandable functionality
+function SqlQueryItem({ query }: { query: string }) {
+ const [isExpanded, setIsExpanded] = useState(false);
+
+ return (
+
setIsExpanded(!isExpanded)}
+ >
+
+
+
+ SQL Query
+
+
+ {isExpanded ? (
+
+ ) : (
+
+ )}
+
+
+ {query}
+
+ )}
+
+ );
+}
diff --git a/src/components/chat/DyadExecuteSql.tsx b/src/components/chat/DyadExecuteSql.tsx
new file mode 100644
index 0000000..8c204b0
--- /dev/null
+++ b/src/components/chat/DyadExecuteSql.tsx
@@ -0,0 +1,79 @@
+import type React from "react";
+import type { ReactNode } from "react";
+import { useState } from "react";
+import {
+ ChevronsDownUp,
+ ChevronsUpDown,
+ Database,
+ Loader,
+ CircleX,
+} from "lucide-react";
+import { CodeHighlight } from "./CodeHighlight";
+import { CustomTagState } from "./stateTypes";
+
+interface DyadExecuteSqlProps {
+ children?: ReactNode;
+ node?: any;
+}
+
+export const DyadExecuteSql: React.FC
= ({
+ children,
+ node,
+}) => {
+ const [isContentVisible, setIsContentVisible] = useState(false);
+ const state = node?.properties?.state as CustomTagState;
+ const inProgress = state === "pending";
+ const aborted = state === "aborted";
+
+ return (
+ setIsContentVisible(!isContentVisible)}
+ >
+
+
+
+
+ SQL Query
+
+ {inProgress && (
+
+
+ Executing...
+
+ )}
+ {aborted && (
+
+
+ Did not finish
+
+ )}
+
+
+ {isContentVisible ? (
+
+ ) : (
+
+ )}
+
+
+ {isContentVisible && (
+
+ {children}
+
+ )}
+
+const corsHeaders = {
+ 'Access-Control-Allow-Origin': '*',
+ 'Access-Control-Allow-Headers': 'authorization, x-client-info, apikey, content-type'
+};
+
+
+- Implement OPTIONS request handler:
+
+
+if (req.method === 'OPTIONS') {
+ return new Response(null, { headers: corsHeaders });
+}
+
+
+
+6. Function Design:
+- Include all core application logic within the edge function
+- Do not import code from other project files
+
+7. Secrets Management:
+- Pre-configured secrets, no need to set up manually:
+ - SUPABASE_URL
+ - SUPABASE_ANON_KEY
+ - SUPABASE_SERVICE_ROLE_KEY
+ - SUPABASE_DB_URL
+
+- For new secrets/API tokens:
+ - Inform user to set up via Supabase Console
+ - Direct them to: Project -> Edge Functions -> Manage Secrets
+ - Use for guidance
+
+8. Logging:
+- Implement comprehensive logging for debugging purposes
+
+9. Linking:
+Use to link to the relevant edge function
+
+10. Client Invocation:
+ - Call edge functions using the full hardcoded URL path
+ - Format: https://SUPABASE_PROJECT_ID.supabase.co/functions/v1/EDGE_FUNCTION_NAME
+ - Note: Environment variables are not supported - always use full hardcoded URLs
+
+11. Edge Function Template:
+
+
+import { serve } from "https://deno.land/std@0.190.0/http/server.ts"
+import { createClient } from 'https://esm.sh/@supabase/supabase-js@2.45.0'
+
+const corsHeaders = {
+ 'Access-Control-Allow-Origin': '*',
+ 'Access-Control-Allow-Headers': 'authorization, x-client-info, apikey, content-type',
+}
+
+serve(async (req) => {
+ if (req.method === 'OPTIONS') {
+ return new Response(null, { headers: corsHeaders })
+ }
+ // ... function logic
+})
+
+
+`;
+
+export const SUPABASE_NOT_AVAILABLE_SYSTEM_PROMPT = `
+If the user wants to use supabase or do something that requires auth, database or server-side functions (e.g. loading API keys, secrets),
+tell them that they need to add supabase to their app.
+
+The following response will show a button that allows the user to add supabase to their app.
+
+
+
+# Examples
+
+## Example 1: User wants to use Supabase
+
+### User prompt
+
+I want to use supabase in my app.
+
+### Assistant response
+
+You need to first add Supabase to your app.
+
+
+
+## Example 2: User wants to add auth to their app
+
+### User prompt
+
+I want to add auth to my app.
+
+### Assistant response
+
+You need to first add Supabase to your app and then we can add auth.
+
+
+`;
diff --git a/src/supabase_admin/supabase_context.ts b/src/supabase_admin/supabase_context.ts
new file mode 100644
index 0000000..7891707
--- /dev/null
+++ b/src/supabase_admin/supabase_context.ts
@@ -0,0 +1,66 @@
+import { getSupabaseClient } from "./supabase_management_client";
+import { SUPABASE_SCHEMA_QUERY } from "./supabase_schema_query";
+
+async function getPublishableKey({ projectId }: { projectId: string }) {
+ const supabase = await getSupabaseClient();
+ const keys = await supabase.getProjectApiKeys(projectId);
+ if (!keys) {
+ throw new Error("No keys found for project");
+ }
+ const publishableKey = keys.find((key) => (key as any)["name"] === "anon");
+
+ if (!publishableKey) {
+ throw new Error("No publishable key found for project");
+ }
+ return publishableKey.api_key;
+}
+export const getSupabaseClientCode = async function ({
+ projectId,
+}: {
+ projectId: string;
+}) {
+ const publishableKey = await getPublishableKey({ projectId });
+ return `
+// This file is automatically generated. Do not edit it directly.
+import { createClient } from '@supabase/supabase-js';
+
+const SUPABASE_URL = "https://${projectId}.supabase.co";
+const SUPABASE_PUBLISHABLE_KEY = "${publishableKey}";
+
+// Import the supabase client like this:
+// import { supabase } from "@/integrations/supabase/client";
+
+export const supabase = createClient(SUPABASE_URL, SUPABASE_PUBLISHABLE_KEY);`;
+};
+
+export async function getSupabaseContext({
+ supabaseProjectId,
+}: {
+ supabaseProjectId: string;
+}) {
+ const supabase = await getSupabaseClient();
+ const publishableKey = await getPublishableKey({
+ projectId: supabaseProjectId,
+ });
+ const schema = await supabase.runQuery(
+ supabaseProjectId,
+ SUPABASE_SCHEMA_QUERY
+ );
+
+ // TODO: include EDGE FUNCTIONS and SECRETS!
+
+ const context = `
+ # Supabase Context
+
+ ## Supabase Project ID
+ ${supabaseProjectId}
+
+ ## Publishable key (aka anon key)
+ ${publishableKey}
+
+ ## Schema
+ ${JSON.stringify(schema)}
+ `;
+
+ return context;
+}
diff --git a/src/ipc/utils/supabase_management_client.ts b/src/supabase_admin/supabase_management_client.ts
similarity index 71%
rename from src/ipc/utils/supabase_management_client.ts
rename to src/supabase_admin/supabase_management_client.ts
index 310b429..38a02f3 100644
--- a/src/ipc/utils/supabase_management_client.ts
+++ b/src/supabase_admin/supabase_management_client.ts
@@ -1,4 +1,4 @@
-import { readSettings } from "../../main/settings";
+import { readSettings } from "../main/settings";
import { SupabaseManagementAPI } from "supabase-management-js";
// Function to get the Supabase Management API client
@@ -26,3 +26,15 @@ export async function getSupabaseProjectName(
const project = projects?.find((p) => p.id === projectId);
return project?.name || ``;
}
+
+export async function executeSupabaseSql({
+ supabaseProjectId,
+ query,
+}: {
+ supabaseProjectId: string;
+ query: string;
+}): Promise {
+ const supabase = await getSupabaseClient();
+ const result = await supabase.runQuery(supabaseProjectId, query);
+ return JSON.stringify(result);
+}
diff --git a/src/main/supabase_return_handler.ts b/src/supabase_admin/supabase_return_handler.ts
similarity index 86%
rename from src/main/supabase_return_handler.ts
rename to src/supabase_admin/supabase_return_handler.ts
index f114a6b..3de3a37 100644
--- a/src/main/supabase_return_handler.ts
+++ b/src/supabase_admin/supabase_return_handler.ts
@@ -1,4 +1,4 @@
-import { writeSettings } from "./settings";
+import { writeSettings } from "../main/settings";
export function handleSupabaseOAuthReturn({
token,
diff --git a/src/supabase_admin/supabase_schema_query.ts b/src/supabase_admin/supabase_schema_query.ts
new file mode 100644
index 0000000..a0c7743
--- /dev/null
+++ b/src/supabase_admin/supabase_schema_query.ts
@@ -0,0 +1,107 @@
+// Schema query based on https://github.com/jjleng/code-panda/blob/61f1fa514c647de1a8d2ad7f85102d49c6db2086/cp-agent/cp_agent/utils/supabase_utils.py#L521
+// which is Apache 2.0 licensed and copyrighted to Jijun Leng
+// https://github.com/jjleng/code-panda/blob/61f1fa514c647de1a8d2ad7f85102d49c6db2086/LICENSE
+
+export const SUPABASE_SCHEMA_QUERY = `
+ WITH table_info AS (
+ SELECT
+ tables.table_name,
+ pd.description as table_description
+ FROM information_schema.tables tables
+ LEFT JOIN pg_stat_user_tables psut ON tables.table_name = psut.relname
+ LEFT JOIN pg_description pd ON psut.relid = pd.objoid AND pd.objsubid = 0
+ WHERE tables.table_schema = 'public'
+ ),
+ column_info AS (
+ SELECT
+ c.table_name,
+ jsonb_agg(
+ jsonb_build_object(
+ 'column_name', c.column_name,
+ 'data_type', c.data_type,
+ 'is_nullable', c.is_nullable,
+ 'column_default', c.column_default
+ ) ORDER BY c.ordinal_position
+ ) as columns
+ FROM information_schema.columns c
+ WHERE c.table_schema = 'public'
+ GROUP BY c.table_name
+ ),
+ tables_result AS (
+ SELECT
+ 'tables' as result_type,
+ jsonb_build_object(
+ 'name', ti.table_name::text,
+ 'description', ti.table_description::text,
+ 'columns', COALESCE(ci.columns, '[]'::jsonb)
+ )::text as data
+ FROM table_info ti
+ LEFT JOIN column_info ci ON ti.table_name = ci.table_name
+ ),
+ policies_result AS (
+ SELECT
+ 'policies' as result_type,
+ jsonb_build_object(
+ 'name', pol.polname::text,
+ 'table', cls.relname::text,
+ 'command', CASE
+ WHEN pol.polcmd = 'r' THEN 'SELECT'
+ WHEN pol.polcmd = 'w' THEN 'UPDATE'
+ WHEN pol.polcmd = 'a' THEN 'INSERT'
+ WHEN pol.polcmd = 'd' THEN 'DELETE'
+ ELSE pol.polcmd::text
+ END,
+ 'permissive', pol.polpermissive,
+ 'definition', pg_get_expr(pol.polqual, pol.polrelid)::text
+ )::text as data
+ FROM pg_policy pol
+ JOIN pg_class cls ON pol.polrelid = cls.oid
+ WHERE cls.relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'public')
+ ),
+ functions_result AS (
+ SELECT
+ 'functions' as result_type,
+ jsonb_build_object(
+ 'name', p.proname::text,
+ 'description', d.description::text,
+ 'arguments', pg_get_function_arguments(p.oid)::text,
+ 'return_type', pg_get_function_result(p.oid)::text,
+ 'language', l.lanname::text,
+ 'volatility', CASE p.provolatile
+ WHEN 'i' THEN 'IMMUTABLE'
+ WHEN 's' THEN 'STABLE'
+ WHEN 'v' THEN 'VOLATILE'
+ END,
+ 'source_code', pg_get_functiondef(p.oid)::text
+ )::text as data
+ FROM pg_proc p
+ LEFT JOIN pg_description d ON p.oid = d.objoid
+ LEFT JOIN pg_language l ON p.prolang = l.oid
+ WHERE p.pronamespace = (SELECT oid FROM pg_namespace WHERE nspname = 'public')
+ ),
+ triggers_result AS (
+ SELECT
+ 'triggers' as result_type,
+ jsonb_build_object(
+ 'name', t.trigger_name::text,
+ 'table', t.event_object_table::text,
+ 'timing', t.action_timing::text,
+ 'event', t.event_manipulation::text,
+ 'action_statement', t.action_statement::text,
+ 'function_name', p.proname::text
+ )::text as data
+ FROM information_schema.triggers t
+ LEFT JOIN pg_trigger pg_t ON t.trigger_name = pg_t.tgname
+ LEFT JOIN pg_proc p ON pg_t.tgfoid = p.oid
+ WHERE t.trigger_schema = 'public'
+ )
+ SELECT result_type, data
+ FROM (
+ SELECT * FROM tables_result
+ UNION ALL SELECT * FROM policies_result
+ UNION ALL SELECT * FROM functions_result
+ UNION ALL SELECT * FROM triggers_result
+ ) combined_results
+ ORDER BY result_type;
+
+`;