ofiere-openclaw-plugin 4.54.2 → 4.55.0

package/src/staffPersona.ts

@@ -1,289 +1,299 @@
-import type { SupabaseClient } from "@supabase/supabase-js";
-
-export interface SubagentRow {
-  id: string;
-  chief_agent_id: string;
-  name: string;
-  role: string | null;
-  codename: string | null;
-  system_prompt: string | null;
-  mission: string | null;
-  responsibilities: string | null;
-  instructions: string | null;
-  primary_model: string | null;
-  coding_model: string | null;
-  tool_call_model: string | null;
-  function_call_model: string | null;
-  vision_model: string | null;
-  mcp_server_ids: string[] | null;
-  attached_sop_ids: string[] | null;
-  attached_framework_ids: string[] | null;
-}
-
-export async function loadSubagentRow(
-  supabase: SupabaseClient,
-  userId: string,
-  subagentId: string,
-): Promise<SubagentRow | null> {
-  const { data, error } = await supabase
-    .from("agent_subagents")
-    .select(
-      "id, chief_agent_id, name, role, codename, system_prompt, mission, responsibilities, instructions, primary_model, coding_model, tool_call_model, function_call_model, vision_model, mcp_server_ids, attached_sop_ids, attached_framework_ids",
-    )
-    .eq("user_id", userId)
-    .eq("id", subagentId)
-    .maybeSingle();
-  if (error || !data) return null;
-  return data as SubagentRow;
-}
-
-// Cycle 7b — pluck subagent_id from dispatch metadata only. Plain user chats
-// must NOT trigger the staff persona swap or report emission, so we deliberately
-// do not consult ctx.subagentId / ctx.subagent_id at the top level.
-export function readDispatchSubagentId(ctx: any, event?: any): string | null {
-  const candidates: Array<unknown> = [
-    ctx?.metadata?.subagent_id,
-    ctx?.metadata?.dispatch?.subagent_id,
-    ctx?.params?.metadata?.subagent_id,
-    ctx?.payload?.metadata?.subagent_id,
-    ctx?.request?.metadata?.subagent_id,
-    ctx?.options?.metadata?.subagent_id,
-    ctx?.attachments?.subagent_id,
-    ctx?.dispatch?.subagent_id,
-    event?.metadata?.subagent_id,
-    event?.context?.metadata?.subagent_id,
-  ];
-  for (const c of candidates) {
-    if (typeof c === "string" && c.length) return c;
-  }
-  return null;
-}
-
-// Cycle 7b BUGSHOOT-1 (BUG 2) — DB-backed dispatch context fallback.
-// OpenClaw gateway core rejects unknown root key `metadata` on chat.send, so
-// the task-dispatcher edge function can't ride dispatch metadata through the
-// wire. The dispatcher writes a row to public.dispatch_context keyed by
-// (user_id, session_key) before chat.send fires; this loader reads it back
-// during before_prompt_build when the metadata path comes up empty.
-//
-// Returns the dispatch context for the most recent matching row, or null if
-// none exists. The metadata path is preferred so a future gateway upgrade
-// that natively accepts metadata keeps working with no flag day.
-export interface DispatchContextRow {
-  subagent_id: string | null;
-  attached_sop_ids: string[];
-  attached_framework_ids: string[];
-  task_id: string | null;
-  conversation_id: string | null;
-}
-
-export async function loadDispatchContextBySession(
-  supabase: SupabaseClient,
-  userId: string,
-  sessionKey: string,
-): Promise<DispatchContextRow | null> {
-  if (!sessionKey) return null;
-  const { data, error } = await supabase
-    .from("dispatch_context")
-    .select("subagent_id, attached_sop_ids, attached_framework_ids, task_id, conversation_id")
-    .eq("user_id", userId)
-    .eq("session_key", sessionKey)
-    .order("created_at", { ascending: false })
-    .limit(1)
-    .maybeSingle();
-  if (error || !data) return null;
-  return {
-    subagent_id: (data.subagent_id as string | null) ?? null,
-    attached_sop_ids: Array.isArray(data.attached_sop_ids)
-      ? (data.attached_sop_ids as unknown[]).filter((x): x is string => typeof x === "string")
-      : [],
-    attached_framework_ids: Array.isArray(data.attached_framework_ids)
-      ? (data.attached_framework_ids as unknown[]).filter((x): x is string => typeof x === "string")
-      : [],
-    task_id: (data.task_id as string | null) ?? null,
-    conversation_id: (data.conversation_id as string | null) ?? null,
-  };
-}
-
-export type StaffModelSlot =
-  | "primary_model"
-  | "coding_model"
-  | "tool_call_model"
-  | "function_call_model"
-  | "vision_model";
-
-export interface ChiefStaffDefaultsRow {
-  chief_agent_id: string;
-  primary_model: string | null;
-  coding_model: string | null;
-  tool_call_model: string | null;
-  function_call_model: string | null;
-  vision_model: string | null;
-}
-
-export interface ResolvedStaffModels {
-  primary_model: string | null;
-  coding_model: string | null;
-  tool_call_model: string | null;
-  function_call_model: string | null;
-  vision_model: string | null;
-  source: Record<StaffModelSlot, "staff" | "chief_default" | "chief_primary" | "chief_fallback" | null>;
-}
-
-const SLOTS: StaffModelSlot[] = [
-  "primary_model",
-  "coding_model",
-  "tool_call_model",
-  "function_call_model",
-  "vision_model",
-];
-
-// Cycle 7b BUGSHOOT-3 — chief's own ofie_agent_config row, used as the third
-// fallback tier when neither the staff slot nor the chief STAFF MODEL slot is
-// set. Mirrors the dispatcher's loadStaffPrimaryModel chain.
-export interface ChiefAgentConfigRow {
-  agent_id: string;
-  primary_model: string | null;
-  coding_model: string | null;
-  tool_call_model: string | null;
-  vision_model: string | null;
-}
-
-export async function loadChiefStaffDefaults(
-  supabase: SupabaseClient,
-  userId: string,
-  chiefAgentId: string,
-): Promise<ChiefStaffDefaultsRow | null> {
-  const { data, error } = await supabase
-    .from("chief_staff_defaults")
-    .select(
-      "chief_agent_id, primary_model, coding_model, tool_call_model, function_call_model, vision_model",
-    )
-    .eq("user_id", userId)
-    .eq("chief_agent_id", chiefAgentId)
-    .maybeSingle();
-  if (error || !data) return null;
-  return data as ChiefStaffDefaultsRow;
-}
-
-export async function loadChiefAgentConfig(
-  supabase: SupabaseClient,
-  userId: string,
-  chiefAgentId: string,
-): Promise<ChiefAgentConfigRow | null> {
-  const { data, error } = await supabase
-    .from("ofie_agent_config")
-    .select("agent_id, primary_model, coding_model, tool_call_model, vision_model")
-    .eq("user_id", userId)
-    .eq("agent_id", chiefAgentId)
-    .maybeSingle();
-  if (error || !data) return null;
-  return data as ChiefAgentConfigRow;
-}
-
-/**
- * Resolution chain at delegate_to_staff time (BUGSHOOT-3):
- *   1. staff.<slot>                       (per-staff override)
- *   2. chief_staff_defaults.<slot>        (chief-level STAFF MODEL)
- *   3. ofie_agent_config.<slot>           (chief's OWN slot, NEW)
- *   4. ofie_agent_config.primary_model    (chief's primary, last-resort sub)
- *   5. null                               (gateway picks gateway default)
- *
- * Tier 3 was added in BUGSHOOT-3 because the prior chain stopped at tier 2 and
- * relied on an implicit "gateway default" — which is opaque and led to BUG 10
- * when the staff override held a model id the gateway rejected. With tier 3,
- * an empty staff slot deterministically inherits the chief's actual model.
- *
- * Tier 4 (slot → primary_model fallback) handles the common case where chief
- * has only a primary_model set and no per-slot routing — a staff with
- * coding_model blank still inherits chief's primary_model rather than null.
- */
-export function resolveStaffModels(
-  staff: SubagentRow,
-  chiefDefaults: ChiefStaffDefaultsRow | null,
-  chiefConfig?: ChiefAgentConfigRow | null,
-): ResolvedStaffModels {
-  const out: ResolvedStaffModels = {
-    primary_model: null,
-    coding_model: null,
-    tool_call_model: null,
-    function_call_model: null,
-    vision_model: null,
-    source: {
-      primary_model: null,
-      coding_model: null,
-      tool_call_model: null,
-      function_call_model: null,
-      vision_model: null,
-    },
-  };
-  const chiefPrimary = typeof chiefConfig?.primary_model === "string" && chiefConfig.primary_model.trim()
-    ? chiefConfig.primary_model.trim()
-    : null;
-  for (const slot of SLOTS) {
-    const staffVal = (staff as any)[slot] as string | null | undefined;
-    const chiefVal = chiefDefaults ? (chiefDefaults as any)[slot] as string | null | undefined : null;
-    const chiefSlotVal = chiefConfig ? (chiefConfig as any)[slot] as string | null | undefined : null;
-    if (staffVal && staffVal.trim()) {
-      out[slot] = staffVal;
-      out.source[slot] = "staff";
-    } else if (chiefVal && chiefVal.trim()) {
-      out[slot] = chiefVal;
-      out.source[slot] = "chief_default";
-    } else if (chiefSlotVal && chiefSlotVal.trim()) {
-      out[slot] = chiefSlotVal;
-      out.source[slot] = "chief_primary";
-    } else if (chiefPrimary) {
-      // Sub-fallback: chief has a primary_model but no per-slot override.
-      out[slot] = chiefPrimary;
-      out.source[slot] = "chief_primary";
-    } else {
-      out[slot] = null;
-      out.source[slot] = "chief_fallback";
-    }
-  }
-  return out;
-}
-
-export function buildStaffPersonaBlock(
-  staff: SubagentRow,
-  resolved?: ResolvedStaffModels,
-): string {
-  const lines: string[] = [];
-  lines.push(`# STAFF IDENTITY`);
-  lines.push(
-    `You are **${staff.name}**${staff.role ? ` (${staff.role})` : ""}, a staff member reporting to chief \`${staff.chief_agent_id}\`.`,
-  );
-  lines.push(
-    `You are NOT the chief. Execute the assigned task, then return a structured report. Do not adopt the chief's persona.`,
-  );
-  if (staff.system_prompt?.trim()) {
-    lines.push(``, `## Persona`, staff.system_prompt.trim());
-  }
-  if (staff.mission?.trim()) {
-    lines.push(``, `## Mission`, staff.mission.trim());
-  }
-  if (staff.responsibilities?.trim()) {
-    lines.push(``, `## Responsibilities`, staff.responsibilities.trim());
-  }
-  if (staff.instructions?.trim()) {
-    lines.push(``, `## Operating Instructions`, staff.instructions.trim());
-  }
-  if (resolved && (resolved.primary_model || resolved.coding_model || resolved.tool_call_model || resolved.function_call_model || resolved.vision_model)) {
-    const sourceLabel = (s: "staff" | "chief_default" | "chief_primary" | "chief_fallback" | null) =>
-      s === "staff" ? "per-staff override"
-      : s === "chief_default" ? "chief STAFF MODEL"
-      : s === "chief_primary" ? "chief's own model"
-      : "inherits chief (gateway default)";
-    const rows: string[] = [];
-    if (resolved.primary_model) rows.push(`- primary: \`${resolved.primary_model}\` (${sourceLabel(resolved.source.primary_model)})`);
-    if (resolved.coding_model) rows.push(`- coding: \`${resolved.coding_model}\` (${sourceLabel(resolved.source.coding_model)})`);
-    if (resolved.tool_call_model) rows.push(`- tool_call: \`${resolved.tool_call_model}\` (${sourceLabel(resolved.source.tool_call_model)})`);
-    if (resolved.function_call_model) rows.push(`- function_call: \`${resolved.function_call_model}\` (${sourceLabel(resolved.source.function_call_model)})`);
-    if (resolved.vision_model) rows.push(`- vision: \`${resolved.vision_model}\` (${sourceLabel(resolved.source.vision_model)})`);
-    if (rows.length) {
-      lines.push(``, `## Configured Models`, ...rows);
-    }
-  }
-  return lines.join("\n");
-}
+import type { SupabaseClient } from "@supabase/supabase-js";
+
+export interface SubagentRow {
+  id: string;
+  chief_agent_id: string;
+  name: string;
+  role: string | null;
+  codename: string | null;
+  system_prompt: string | null;
+  mission: string | null;
+  responsibilities: string | null;
+  instructions: string | null;
+  primary_model: string | null;
+  coding_model: string | null;
+  tool_call_model: string | null;
+  function_call_model: string | null;
+  vision_model: string | null;
+  mcp_server_ids: string[] | null;
+  attached_sop_ids: string[] | null;
+  attached_framework_ids: string[] | null;
+}
+
+export async function loadSubagentRow(
+  supabase: SupabaseClient,
+  userId: string,
+  subagentId: string,
+): Promise<SubagentRow | null> {
+  const { data, error } = await supabase
+    .from("agent_subagents")
+    .select(
+      "id, chief_agent_id, name, role, codename, system_prompt, mission, responsibilities, instructions, primary_model, coding_model, tool_call_model, function_call_model, vision_model, mcp_server_ids, attached_sop_ids, attached_framework_ids",
+    )
+    .eq("user_id", userId)
+    .eq("id", subagentId)
+    .maybeSingle();
+  if (error || !data) return null;
+  return data as SubagentRow;
+}
+
+// Cycle 7b — pluck subagent_id from dispatch metadata only. Plain user chats
+// must NOT trigger the staff persona swap or report emission, so we deliberately
+// do not consult ctx.subagentId / ctx.subagent_id at the top level.
+export function readDispatchSubagentId(ctx: any, event?: any): string | null {
+  const candidates: Array<unknown> = [
+    ctx?.metadata?.subagent_id,
+    ctx?.metadata?.dispatch?.subagent_id,
+    ctx?.params?.metadata?.subagent_id,
+    ctx?.payload?.metadata?.subagent_id,
+    ctx?.request?.metadata?.subagent_id,
+    ctx?.options?.metadata?.subagent_id,
+    ctx?.attachments?.subagent_id,
+    ctx?.dispatch?.subagent_id,
+    event?.metadata?.subagent_id,
+    event?.context?.metadata?.subagent_id,
+  ];
+  for (const c of candidates) {
+    if (typeof c === "string" && c.length) return c;
+  }
+  return null;
+}
+
+// Cycle 7b BUGSHOOT-1 (BUG 2) — DB-backed dispatch context fallback.
+// OpenClaw gateway core rejects unknown root key `metadata` on chat.send, so
+// the task-dispatcher edge function can't ride dispatch metadata through the
+// wire. The dispatcher writes a row to public.dispatch_context keyed by
+// (user_id, session_key) before chat.send fires; this loader reads it back
+// during before_prompt_build when the metadata path comes up empty.
+//
+// Returns the dispatch context for the most recent matching row, or null if
+// none exists. The metadata path is preferred so a future gateway upgrade
+// that natively accepts metadata keeps working with no flag day.
+export interface DispatchContextRow {
+  subagent_id: string | null;
+  attached_sop_ids: string[];
+  attached_framework_ids: string[];
+  task_id: string | null;
+  conversation_id: string | null;
+  // FIX-A2A-LATE-REPLY: source_agent_id + a2a_pair_id are set ONLY for direct
+  // chief↔chief A2A relays. When both are present and subagent_id + task_id
+  // are null, the agent_end hook in tools.ts routes the run as an A2A late
+  // reply (insert into conversation_messages + POST chief_reply webhook).
+  source_agent_id: string | null;
+  a2a_pair_id: string | null;
+}
+
+export async function loadDispatchContextBySession(
+  supabase: SupabaseClient,
+  userId: string,
+  sessionKey: string,
+): Promise<DispatchContextRow | null> {
+  if (!sessionKey) return null;
+  const { data, error } = await supabase
+    .from("dispatch_context")
+    .select(
+      "subagent_id, attached_sop_ids, attached_framework_ids, task_id, conversation_id, source_agent_id, a2a_pair_id",
+    )
+    .eq("user_id", userId)
+    .eq("session_key", sessionKey)
+    .order("created_at", { ascending: false })
+    .limit(1)
+    .maybeSingle();
+  if (error || !data) return null;
+  return {
+    subagent_id: (data.subagent_id as string | null) ?? null,
+    attached_sop_ids: Array.isArray(data.attached_sop_ids)
+      ? (data.attached_sop_ids as unknown[]).filter((x): x is string => typeof x === "string")
+      : [],
+    attached_framework_ids: Array.isArray(data.attached_framework_ids)
+      ? (data.attached_framework_ids as unknown[]).filter((x): x is string => typeof x === "string")
+      : [],
+    task_id: (data.task_id as string | null) ?? null,
+    conversation_id: (data.conversation_id as string | null) ?? null,
+    source_agent_id: (data.source_agent_id as string | null) ?? null,
+    a2a_pair_id: (data.a2a_pair_id as string | null) ?? null,
+  };
+}
+
+export type StaffModelSlot =
+  | "primary_model"
+  | "coding_model"
+  | "tool_call_model"
+  | "function_call_model"
+  | "vision_model";
+
+export interface ChiefStaffDefaultsRow {
+  chief_agent_id: string;
+  primary_model: string | null;
+  coding_model: string | null;
+  tool_call_model: string | null;
+  function_call_model: string | null;
+  vision_model: string | null;
+}
+
+export interface ResolvedStaffModels {
+  primary_model: string | null;
+  coding_model: string | null;
+  tool_call_model: string | null;
+  function_call_model: string | null;
+  vision_model: string | null;
+  source: Record<StaffModelSlot, "staff" | "chief_default" | "chief_primary" | "chief_fallback" | null>;
+}
+
+const SLOTS: StaffModelSlot[] = [
+  "primary_model",
+  "coding_model",
+  "tool_call_model",
+  "function_call_model",
+  "vision_model",
+];
+
+// Cycle 7b BUGSHOOT-3 — chief's own ofie_agent_config row, used as the third
+// fallback tier when neither the staff slot nor the chief STAFF MODEL slot is
+// set. Mirrors the dispatcher's loadStaffPrimaryModel chain.
+export interface ChiefAgentConfigRow {
+  agent_id: string;
+  primary_model: string | null;
+  coding_model: string | null;
+  tool_call_model: string | null;
+  vision_model: string | null;
+}
+
+export async function loadChiefStaffDefaults(
+  supabase: SupabaseClient,
+  userId: string,
+  chiefAgentId: string,
+): Promise<ChiefStaffDefaultsRow | null> {
+  const { data, error } = await supabase
+    .from("chief_staff_defaults")
+    .select(
+      "chief_agent_id, primary_model, coding_model, tool_call_model, function_call_model, vision_model",
+    )
+    .eq("user_id", userId)
+    .eq("chief_agent_id", chiefAgentId)
+    .maybeSingle();
+  if (error || !data) return null;
+  return data as ChiefStaffDefaultsRow;
+}
+
+export async function loadChiefAgentConfig(
+  supabase: SupabaseClient,
+  userId: string,
+  chiefAgentId: string,
+): Promise<ChiefAgentConfigRow | null> {
+  const { data, error } = await supabase
+    .from("ofie_agent_config")
+    .select("agent_id, primary_model, coding_model, tool_call_model, vision_model")
+    .eq("user_id", userId)
+    .eq("agent_id", chiefAgentId)
+    .maybeSingle();
+  if (error || !data) return null;
+  return data as ChiefAgentConfigRow;
+}
+
+/**
+ * Resolution chain at delegate_to_staff time (BUGSHOOT-3):
+ *   1. staff.<slot>                       (per-staff override)
+ *   2. chief_staff_defaults.<slot>        (chief-level STAFF MODEL)
+ *   3. ofie_agent_config.<slot>           (chief's OWN slot, NEW)
+ *   4. ofie_agent_config.primary_model    (chief's primary, last-resort sub)
+ *   5. null                               (gateway picks gateway default)
+ *
+ * Tier 3 was added in BUGSHOOT-3 because the prior chain stopped at tier 2 and
+ * relied on an implicit "gateway default" — which is opaque and led to BUG 10
+ * when the staff override held a model id the gateway rejected. With tier 3,
+ * an empty staff slot deterministically inherits the chief's actual model.
+ *
+ * Tier 4 (slot → primary_model fallback) handles the common case where chief
+ * has only a primary_model set and no per-slot routing — a staff with
+ * coding_model blank still inherits chief's primary_model rather than null.
+ */
+export function resolveStaffModels(
+  staff: SubagentRow,
+  chiefDefaults: ChiefStaffDefaultsRow | null,
+  chiefConfig?: ChiefAgentConfigRow | null,
+): ResolvedStaffModels {
+  const out: ResolvedStaffModels = {
+    primary_model: null,
+    coding_model: null,
+    tool_call_model: null,
+    function_call_model: null,
+    vision_model: null,
+    source: {
+      primary_model: null,
+      coding_model: null,
+      tool_call_model: null,
+      function_call_model: null,
+      vision_model: null,
+    },
+  };
+  const chiefPrimary = typeof chiefConfig?.primary_model === "string" && chiefConfig.primary_model.trim()
+    ? chiefConfig.primary_model.trim()
+    : null;
+  for (const slot of SLOTS) {
+    const staffVal = (staff as any)[slot] as string | null | undefined;
+    const chiefVal = chiefDefaults ? (chiefDefaults as any)[slot] as string | null | undefined : null;
+    const chiefSlotVal = chiefConfig ? (chiefConfig as any)[slot] as string | null | undefined : null;
+    if (staffVal && staffVal.trim()) {
+      out[slot] = staffVal;
+      out.source[slot] = "staff";
+    } else if (chiefVal && chiefVal.trim()) {
+      out[slot] = chiefVal;
+      out.source[slot] = "chief_default";
+    } else if (chiefSlotVal && chiefSlotVal.trim()) {
+      out[slot] = chiefSlotVal;
+      out.source[slot] = "chief_primary";
+    } else if (chiefPrimary) {
+      // Sub-fallback: chief has a primary_model but no per-slot override.
+      out[slot] = chiefPrimary;
+      out.source[slot] = "chief_primary";
+    } else {
+      out[slot] = null;
+      out.source[slot] = "chief_fallback";
+    }
+  }
+  return out;
+}
+
+export function buildStaffPersonaBlock(
+  staff: SubagentRow,
+  resolved?: ResolvedStaffModels,
+): string {
+  const lines: string[] = [];
+  lines.push(`# STAFF IDENTITY`);
+  lines.push(
+    `You are **${staff.name}**${staff.role ? ` (${staff.role})` : ""}, a staff member reporting to chief \`${staff.chief_agent_id}\`.`,
+  );
+  lines.push(
+    `You are NOT the chief. Execute the assigned task, then return a structured report. Do not adopt the chief's persona.`,
+  );
+  if (staff.system_prompt?.trim()) {
+    lines.push(``, `## Persona`, staff.system_prompt.trim());
+  }
+  if (staff.mission?.trim()) {
+    lines.push(``, `## Mission`, staff.mission.trim());
+  }
+  if (staff.responsibilities?.trim()) {
+    lines.push(``, `## Responsibilities`, staff.responsibilities.trim());
+  }
+  if (staff.instructions?.trim()) {
+    lines.push(``, `## Operating Instructions`, staff.instructions.trim());
+  }
+  if (resolved && (resolved.primary_model || resolved.coding_model || resolved.tool_call_model || resolved.function_call_model || resolved.vision_model)) {
+    const sourceLabel = (s: "staff" | "chief_default" | "chief_primary" | "chief_fallback" | null) =>
+      s === "staff" ? "per-staff override"
+      : s === "chief_default" ? "chief STAFF MODEL"
+      : s === "chief_primary" ? "chief's own model"
+      : "inherits chief (gateway default)";
+    const rows: string[] = [];
+    if (resolved.primary_model) rows.push(`- primary: \`${resolved.primary_model}\` (${sourceLabel(resolved.source.primary_model)})`);
+    if (resolved.coding_model) rows.push(`- coding: \`${resolved.coding_model}\` (${sourceLabel(resolved.source.coding_model)})`);
+    if (resolved.tool_call_model) rows.push(`- tool_call: \`${resolved.tool_call_model}\` (${sourceLabel(resolved.source.tool_call_model)})`);
+    if (resolved.function_call_model) rows.push(`- function_call: \`${resolved.function_call_model}\` (${sourceLabel(resolved.source.function_call_model)})`);
+    if (resolved.vision_model) rows.push(`- vision: \`${resolved.vision_model}\` (${sourceLabel(resolved.source.vision_model)})`);
+    if (rows.length) {
+      lines.push(``, `## Configured Models`, ...rows);
+    }
+  }
+  return lines.join("\n");
+}

package/src/supabase.ts

@@ -1,13 +1,13 @@
-import { createClient, type SupabaseClient } from "@supabase/supabase-js";
-
-let _client: SupabaseClient | null = null;
-
-export function getSupabase(supabaseUrl: string, serviceRoleKey: string): SupabaseClient {
-  if (_client) return _client;
-
-  _client = createClient(supabaseUrl, serviceRoleKey, {
-    auth: { persistSession: false },
-  });
-
-  return _client;
-}
+import { createClient, type SupabaseClient } from "@supabase/supabase-js";
+
+let _client: SupabaseClient | null = null;
+
+export function getSupabase(supabaseUrl: string, serviceRoleKey: string): SupabaseClient {
+  if (_client) return _client;
+
+  _client = createClient(supabaseUrl, serviceRoleKey, {
+    auth: { persistSession: false },
+  });
+
+  return _client;
+}