Harden scheduled Meta publish and auto-link Drive for pipeline creatives.

Schedule save auto-approves and publishes when due; cron recovers stale jobs every 5m. Drive sync auto-matches client folders under Clientes when not linked.

Co-authored-by: Cursor <cursoragent@cursor.com>

src/lib/google-drive.ts

@@ -663,9 +663,10 @@ export async function ensureChildFolder(
   const params = new URLSearchParams({
     q,
     fields: 'files(id,name)',
-    pageSize: '1',
+    pageSize: '5',
     supportsAllDrives: 'true',
     includeItemsFromAllDrives: 'true',
+    corpora: 'allDrives',
   });
   const find = await fetch(
     `https://www.googleapis.com/drive/v3/files?${params}`,

src/lib/pipeline-drive.ts

@@ -9,14 +9,18 @@
  */
 import { slugify } from '@/lib/calendar-import';
 import {
+  applyMatches,
   driveConfigured,
   ensureChildFolder,
   getTenantDriveFolderId,
+  listClientFoldersUnderClientes,
   listFilesInFolder,
+  matchFoldersToTenants,
   uploadToDrive,
   getValidAccessToken,
 } from '@/lib/google-drive';
 import { serviceHeaders, supabaseUrl } from '@/lib/agency';
+import { ASSETS_BUCKET, serviceSupabase } from '@/lib/assets';
 
 export type PipelineDriveItem = {
   id: string;
@@ -26,6 +30,8 @@ export type PipelineDriveItem = {
   notes?: string | null;
   scheduled_at?: string | null;
   created_at?: string | null;
+  cover_path?: string | null;
+  slide_paths?: unknown;
 };
 
 function pad2(n: number): string {
@@ -56,7 +62,6 @@ export function hookLabel(item: PipelineDriveItem): string {
 export function formatDriveFileName(opts: {
   item: PipelineDriveItem;
   ext: string;
-  /** 1-based slide number for carrusel; omit for single creatives */
   slideNumber?: number;
 }): string {
   const d = pieceLocalDate(opts.item);
@@ -122,7 +127,10 @@ async function uploadOrReplace(opts: {
   return { ...created, replaced: false };
 }
 
-async function loadTenantSlug(tenantId: string): Promise<string | null> {
+async function loadTenant(tenantId: string): Promise<{
+  slug: string;
+  name: string;
+} | null> {
   const headers = serviceHeaders();
   if (!headers) return null;
   const r = await fetch(
@@ -133,12 +141,46 @@ async function loadTenantSlug(tenantId: string): Promise<string | null> {
   );
   if (!r.ok) return null;
   const rows = (await r.json()) as { slug?: string; name?: string }[];
-  return rows[0]?.slug || rows[0]?.name || null;
+  if (!rows[0]) return null;
+  return {
+    slug: rows[0].slug || rows[0].name || 'cliente',
+    name: rows[0].name || rows[0].slug || 'cliente',
+  };
+}
+
+/**
+ * Resolve client Drive folder: linked integration, or auto-match under «Clientes».
+ */
+export async function resolveOrLinkTenantDriveFolder(
+  tenantId: string,
+  clientLabel: string
+): Promise<{ folderId: string; folderName?: string; autoLinked?: boolean } | null> {
+  const linked = await getTenantDriveFolderId(tenantId);
+  if (linked?.folderId) return linked;
+
+  const tenant = await loadTenant(tenantId);
+  if (!tenant) return null;
+
+  const { folders } = await listClientFoldersUnderClientes();
+  if (!folders.length) return null;
+
+  const matches = await matchFoldersToTenants(
+    [{ id: tenantId, name: tenant.name || clientLabel, slug: tenant.slug }],
+    folders
+  );
+  const hit = matches.find((m) => m.status === 'matched' && m.folderId);
+  if (!hit?.folderId) return null;
+
+  await applyMatches([hit]);
+  return {
+    folderId: hit.folderId,
+    folderName: hit.folderName || undefined,
+    autoLinked: true,
+  };
 }
 
 /**
  * Ensure month folder under client's Drive root and upload the creative.
- * Non-fatal if Drive is not linked — returns warning.
  */
 export async function syncPipelineAssetToDrive(opts: {
   tenantId: string;
@@ -156,6 +198,7 @@ export async function syncPipelineAssetToDrive(opts: {
   driveFileId?: string;
   drivePath?: string;
   fileName?: string;
+  autoLinked?: boolean;
 }> {
   if (!driveConfigured()) {
     return {
@@ -165,20 +208,40 @@ export async function syncPipelineAssetToDrive(opts: {
     };
   }
 
-  const linked = await getTenantDriveFolderId(opts.tenantId);
+  let linked: {
+    folderId: string;
+    folderName?: string;
+    autoLinked?: boolean;
+  } | null = null;
+  try {
+    linked = await resolveOrLinkTenantDriveFolder(
+      opts.tenantId,
+      opts.clientLabel
+    );
+  } catch (e) {
+    return {
+      ok: false,
+      warning:
+        e instanceof Error
+          ? `Drive auto-link: ${e.message}`
+          : 'Drive auto-link falló',
+    };
+  }
+
   if (!linked?.folderId) {
     return {
       ok: false,
       skipped: true,
       warning:
-        'Cliente sin carpeta Drive asociada. Empareja Drive en Agencia / ficha.',
+        'Cliente sin carpeta Drive. Empareja Drive en Agencia (o crea carpeta bajo 03-Clientes).',
     };
   }
 
   try {
-    const slug =
-      (await loadTenantSlug(opts.tenantId)) || opts.clientLabel || 'cliente';
-    const rootName = pipelineRootFolderName(slug);
+    const tenant = await loadTenant(opts.tenantId);
+    const rootName = pipelineRootFolderName(
+      tenant?.slug || opts.clientLabel || 'cliente'
+    );
     const d = pieceLocalDate(opts.item);
     const year = String(d.getFullYear());
     const month = pad2(d.getMonth() + 1);
@@ -190,7 +253,6 @@ export async function syncPipelineAssetToDrive(opts: {
     const isCarousel = (opts.item.format || '').toLowerCase() === 'carrusel';
     let slideNumber: number | undefined;
     if (isCarousel) {
-      // cover → 1; slide index 0 → 2, etc.
       slideNumber =
         opts.slot === 'cover' ? 1 : Math.max(2, opts.slideIndex + 2);
     }
@@ -212,7 +274,8 @@ export async function syncPipelineAssetToDrive(opts: {
       ok: true,
       driveFileId: up.id,
       fileName,
-      drivePath: `${rootName}/${year}/${month}/${fileName}`,
+      drivePath: `${linked.folderName || 'cliente'}/${rootName}/${year}/${month}/${fileName}`,
+      autoLinked: linked.autoLinked,
     };
   } catch (e) {
     return {
@@ -221,3 +284,64 @@ export async function syncPipelineAssetToDrive(opts: {
     };
   }
 }
+
+/** Backfill: push an already-stored cover/slide from Storage → Drive. */
+export async function backfillPipelineItemToDrive(opts: {
+  tenantId: string;
+  clientLabel: string;
+  item: PipelineDriveItem;
+}): Promise<{ ok: boolean; results: { slot: string; ok: boolean; detail: string }[] }> {
+  const svc = serviceSupabase();
+  const results: { slot: string; ok: boolean; detail: string }[] = [];
+  if (!svc) {
+    return { ok: false, results: [{ slot: '-', ok: false, detail: 'no service' }] };
+  }
+
+  const jobs: { path: string; slot: 'cover' | 'slide'; index: number }[] = [];
+  if (opts.item.cover_path) {
+    jobs.push({ path: opts.item.cover_path, slot: 'cover', index: 0 });
+  }
+  const slides = Array.isArray(opts.item.slide_paths)
+    ? (opts.item.slide_paths as string[])
+    : [];
+  slides.forEach((p, i) => {
+    if (p) jobs.push({ path: p, slot: 'slide', index: i });
+  });
+
+  for (const job of jobs) {
+    const dl = await svc.storage.from(ASSETS_BUCKET).download(job.path);
+    if (dl.error || !dl.data) {
+      results.push({
+        slot: job.slot,
+        ok: false,
+        detail: dl.error?.message || 'download fail',
+      });
+      continue;
+    }
+    const ab = await dl.data.arrayBuffer();
+    const buf = Buffer.from(ab);
+    const ext =
+      job.path.split('.').pop()?.toLowerCase() ||
+      (dl.data.type.includes('png') ? 'png' : 'jpg');
+    const mime = dl.data.type || 'image/jpeg';
+    const sync = await syncPipelineAssetToDrive({
+      tenantId: opts.tenantId,
+      clientLabel: opts.clientLabel,
+      item: opts.item,
+      buffer: buf,
+      mimeType: mime,
+      ext,
+      slot: job.slot,
+      slideIndex: job.index,
+    });
+    results.push({
+      slot: `${job.slot}${job.slot === 'slide' ? job.index + 1 : ''}`,
+      ok: sync.ok,
+      detail: sync.ok
+        ? sync.drivePath || 'ok'
+        : sync.warning || 'fail',
+    });
+  }
+
+  return { ok: results.every((r) => r.ok), results };
+}

src/lib/pipeline-publish-worker.ts

@@ -0,0 +1,217 @@
+/**
+ * Shared worker: publish due creative_pipeline rows to Meta.
+ * Used by cron and by schedule-save when the time is already due.
+ */
+import { serviceHeaders, supabaseUrl } from '@/lib/agency';
+import {
+  mergePermalinkNotes,
+  publishPipelineItem,
+  type PipelinePublishRow,
+} from '@/lib/meta-publish';
+
+const SELECT =
+  'id,tenant_id,title,format,status,scheduled_at,channels,publish_status,publish_attempts,cover_path,cover_mime,slide_paths,caption,notes,meta_ig_media_id,meta_fb_post_id,updated_at';
+
+async function patchItem(
+  base: string,
+  headers: Record<string, string>,
+  id: string,
+  body: Record<string, unknown>
+) {
+  return fetch(`${base}/rest/v1/creative_pipeline?id=eq.${id}`, {
+    method: 'PATCH',
+    headers: {
+      ...headers,
+      'Content-Type': 'application/json',
+      Prefer: 'return=minimal',
+    },
+    body: JSON.stringify({ ...body, updated_at: new Date().toISOString() }),
+  });
+}
+
+/** Recover rows stuck in publishing longer than `staleMin` minutes. */
+async function recoverStalePublishing(
+  base: string,
+  headers: Record<string, string>,
+  staleMin = 12
+) {
+  const cutoff = new Date(Date.now() - staleMin * 60_000).toISOString();
+  await fetch(
+    `${base}/rest/v1/creative_pipeline?publish_status=eq.publishing&updated_at=lt.${encodeURIComponent(cutoff)}`,
+    {
+      method: 'PATCH',
+      headers: {
+        ...headers,
+        'Content-Type': 'application/json',
+        Prefer: 'return=minimal',
+      },
+      body: JSON.stringify({
+        publish_status: 'failed',
+        publish_error:
+          'Publicación interrumpida (timeout). Se reintentará en el siguiente ciclo.',
+        updated_at: new Date().toISOString(),
+      }),
+    }
+  );
+}
+
+export type DuePublishResult = {
+  id: string;
+  title: string;
+  ok: boolean;
+  detail: string;
+};
+
+/**
+ * Fetch and publish due items.
+ * Criteria: scheduled_at <= now, cover present, and
+ *   - publish_status in (queued, failed), OR
+ *   - publish_status=idle AND status=aprobado
+ */
+export async function processDuePipelinePublishes(opts?: {
+  limit?: number;
+  tenantId?: string;
+  itemId?: string;
+  dryRun?: boolean;
+}): Promise<{
+  ok: boolean;
+  due: number;
+  results: DuePublishResult[];
+  error?: string;
+  dry?: boolean;
+  items?: unknown[];
+}> {
+  const headers = serviceHeaders();
+  const base = supabaseUrl();
+  if (!headers || !base) {
+    return { ok: false, due: 0, results: [], error: 'Service role required' };
+  }
+
+  await recoverStalePublishing(base, headers);
+
+  const now = new Date().toISOString();
+  const limit = Math.min(50, Math.max(1, opts?.limit || 10));
+
+  // Two complementary queries (PostgREST OR with nested AND is fragile).
+  const common =
+    `scheduled_at=lte.${encodeURIComponent(now)}` +
+    `&cover_path=not.is.null` +
+    `&select=${SELECT}&order=scheduled_at.asc&limit=${limit}` +
+    (opts?.tenantId
+      ? `&tenant_id=eq.${encodeURIComponent(opts.tenantId)}`
+      : '') +
+    (opts?.itemId ? `&id=eq.${encodeURIComponent(opts.itemId)}` : '');
+
+  const q1 =
+    `${base}/rest/v1/creative_pipeline?publish_status=in.(queued,failed)&${common}`;
+  const q2 =
+    `${base}/rest/v1/creative_pipeline?publish_status=eq.idle&status=eq.aprobado&${common}`;
+
+  const [r1, r2] = await Promise.all([
+    fetch(q1, { headers, cache: 'no-store' }),
+    fetch(q2, { headers, cache: 'no-store' }),
+  ]);
+  if (!r1.ok || !r2.ok) {
+    const err = !r1.ok ? await r1.text() : await r2.text();
+    return { ok: false, due: 0, results: [], error: err.slice(0, 400) };
+  }
+
+  const a = (await r1.json()) as (PipelinePublishRow & {
+    title: string;
+    notes?: string | null;
+    updated_at?: string;
+  })[];
+  const b = (await r2.json()) as typeof a;
+  const seen = new Set<string>();
+  const due: typeof a = [];
+  for (const row of [...a, ...b]) {
+    if (seen.has(row.id)) continue;
+    seen.add(row.id);
+    due.push(row);
+  }
+  due.sort((x, y) =>
+    String(
+      (x as { scheduled_at?: string }).scheduled_at || ''
+    ).localeCompare(
+      String((y as { scheduled_at?: string }).scheduled_at || '')
+    )
+  );
+  const slice = due.slice(0, limit);
+
+  if (opts?.dryRun) {
+    return {
+      ok: true,
+      dry: true,
+      due: slice.length,
+      results: [],
+      items: slice.map((d) => ({
+        id: d.id,
+        title: d.title,
+        scheduled_at: (d as { scheduled_at?: string }).scheduled_at,
+        publish_status: (d as { publish_status?: string }).publish_status,
+        status: (d as { status?: string }).status,
+      })),
+    };
+  }
+
+  const results: DuePublishResult[] = [];
+
+  for (const item of slice) {
+    const attempts = (item.publish_attempts || 0) + 1;
+    const lock = await patchItem(base, headers, item.id, {
+      publish_status: 'publishing',
+      publish_attempts: attempts,
+      publish_error: null,
+      status: 'aprobado',
+    });
+    if (!lock.ok) {
+      results.push({
+        id: item.id,
+        title: item.title,
+        ok: false,
+        detail: 'lock failed',
+      });
+      continue;
+    }
+
+    const result = await publishPipelineItem(item);
+    if (!result.ok) {
+      await patchItem(base, headers, item.id, {
+        publish_status: 'failed',
+        publish_error: result.error || 'Error Meta',
+        meta_ig_media_id: result.igMediaId || item.meta_ig_media_id || null,
+        meta_fb_post_id: result.fbPostId || item.meta_fb_post_id || null,
+      });
+      results.push({
+        id: item.id,
+        title: item.title,
+        ok: false,
+        detail: result.error || 'publish failed',
+      });
+      continue;
+    }
+
+    const notes = mergePermalinkNotes(
+      item.notes,
+      result.igPermalink,
+      result.fbPermalink
+    );
+    await patchItem(base, headers, item.id, {
+      publish_status: 'published',
+      publish_error: null,
+      published_at: new Date().toISOString(),
+      status: 'publicado',
+      meta_ig_media_id: result.igMediaId || null,
+      meta_fb_post_id: result.fbPostId || null,
+      notes,
+    });
+    results.push({
+      id: item.id,
+      title: item.title,
+      ok: true,
+      detail: `published ig=${result.igMediaId || '-'} fb=${result.fbPostId || '-'}`,
+    });
+  }
+
+  return { ok: true, due: slice.length, results };
+}