From fa6e8877923be43d52b293f83b8f2c73a716bf2c Mon Sep 17 00:00:00 2001 From: Dotta Date: Fri, 5 Jun 2026 03:17:23 +0000 Subject: [PATCH] PAP-10287 avoid teams catalog lockfile churn Co-Authored-By: Paperclip --- packages/shared/src/index.ts | 1 + packages/shared/src/types/index.ts | 1 + packages/shared/src/types/teams-catalog.ts | 8 ++++++++ packages/teams-catalog/package.json | 3 --- server/package.json | 1 - server/src/__tests__/teams-catalog-service.test.ts | 2 +- server/src/services/teams-catalog.ts | 2 -- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts index b3bdd171549..9184f95872e 100644 --- a/packages/shared/src/index.ts +++ b/packages/shared/src/index.ts @@ -332,6 +332,7 @@ export type { CatalogTeamSourceRef, CatalogTeamFile, CatalogTeam, + CatalogManifest, CatalogTeamListQuery, CatalogTeamFileDetail, CatalogTeamSourcePolicy, diff --git a/packages/shared/src/types/index.ts b/packages/shared/src/types/index.ts index f048a1cdf19..db0b68f2439 100644 --- a/packages/shared/src/types/index.ts +++ b/packages/shared/src/types/index.ts @@ -89,6 +89,7 @@ export type { CatalogTeamSourceRef, CatalogTeamFile, CatalogTeam, + CatalogManifest, CatalogTeamListQuery, CatalogTeamFileDetail, CatalogTeamSourcePolicy, diff --git a/packages/shared/src/types/teams-catalog.ts b/packages/shared/src/types/teams-catalog.ts index 76f662ae337..a088b07eb0b 100644 --- a/packages/shared/src/types/teams-catalog.ts +++ b/packages/shared/src/types/teams-catalog.ts @@ -110,6 +110,14 @@ export interface CatalogTeam { packageVersion?: string; } +export interface CatalogManifest { + schemaVersion: 1; + packageName: "@paperclipai/teams-catalog"; + packageVersion: string; + generatedAt: string; + teams: CatalogTeam[]; +} + export interface CatalogTeamListQuery { kind?: CatalogTeamKind; category?: string; diff --git a/packages/teams-catalog/package.json b/packages/teams-catalog/package.json index 6a3080df4ca..9ae11c3462a 100644 --- a/packages/teams-catalog/package.json +++ b/packages/teams-catalog/package.json @@ -45,8 +45,5 @@ "test": "pnpm -w exec vitest run --root packages/teams-catalog --config vitest.config.ts", "typecheck": "tsc -p tsconfig.json --noEmit", "validate": "node ../../cli/node_modules/tsx/dist/cli.mjs scripts/validate-catalog.ts" - }, - "dependencies": { - "@paperclipai/skills-catalog": "workspace:*" } } diff --git a/server/package.json b/server/package.json index 94992fa92be..ae78553fe05 100644 --- a/server/package.json +++ b/server/package.json @@ -58,7 +58,6 @@ "@paperclipai/db": "workspace:*", "@paperclipai/plugin-sdk": "workspace:*", "@paperclipai/shared": "workspace:*", - "@paperclipai/teams-catalog": "workspace:*", "ajv": "^8.20.0", "ajv-formats": "^3.0.1", "better-auth": "1.4.18", diff --git a/server/src/__tests__/teams-catalog-service.test.ts b/server/src/__tests__/teams-catalog-service.test.ts index 334d08b78db..389d36089f3 100644 --- a/server/src/__tests__/teams-catalog-service.test.ts +++ b/server/src/__tests__/teams-catalog-service.test.ts @@ -1,5 +1,5 @@ import { beforeEach, describe, expect, it, vi } from "vitest"; -import type { CatalogTeam } from "@paperclipai/teams-catalog"; +import type { CatalogTeam } from "@paperclipai/shared"; const mockAgentService = vi.hoisted(() => ({ getById: vi.fn(), diff --git a/server/src/services/teams-catalog.ts b/server/src/services/teams-catalog.ts index 2fa1e69a9a9..3d3042dd0b5 100644 --- a/server/src/services/teams-catalog.ts +++ b/server/src/services/teams-catalog.ts @@ -10,8 +10,6 @@ import type { CatalogTeamKind, CatalogTeamSkillRequirement, CatalogTeamSkillRequirementType, -} from "@paperclipai/teams-catalog"; -import type { CompanyPortabilityAdapterOverride, CompanyPortabilityAgentSelection, CompanyPortabilityCollisionStrategy,