@detiq/crawler 1.1.16 → 1.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@detiq/crawler",
-  "version": "1.1.16",
+  "version": "1.1.18",
   "private": false,
   "publishConfig": {
     "access": "public",

package/src/job-queue.ts

@@ -1064,19 +1064,25 @@ async function processFigmaImportJob(jobId: string, config: any) {
     tx.platformJob.update({ where: { id: jobId }, data: { status: 'RUNNING', startedAt: new Date() } })
   );
   try {
-    const connector = await withTenant(tenantId, (tx) =>
-      (tx as any).connector.findFirst({ where: { projectId, kind: 'FIGMA', tenantId } })
-    ) as any;
-    if (!connector) throw new Error('Figma connector not configured. Add your Figma token in Project Settings → Integrations.');
-
-    const cfg = connector.config as Record<string, string>;
-    const accessToken = cfg.accessToken_enc ? decrypt(cfg.accessToken_enc) : '';
-    if (!accessToken) throw new Error('Figma access token missing. Edit the Figma connector and add your Personal Access Token.');
-
-    const resolvedFileKey = fileKey ?? cfg.fileKey ?? '';
+    // Prefer OAuth token (connected via Figma OAuth flow), fall back to PAT connector.
+    const oauthConn = await AppBrain.getOAuthConnection(tenantId, projectId, 'FIGMA');
+    let creds: figma.FigmaCredentials;
+    const resolvedFileKey = fileKey ?? '';
     if (!resolvedFileKey) throw new Error('No Figma file key. Paste the full Figma file URL as the App URL.');
 
-    const creds: figma.FigmaCredentials = { accessToken, fileKey: resolvedFileKey };
+    if (oauthConn?.accessToken && oauthConn.status === 'CONNECTED') {
+      // OAuth token must use Authorization: Bearer header (oauthToken field), not X-Figma-Token
+      creds = { accessToken: '', oauthToken: oauthConn.accessToken, fileKey: resolvedFileKey };
+    } else {
+      const connector = await withTenant(tenantId, (tx) =>
+        (tx as any).connector.findFirst({ where: { projectId, kind: 'FIGMA', tenantId } })
+      ) as any;
+      if (!connector) throw new Error('Figma connector not configured. Add your Figma token in Project Settings → Integrations.');
+      const cfg = connector.config as Record<string, string>;
+      const pat = cfg.accessToken_enc ? decrypt(cfg.accessToken_enc) : '';
+      if (!pat) throw new Error('Figma access token missing. Edit the Figma connector and add your Personal Access Token.');
+      creds = { accessToken: pat, fileKey: resolvedFileKey };
+    }
 
     await updateJobProgress(tenantId, jobId, 5, 'Listing frames from Figma file…');
     const frames = await figma.listScreens(creds, resolvedFileKey);
@@ -1118,7 +1124,9 @@ async function processFigmaImportJob(jobId: string, config: any) {
                 console.warn('[figma-import] cloud upload failed:', e);
               }
             }
-            await AppBrain.saveScreenshot(tenantId, projectId, screen.id, storagePath, 1, 'DESKTOP', cloudUrl);
+            const w = (frame as any).boundingBox?.width ?? 1440;
+            const viewport = w <= 480 ? 'MOBILE_PORTRAIT' : w <= 1024 ? 'TABLET' : 'DESKTOP';
+            await AppBrain.saveScreenshot(tenantId, projectId, screen.id, storagePath, 1, viewport, cloudUrl);
           }
         }
 
@@ -3092,7 +3100,7 @@ async function processCreatePRJob(jobId: string, config: any) {
     const { decrypt } = await import('@detiq/core');
     const token = decrypt(conn.tokenEnc);
 
-    const { pushScriptsAsPR } = await import('@detiq/agents');
+    const { pushScriptsAsPR, getFileContent, mergeSpecContent } = await import('@detiq/agents');
 
     const framework = conn.detectedFramework ?? 'playwright-ts';
 
@@ -3117,11 +3125,24 @@ async function processCreatePRJob(jobId: string, config: any) {
 
     if (scripts.length === 0) throw new Error('No generated scripts found to push.');
 
-    const files = scripts.map((s: any) => {
+    // For each file, check if it already exists in the repo and merge if so
+    const files = await Promise.all(scripts.map(async (s: any) => {
       const path = s.testCase?.repoTargetPath
         ?? deriveFallbackTargetPath(s.testCase?.ref ?? s.testCase?.title ?? s.id, framework);
-      return { path, content: s.code };
-    });
+      let content = s.code;
+
+      // Spec files: attempt to merge with existing content
+      const isSpecFile = /\.(spec|test|cy)\.(ts|js|py|java)$/.test(path) || /_test\.py$/.test(path);
+      if (isSpecFile) {
+        const existing = await getFileContent(token, conn.repoFullName, path, conn.defaultBranch).catch(() => null);
+        if (existing && existing.trim().length > 0) {
+          logger.info({ path }, '[create-pr] merging new tests into existing spec file');
+          content = mergeSpecContent(existing, s.code);
+        }
+      }
+
+      return { path, content };
+    }));
 
     if (files.length === 0) throw new Error('No scripts to push.');