chore: reorganize package.json and update SDK imports

- Restored the version field in package.json and reorganized scripts for better clarity.
- Updated imports from '@trigger.dev/sdk/v3' to '@trigger.dev/sdk' across multiple files for consistency.
- Removed unused queue configuration in onboarding tasks to streamline the code.
- Adjusted zod schema definitions for improved type safety in update-policies-helpers.ts.

Author: Marfuen

apps/api/package.json

@@ -1,29 +1,8 @@
 {
   "name": "@comp/api",
-  "version": "0.0.1",
   "description": "",
+  "version": "0.0.1",
   "author": "",
-  "private": true,
-  "license": "UNLICENSED",
-  "scripts": {
-    "build": "nest build",
-    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
-    "start": "nest start",
-    "dev": "nest start --watch",
-    "start:dev": "nest start --watch",
-    "start:debug": "nest start --debug --watch",
-    "start:prod": "node dist/main",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:cov": "jest --coverage",
-    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json",
-    "typecheck": "tsc --noEmit",
-    "db:generate": "bun run db:getschema && prisma generate",
-    "db:getschema": "cp ../../node_modules/@trycompai/db/dist/schema.prisma prisma/schema.prisma",
-    "prebuild": "bun run db:generate"
-  },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.859.0",
     "@aws-sdk/s3-request-presigner": "^3.859.0",
@@ -83,5 +62,26 @@
     ],
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
+  },
+  "license": "UNLICENSED",
+  "private": true,
+  "scripts": {
+    "build": "nest build",
+    "db:generate": "bun run db:getschema && prisma generate",
+    "db:getschema": "cp ../../node_modules/@trycompai/db/dist/schema.prisma prisma/schema.prisma",
+    "dev": "nest start --watch",
+    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "prebuild": "bun run db:generate",
+    "start": "nest start",
+    "start:debug": "nest start --debug --watch",
+    "start:dev": "nest start --watch",
+    "start:prod": "node dist/main",
+    "test": "jest",
+    "test:cov": "jest --coverage",
+    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
+    "test:e2e": "jest --config ./test/jest-e2e.json",
+    "test:watch": "jest --watch",
+    "typecheck": "tsc --noEmit"
   }
 }

apps/app/src/jobs/tasks/onboarding/onboard-organization-helpers.ts

@@ -11,7 +11,7 @@ import {
   RiskTreatmentType,
   VendorCategory,
 } from '@db';
-import { logger, tasks } from '@trigger.dev/sdk/v3';
+import { logger, tasks } from '@trigger.dev/sdk';
 import { generateObject, generateText } from 'ai';
 import axios from 'axios';
 import z from 'zod';
@@ -371,10 +371,6 @@ export async function triggerPolicyUpdates(
           contextHub: questionsAndAnswers.map((c) => `${c.question}\n${c.answer}`).join('\n'),
           frameworks,
         },
-        queue: {
-          name: 'update-policies',
-          concurrencyLimit: 5,
-        },
         concurrencyKey: organizationId,
       })),
     );

apps/app/src/jobs/tasks/onboarding/onboard-organization.ts

@@ -1,6 +1,5 @@
 import { db } from '@db';
-import { queue } from '@trigger.dev/sdk';
-import { logger, task } from '@trigger.dev/sdk/v3';
+import { logger, queue, task } from '@trigger.dev/sdk';
 import axios from 'axios';
 import {
   createRisks,
@@ -9,7 +8,6 @@ import {
   getOrganizationContext,
   updateOrganizationPolicies,
 } from './onboard-organization-helpers';
-import { updatePolicies } from './update-policies';
 
 // v4 queues must be declared in advance
 const onboardOrgQueue = queue({ name: 'onboard-organization', concurrencyLimit: 10 });
@@ -67,43 +65,12 @@ export const onboardOrganization = task({
       throw error;
     }
 
-    // Re-fetch policies with full data for policy updates
-    const fullPolicies = await db.policy.findMany({
-      where: {
-        organizationId: payload.organizationId,
-      },
-    });
-
-    if (fullPolicies.length > 0) {
-      // v4: queues are predefined on the task; trigger without on-demand queue options
-      await updatePolicies.batchTriggerAndWait(
-        fullPolicies.map((policy) => ({
-          payload: {
-            organizationId: payload.organizationId,
-            policyId: policy.id,
-            contextHub: contextHub.map((c) => `${c.question}\n${c.answer}`).join('\n'),
-          },
-          concurrencyKey: payload.organizationId,
-        })),
-      );
-    }
-
-    await db.onboarding.update({
-      where: {
-        organizationId: payload.organizationId,
-      },
-      data: { triggerJobCompleted: true },
-    });
-
-    logger.info(`Created ${extractRisks.object.risks.length} risks`);
-    logger.info(`Created ${extractVendors.object.vendors.length} vendors`);
-
     const organizationId = payload.organizationId;
     await db.onboarding.update({
       where: {
         organizationId,
       },
-      data: { triggerJobId: null },
+      data: { triggerJobId: null, triggerJobCompleted: true },
     });
 
     try {

apps/app/src/jobs/tasks/onboarding/update-policies-helpers.ts

@@ -1,7 +1,7 @@
 import { openai } from '@ai-sdk/openai';
 import { db, FrameworkEditorFramework, type Policy } from '@db';
 import type { JSONContent } from '@tiptap/react';
-import { logger } from '@trigger.dev/sdk/v3';
+import { logger } from '@trigger.dev/sdk';
 import { generateObject, NoObjectGeneratedError } from 'ai';
 import { z } from 'zod';
 import { generatePrompt } from '../../lib/prompts';
@@ -211,7 +211,7 @@ Given an ORIGINAL policy TipTap JSON and a DRAFT TipTap JSON, produce a FINAL Ti
 Follow the structure rules above strictly.`,
       schema: z.object({
         type: z.literal('document'),
-        content: z.array(z.record(z.unknown())),
+        content: z.array(z.record(z.string(), z.unknown())),
       }),
     });
     return object;
@@ -465,7 +465,7 @@ ${prompt.replace(/\\n/g, '\n')}
 Return the complete TipTap document following ALL the above requirements using proper TipTap JSON structure.`,
       schema: z.object({
         type: z.literal('document'),
-        content: z.array(z.record(z.unknown())),
+        content: z.array(z.record(z.string(), z.unknown())),
       }),
     });
 

packages/ui/package.json

@@ -456,13 +456,13 @@
     "format": "prettier --write .",
     "lint": "prettier --check .",
     "test": "vitest",
-    "test:run": "vitest run",
     "test:coverage": "vitest run --coverage",
+    "test:run": "vitest run",
     "test:ui": "vitest --ui",
     "test:watch": "vitest --watch",
     "typecheck": "tsc --noEmit"
   },
   "sideEffects": false,
   "type": "module",
   "types": "./dist/index.d.ts"
-}
+}