@detiq/crawler 1.1.17 → 1.1.19

package/package.json

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

package/src/job-queue.ts

@@ -240,8 +240,25 @@ export async function claimNextQueuedJob(): Promise<ClaimedJob | null> {
 
 /** Requeues RUNNING jobs whose heartbeat has gone stale — the worker that claimed them
  *  died (crash, restart, OOM) without ever marking them DONE/FAILED. Idempotent and
- *  safe to run from every worker process; only affects rows past the timeout. */
+ *  safe to run from every worker process; only affects rows past the timeout.
+ *  API-in-process job types (GENERATE_SCRIPT etc.) are failed directly — requeueing them
+ *  would cause the worker to claim and fail them with a confusing "claimed by worker" error. */
 export async function requeueStaleRunningJobs(): Promise<void> {
+  // Directly fail stale API-in-process jobs — worker cannot process these types.
+  const failedRows = await prismaAdmin.$queryRaw<Array<{ id: string }>>`
+    UPDATE "PlatformJob"
+    SET status = 'FAILED',
+        "finishedAt" = NOW(),
+        error = 'API process was restarted while this job was running — please retry from the UI.'
+    WHERE status = 'RUNNING'
+      AND type IN ('GENERATE_SCRIPT', 'GENERATE_DATA', 'GENERATE_TESTS', 'GENERATE_TEST_PLAN')
+      AND COALESCE("heartbeatAt", "startedAt") < NOW() - (${STALE_JOB_TIMEOUT_MINUTES} * interval '1 minute')
+    RETURNING id
+  `;
+  if (failedRows.length > 0) {
+    logger.warn({ jobIds: failedRows.map((r: any) => r.id), staleTimeoutMinutes: STALE_JOB_TIMEOUT_MINUTES }, '[job-worker] failed stale API-in-process job(s) — API restarted while running');
+  }
+
   const rows = await prismaAdmin.$queryRaw<Array<{ id: string }>>`
     UPDATE "PlatformJob"
     SET status = 'QUEUED',
@@ -253,6 +270,7 @@ export async function requeueStaleRunningJobs(): Promise<void> {
           true
         )
     WHERE status = 'RUNNING'
+      AND type NOT IN ('GENERATE_SCRIPT', 'GENERATE_DATA', 'GENERATE_TESTS', 'GENERATE_TEST_PLAN')
       AND COALESCE("heartbeatAt", "startedAt") < NOW() - (${STALE_JOB_TIMEOUT_MINUTES} * interval '1 minute')
     RETURNING id
   `;
@@ -1064,19 +1082,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 +1142,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);
           }
         }
 
@@ -2502,7 +2528,7 @@ jobDispatchTable = {
   BATCH_GENERATE_ALIGNED: processBatchGenerateAlignedJob,
   CREATE_PR: processCreatePRJob,
   NEW_PAGES_PIPELINE: processNewPagesPipelineJob,
-  // GENERATE_TESTS is processed in-process by the API (never QUEUED).
+  // The following job types are processed in-process by the API (never QUEUED).
   // If the worker claims one, the API crashed after creating it — mark failed so it's visible.
   GENERATE_TESTS: async (jobId: string, _config: any) => {
     logger.error({ jobId }, '[job-worker] GENERATE_TESTS claimed by worker — API did not process it in-process');
@@ -2511,6 +2537,27 @@ jobDispatchTable = {
       data: { status: 'FAILED', error: 'Test generation was not completed by the API — please retry from the UI.', finishedAt: new Date() },
     }).catch(() => {});
   },
+  GENERATE_DATA: async (jobId: string, _config: any) => {
+    logger.error({ jobId }, '[job-worker] GENERATE_DATA claimed by worker — API did not process it in-process');
+    await prismaAdmin.platformJob.update({
+      where: { id: jobId },
+      data: { status: 'FAILED', error: 'Data generation was not completed by the API — please retry from the UI.', finishedAt: new Date() },
+    }).catch(() => {});
+  },
+  GENERATE_SCRIPT: async (jobId: string, _config: any) => {
+    logger.error({ jobId }, '[job-worker] GENERATE_SCRIPT claimed by worker — API did not process it in-process');
+    await prismaAdmin.platformJob.update({
+      where: { id: jobId },
+      data: { status: 'FAILED', error: 'Script generation was not completed by the API — please retry from the UI.', finishedAt: new Date() },
+    }).catch(() => {});
+  },
+  GENERATE_TEST_PLAN: async (jobId: string, _config: any) => {
+    logger.error({ jobId }, '[job-worker] GENERATE_TEST_PLAN claimed by worker — API did not process it in-process');
+    await prismaAdmin.platformJob.update({
+      where: { id: jobId },
+      data: { status: 'FAILED', error: 'Test plan generation was not completed by the API — please retry from the UI.', finishedAt: new Date() },
+    }).catch(() => {});
+  },
 };
 
 async function processRepoScanJob(jobId: string, config: any) {