From d36585890b70e0a16136350d619883948700b73f Mon Sep 17 00:00:00 2001
From: Ariel Gentile <gentilester@gmail.com>
Date: Thu, 21 Nov 2024 19:11:36 -0300
Subject: [PATCH] feat: Publish NPM packages (#42)

---
 .github/workflows/cd.yml                             | 12 +++++++++++-
 examples/chatbot/index.ts                            |  2 +-
 examples/chatbot/package.json                        |  2 +-
 examples/chatbot/yarn.lock                           |  2 +-
 package.json                                         |  2 +-
 packages/client/package.json                         |  2 +-
 packages/client/src/handlers/ExpressEventHandler.ts  |  2 +-
 .../client/src/services/CredentialTypeService.ts     |  2 +-
 packages/client/src/services/MessageService.ts       |  6 +++---
 packages/main/package.json                           |  2 +-
 .../main/src/controllers/agent/AgentController.ts    |  2 +-
 .../credentials/CredentialTypeController.ts          |  2 +-
 .../controllers/invitation/InvitationController.ts   |  2 +-
 .../main/src/controllers/invitation/InvitationDto.ts |  2 +-
 .../src/controllers/message/MessageController.ts     |  2 +-
 .../main/src/controllers/message/MessageService.ts   |  2 +-
 .../message/services/CoreMessageService.ts           |  2 +-
 .../message/services/MessageServiceFactory.ts        |  2 +-
 .../message/services/RedisMessageService.ts          |  2 +-
 .../presentations/PresentationsController.ts         |  2 +-
 packages/main/src/events/ConnectionEvents.ts         |  2 +-
 packages/main/src/events/MessageEvents.ts            |  2 +-
 packages/main/src/events/VCAuthnEvents.ts            |  2 +-
 packages/main/src/events/WebhookEvent.ts             |  2 +-
 packages/main/src/utils/parsers.ts                   |  2 +-
 packages/model/package.json                          |  2 +-
 .../{models => }/events/ConnectionStateUpdated.ts    |  0
 packages/model/src/{models => }/events/Event.ts      |  0
 packages/model/src/{models => }/events/EventType.ts  |  0
 .../model/src/{models => }/events/MessageReceived.ts |  0
 .../src/{models => }/events/MessageStateUpdated.ts   |  0
 .../model/src/{models => }/events/VCAuthnEvent.ts    |  0
 packages/model/src/{models => }/events/index.ts      |  0
 packages/model/src/index.ts                          |  4 +++-
 .../model/src/{models => }/messages/BaseMessage.ts   |  0
 .../{models => }/messages/ContextualMenuRequest.ts   |  0
 .../{models => }/messages/ContextualMenuSelect.ts    |  0
 .../{models => }/messages/ContextualMenuUpdate.ts    |  0
 .../messages/CredentialIssuanceMessage.ts            |  0
 .../messages/CredentialReceptionMessage.ts           |  0
 .../messages/CredentialRequestMessage.ts             |  0
 .../messages/IdentityProofRequestMessage.ts          |  0
 .../messages/IdentityProofResultMessage.ts           |  0
 .../messages/IdentityProofSubmitMessage.ts           |  0
 .../src/{models => }/messages/InvitationMessage.ts   |  0
 .../model/src/{models => }/messages/MediaMessage.ts  |  0
 .../src/{models => }/messages/MenuDisplayMessage.ts  |  0
 .../src/{models => }/messages/MenuSelectMessage.ts   |  0
 .../model/src/{models => }/messages/MessageType.ts   |  0
 .../src/{models => }/messages/ProfileMessage.ts      |  0
 .../src/{models => }/messages/ReceiptsMessage.ts     |  0
 .../messages/TerminateConnectionMessage.ts           |  0
 .../model/src/{models => }/messages/TextMessage.ts   |  0
 .../messages/calls/CallAcceptRequestMessage.ts       |  0
 .../messages/calls/CallEndRequestMessage.ts          |  0
 .../messages/calls/CallOfferRequestMessage.ts        |  0
 .../messages/calls/CallRejectRequestMessage.ts       |  0
 packages/model/src/{models => }/messages/index.ts    |  0
 .../messages/mrtd/EMrtdDataRequestMessage.ts         |  0
 .../messages/mrtd/EMrtdDataSubmitMessage.ts          |  0
 .../messages/mrtd/MrzDataRequestMessage.ts           |  0
 .../messages/mrtd/MrzDataSubmitMessage.ts            |  0
 .../proofs/vc/VerifiableCredentialProofItemResult.ts |  0
 .../vc/VerifiableCredentialRequestedProofItem.ts     |  0
 .../vc/VerifiableCredentialSubmittedProofItem.ts     |  0
 packages/model/src/models/index.ts                   |  3 ---
 packages/model/src/{models => }/types.ts             |  0
 67 files changed, 41 insertions(+), 32 deletions(-)
 rename packages/model/src/{models => }/events/ConnectionStateUpdated.ts (100%)
 rename packages/model/src/{models => }/events/Event.ts (100%)
 rename packages/model/src/{models => }/events/EventType.ts (100%)
 rename packages/model/src/{models => }/events/MessageReceived.ts (100%)
 rename packages/model/src/{models => }/events/MessageStateUpdated.ts (100%)
 rename packages/model/src/{models => }/events/VCAuthnEvent.ts (100%)
 rename packages/model/src/{models => }/events/index.ts (100%)
 rename packages/model/src/{models => }/messages/BaseMessage.ts (100%)
 rename packages/model/src/{models => }/messages/ContextualMenuRequest.ts (100%)
 rename packages/model/src/{models => }/messages/ContextualMenuSelect.ts (100%)
 rename packages/model/src/{models => }/messages/ContextualMenuUpdate.ts (100%)
 rename packages/model/src/{models => }/messages/CredentialIssuanceMessage.ts (100%)
 rename packages/model/src/{models => }/messages/CredentialReceptionMessage.ts (100%)
 rename packages/model/src/{models => }/messages/CredentialRequestMessage.ts (100%)
 rename packages/model/src/{models => }/messages/IdentityProofRequestMessage.ts (100%)
 rename packages/model/src/{models => }/messages/IdentityProofResultMessage.ts (100%)
 rename packages/model/src/{models => }/messages/IdentityProofSubmitMessage.ts (100%)
 rename packages/model/src/{models => }/messages/InvitationMessage.ts (100%)
 rename packages/model/src/{models => }/messages/MediaMessage.ts (100%)
 rename packages/model/src/{models => }/messages/MenuDisplayMessage.ts (100%)
 rename packages/model/src/{models => }/messages/MenuSelectMessage.ts (100%)
 rename packages/model/src/{models => }/messages/MessageType.ts (100%)
 rename packages/model/src/{models => }/messages/ProfileMessage.ts (100%)
 rename packages/model/src/{models => }/messages/ReceiptsMessage.ts (100%)
 rename packages/model/src/{models => }/messages/TerminateConnectionMessage.ts (100%)
 rename packages/model/src/{models => }/messages/TextMessage.ts (100%)
 rename packages/model/src/{models => }/messages/calls/CallAcceptRequestMessage.ts (100%)
 rename packages/model/src/{models => }/messages/calls/CallEndRequestMessage.ts (100%)
 rename packages/model/src/{models => }/messages/calls/CallOfferRequestMessage.ts (100%)
 rename packages/model/src/{models => }/messages/calls/CallRejectRequestMessage.ts (100%)
 rename packages/model/src/{models => }/messages/index.ts (100%)
 rename packages/model/src/{models => }/messages/mrtd/EMrtdDataRequestMessage.ts (100%)
 rename packages/model/src/{models => }/messages/mrtd/EMrtdDataSubmitMessage.ts (100%)
 rename packages/model/src/{models => }/messages/mrtd/MrzDataRequestMessage.ts (100%)
 rename packages/model/src/{models => }/messages/mrtd/MrzDataSubmitMessage.ts (100%)
 rename packages/model/src/{models => }/messages/proofs/vc/VerifiableCredentialProofItemResult.ts (100%)
 rename packages/model/src/{models => }/messages/proofs/vc/VerifiableCredentialRequestedProofItem.ts (100%)
 rename packages/model/src/{models => }/messages/proofs/vc/VerifiableCredentialSubmittedProofItem.ts (100%)
 delete mode 100644 packages/model/src/models/index.ts
 rename packages/model/src/{models => }/types.ts (100%)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 6a3afd4..241dd45 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -75,7 +75,7 @@ jobs:
           docker build -f Dockerfile -t $DH_USERNAME/$IMAGE_NAME:$IMAGE_TAG .
  
       - name: Add tags to Docker image and push to Docker Hub
-        if: steps.semantic.outputs.new-release-published == 'true'      
+        if: steps.semantic.outputs.new-release-published == 'true'
         run: |
             docker tag $DH_USERNAME/$IMAGE_NAME:$IMAGE_TAG $DH_USERNAME/$IMAGE_NAME:v${RELEASE_MAJOR}-$IMAGE_TAG
             docker tag $DH_USERNAME/$IMAGE_NAME:$IMAGE_TAG $DH_USERNAME/$IMAGE_NAME:v${RELEASE_MAJOR}.${RELEASE_MINOR}-$IMAGE_TAG
@@ -98,7 +98,17 @@ jobs:
             docker push $DH_USERNAME/$IMAGE_NAME:v$RELEASE_MAJOR.$RELEASE_MINOR.${RELEASE_PATCH:0:1}
 
       - name: Build and push Chatbot Demo Docker image
+        if: steps.semantic.outputs.new-release-published == 'true'
         run: |
           docker build -f ./examples/chatbot/Dockerfile -t $DH_USERNAME/$DEMO_CHATBOT_IMAGE_NAME:$IMAGE_TAG .
           docker push $DH_USERNAME/$DEMO_CHATBOT_IMAGE_NAME:$IMAGE_TAG
 
+      - name: Publish NPM packages
+        if: steps.semantic.outputs.new-release-published == 'true'
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}        
+        run: |
+          yarn publish ./packages/model --new-version $RELEASE_VERSION
+          yarn publish ./packages/client --new-version $RELEASE_VERSION
+
+
diff --git a/examples/chatbot/index.ts b/examples/chatbot/index.ts
index 67b6183..0ce48aa 100644
--- a/examples/chatbot/index.ts
+++ b/examples/chatbot/index.ts
@@ -20,7 +20,7 @@ import {
   VerifiableCredentialRequestedProofItem,
   VerifiableCredentialSubmittedProofItem,
   MediaMessage,
-} from '@2060.io/model'
+} from '@2060.io/service-agent-model'
 import cors from 'cors'
 import { randomUUID } from 'crypto'
 import express from 'express'
diff --git a/examples/chatbot/package.json b/examples/chatbot/package.json
index b314771..cdc52b5 100644
--- a/examples/chatbot/package.json
+++ b/examples/chatbot/package.json
@@ -23,7 +23,7 @@
     "typescript": "4.7.4"
   },
   "dependencies": {
-    "@2060.io/model": "file:../../packages/model/build",
+    "@2060.io/service-agent-model": "file:../../packages/model/build",
     "@2060.io/service-agent-client": "file:../../packages/client/build",
     "body-parser": "^1.20.0",
     "cors": "^2.8.5",
diff --git a/examples/chatbot/yarn.lock b/examples/chatbot/yarn.lock
index 9cd4ffe..c6c320d 100644
--- a/examples/chatbot/yarn.lock
+++ b/examples/chatbot/yarn.lock
@@ -5,7 +5,7 @@
 "@2060.io/service-agent-client@file:../../packages/client/build":
   version "0.0.0"
 
-"@2060.io/model@file:../../packages/model/build":
+"@2060.io/service-agent-model@file:../../packages/model/build":
   version "0.0.0"
 
 "@cspotcode/source-map-support@^0.8.0":
diff --git a/package.json b/package.json
index c4c819c..4a7b2d2 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "url": "https://github.com/2060-io/2060-service-agent"
   },
   "scripts": {
-    "prebuild": "yarn workspace @2060.io/model run build",
+    "prebuild": "yarn workspace @2060.io/service-agent-model run build",
     "build": "yarn workspaces run build",
     "start": "yarn workspace main run start",
     "check-types": "yarn check-types:build",
diff --git a/packages/client/package.json b/packages/client/package.json
index 9ece822..b965a45 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -18,7 +18,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@2060.io/model": "*",
+    "@2060.io/service-agent-model": "*",
     "class-transformer": "0.5.1",
     "tslog": "^4.8.2",
     "express": "^4.18.1",
diff --git a/packages/client/src/handlers/ExpressEventHandler.ts b/packages/client/src/handlers/ExpressEventHandler.ts
index 0c052b1..367b410 100644
--- a/packages/client/src/handlers/ExpressEventHandler.ts
+++ b/packages/client/src/handlers/ExpressEventHandler.ts
@@ -1,4 +1,4 @@
-import { EventType } from '@2060.io/model'
+import { EventType } from '@2060.io/service-agent-model'
 import { Express, Request, Response } from 'express'
 
 type Handler = (req: Request, res: Response) => Promise<void>
diff --git a/packages/client/src/services/CredentialTypeService.ts b/packages/client/src/services/CredentialTypeService.ts
index 319f558..dacdf77 100644
--- a/packages/client/src/services/CredentialTypeService.ts
+++ b/packages/client/src/services/CredentialTypeService.ts
@@ -1,6 +1,6 @@
 // src/services/CredentialTypeService.ts
 
-import { CredentialTypeInfo, ImportCredentialTypeOptions } from '@2060.io/model'
+import { CredentialTypeInfo, ImportCredentialTypeOptions } from '@2060.io/service-agent-model'
 import { Logger } from 'tslog'
 
 import { ApiVersion } from '../types/enums'
diff --git a/packages/client/src/services/MessageService.ts b/packages/client/src/services/MessageService.ts
index 0ca4d28..d018a62 100644
--- a/packages/client/src/services/MessageService.ts
+++ b/packages/client/src/services/MessageService.ts
@@ -1,6 +1,6 @@
 // src/services/MessageService.ts
 
-import { BaseMessage } from '@2060.io/model'
+import { BaseMessage } from '@2060.io/service-agent-model'
 import { Logger } from 'tslog'
 
 import { ApiVersion } from '../types/enums'
@@ -9,10 +9,10 @@ const logger = new Logger()
 
 /**
  * `MessageService` class for handling message-related endpoints in the Agent Service.
- * This class is based on the `BaseMessage` from the `@2060.io/model` library.
+ * This class is based on the `BaseMessage` from the `@2060.io/service-agent-model` library.
  *
  * The methods in this class allow for sending messages and managing related tasks.
- * For more details on the `BaseMessage` structure and usage, refer to the `@2060.io/model` library.
+ * For more details on the `BaseMessage` structure and usage, refer to the `@2060.io/service-agent-model` library.
  */
 export class MessageService {
   private url: string
diff --git a/packages/main/package.json b/packages/main/package.json
index e8216fd..e6e8504 100644
--- a/packages/main/package.json
+++ b/packages/main/package.json
@@ -57,7 +57,7 @@
     "@2060.io/credo-ts-didcomm-calls": "^0.0.3",
     "@2060.io/credo-ts-didcomm-mrtd": "^0.0.8",
     "@2060.io/credo-ts-didcomm-user-profile": "0.0.6",
-    "@2060.io/model": "*",
+    "@2060.io/service-agent-model": "*",
     "@credo-ts/action-menu": "^0.5.11",
     "@credo-ts/anoncreds": "^0.5.11",
     "@credo-ts/askar": "^0.5.11",
diff --git a/packages/main/src/controllers/agent/AgentController.ts b/packages/main/src/controllers/agent/AgentController.ts
index 321b2a4..178107b 100644
--- a/packages/main/src/controllers/agent/AgentController.ts
+++ b/packages/main/src/controllers/agent/AgentController.ts
@@ -1,4 +1,4 @@
-import type { AgentInfo } from '@2060.io/model'
+import type { AgentInfo } from '@2060.io/service-agent-model'
 
 import { Controller, Get } from '@nestjs/common'
 import { ApiTags } from '@nestjs/swagger'
diff --git a/packages/main/src/controllers/credentials/CredentialTypeController.ts b/packages/main/src/controllers/credentials/CredentialTypeController.ts
index 304b684..b9a9302 100644
--- a/packages/main/src/controllers/credentials/CredentialTypeController.ts
+++ b/packages/main/src/controllers/credentials/CredentialTypeController.ts
@@ -1,4 +1,4 @@
-import { CredentialTypeInfo, ImportCredentialTypeOptions } from '@2060.io/model'
+import { CredentialTypeInfo, ImportCredentialTypeOptions } from '@2060.io/service-agent-model'
 import {
   AnonCredsCredentialDefinition,
   AnonCredsCredentialDefinitionPrivateRecord,
diff --git a/packages/main/src/controllers/invitation/InvitationController.ts b/packages/main/src/controllers/invitation/InvitationController.ts
index d98de17..5128c03 100644
--- a/packages/main/src/controllers/invitation/InvitationController.ts
+++ b/packages/main/src/controllers/invitation/InvitationController.ts
@@ -1,4 +1,4 @@
-import { CreateCredentialOfferResult, CreatePresentationRequestResult } from '@2060.io/model'
+import { CreateCredentialOfferResult, CreatePresentationRequestResult } from '@2060.io/service-agent-model'
 import { AnonCredsRequestedAttribute } from '@credo-ts/anoncreds'
 import { Controller, Get, Post, Body } from '@nestjs/common'
 import { ApiBody, ApiTags } from '@nestjs/swagger'
diff --git a/packages/main/src/controllers/invitation/InvitationDto.ts b/packages/main/src/controllers/invitation/InvitationDto.ts
index 55bd1a7..7631b64 100644
--- a/packages/main/src/controllers/invitation/InvitationDto.ts
+++ b/packages/main/src/controllers/invitation/InvitationDto.ts
@@ -3,7 +3,7 @@ import {
   CreateCredentialOfferOptions,
   CreatePresentationRequestOptions,
   RequestedCredential,
-} from '@2060.io/model'
+} from '@2060.io/service-agent-model'
 import { ApiProperty } from '@nestjs/swagger'
 import { IsNotEmpty } from 'class-validator'
 
diff --git a/packages/main/src/controllers/message/MessageController.ts b/packages/main/src/controllers/message/MessageController.ts
index 428accc..81e4ae5 100644
--- a/packages/main/src/controllers/message/MessageController.ts
+++ b/packages/main/src/controllers/message/MessageController.ts
@@ -1,4 +1,4 @@
-import { BaseMessage } from '@2060.io/model'
+import { BaseMessage } from '@2060.io/service-agent-model'
 import { DidExchangeState, utils } from '@credo-ts/core'
 import { Body, Controller, HttpException, HttpStatus, Logger, Post } from '@nestjs/common'
 import { ApiBody, ApiTags } from '@nestjs/swagger'
diff --git a/packages/main/src/controllers/message/MessageService.ts b/packages/main/src/controllers/message/MessageService.ts
index af46493..a74173c 100644
--- a/packages/main/src/controllers/message/MessageService.ts
+++ b/packages/main/src/controllers/message/MessageService.ts
@@ -17,7 +17,7 @@ import {
   EMrtdDataRequestMessage,
   VerifiableCredentialRequestedProofItem,
   RequestedCredential,
-} from '@2060.io/model'
+} from '@2060.io/service-agent-model'
 import { ActionMenuRole, ActionMenuOption } from '@credo-ts/action-menu'
 import { AnonCredsRequestedAttribute } from '@credo-ts/anoncreds'
 import {
diff --git a/packages/main/src/controllers/message/services/CoreMessageService.ts b/packages/main/src/controllers/message/services/CoreMessageService.ts
index fac6965..f0d6899 100644
--- a/packages/main/src/controllers/message/services/CoreMessageService.ts
+++ b/packages/main/src/controllers/message/services/CoreMessageService.ts
@@ -1,4 +1,4 @@
-import { IBaseMessage } from '@2060.io/model'
+import { IBaseMessage } from '@2060.io/service-agent-model'
 import { ConnectionRecord, utils } from '@credo-ts/core'
 import { Injectable, Logger } from '@nestjs/common'
 
diff --git a/packages/main/src/controllers/message/services/MessageServiceFactory.ts b/packages/main/src/controllers/message/services/MessageServiceFactory.ts
index cc10646..68952a5 100644
--- a/packages/main/src/controllers/message/services/MessageServiceFactory.ts
+++ b/packages/main/src/controllers/message/services/MessageServiceFactory.ts
@@ -1,4 +1,4 @@
-import { IBaseMessage } from '@2060.io/model'
+import { IBaseMessage } from '@2060.io/service-agent-model'
 import { ConnectionRecord } from '@credo-ts/core'
 import { InjectQueue } from '@nestjs/bull'
 import { Injectable, Optional } from '@nestjs/common'
diff --git a/packages/main/src/controllers/message/services/RedisMessageService.ts b/packages/main/src/controllers/message/services/RedisMessageService.ts
index dd6a4fe..e0d43c4 100644
--- a/packages/main/src/controllers/message/services/RedisMessageService.ts
+++ b/packages/main/src/controllers/message/services/RedisMessageService.ts
@@ -1,4 +1,4 @@
-import { IBaseMessage } from '@2060.io/model'
+import { IBaseMessage } from '@2060.io/service-agent-model'
 import { ConnectionRecord, utils } from '@credo-ts/core'
 import { Process, Processor } from '@nestjs/bull'
 import { Logger } from '@nestjs/common'
diff --git a/packages/main/src/controllers/presentations/PresentationsController.ts b/packages/main/src/controllers/presentations/PresentationsController.ts
index 96b01c5..6768fba 100644
--- a/packages/main/src/controllers/presentations/PresentationsController.ts
+++ b/packages/main/src/controllers/presentations/PresentationsController.ts
@@ -1,4 +1,4 @@
-import { PresentationData, RequestedCredential, Claim } from '@2060.io/model'
+import { PresentationData, RequestedCredential, Claim } from '@2060.io/service-agent-model'
 import { ProofExchangeRecord } from '@credo-ts/core'
 import {
   BadRequestException,
diff --git a/packages/main/src/events/ConnectionEvents.ts b/packages/main/src/events/ConnectionEvents.ts
index 4608216..ce42c56 100644
--- a/packages/main/src/events/ConnectionEvents.ts
+++ b/packages/main/src/events/ConnectionEvents.ts
@@ -1,7 +1,7 @@
 import type { ServerConfig } from '../utils/ServerConfig'
 import type { AgentMessageProcessedEvent, ConnectionStateChangedEvent } from '@credo-ts/core'
 
-import { ConnectionStateUpdated } from '@2060.io/model'
+import { ConnectionStateUpdated } from '@2060.io/service-agent-model'
 import {
   AgentEventTypes,
   ConnectionEventTypes,
diff --git a/packages/main/src/events/MessageEvents.ts b/packages/main/src/events/MessageEvents.ts
index 4376671..5d33d5d 100644
--- a/packages/main/src/events/MessageEvents.ts
+++ b/packages/main/src/events/MessageEvents.ts
@@ -34,7 +34,7 @@ import {
   VerifiableCredentialSubmittedProofItem,
   MessageStateUpdated,
   MessageReceived,
-} from '@2060.io/model'
+} from '@2060.io/service-agent-model'
 import { MenuRequestMessage, PerformMessage } from '@credo-ts/action-menu'
 import { V1PresentationMessage, V1PresentationProblemReportMessage } from '@credo-ts/anoncreds'
 import { AnonCredsCredentialDefinitionRecordMetadataKeys } from '@credo-ts/anoncreds/build/repository/anonCredsCredentialDefinitionRecordMetadataTypes'
diff --git a/packages/main/src/events/VCAuthnEvents.ts b/packages/main/src/events/VCAuthnEvents.ts
index 61c043b..1b0ee9c 100644
--- a/packages/main/src/events/VCAuthnEvents.ts
+++ b/packages/main/src/events/VCAuthnEvents.ts
@@ -1,4 +1,4 @@
-import { VCAuthnEvent } from '@2060.io/model'
+import { VCAuthnEvent } from '@2060.io/service-agent-model'
 import { ProofEventTypes, ProofState, ProofStateChangedEvent } from '@credo-ts/core'
 
 import { ServerConfig } from '../utils/ServerConfig'
diff --git a/packages/main/src/events/WebhookEvent.ts b/packages/main/src/events/WebhookEvent.ts
index 022bfb0..802554e 100644
--- a/packages/main/src/events/WebhookEvent.ts
+++ b/packages/main/src/events/WebhookEvent.ts
@@ -1,4 +1,4 @@
-import { Event } from '@2060.io/model'
+import { Event } from '@2060.io/service-agent-model'
 import fetch from 'node-fetch'
 
 import { TsLogger } from '../utils/logger'
diff --git a/packages/main/src/utils/parsers.ts b/packages/main/src/utils/parsers.ts
index e316d15..ec291a9 100644
--- a/packages/main/src/utils/parsers.ts
+++ b/packages/main/src/utils/parsers.ts
@@ -1,5 +1,5 @@
 import { PictureData } from '@2060.io/credo-ts-didcomm-user-profile'
-import { didcommMessageState, ServiceAgentMessageReceipt } from '@2060.io/model'
+import { didcommMessageState, ServiceAgentMessageReceipt } from '@2060.io/service-agent-model'
 import { isUri } from '@credo-ts/core/build/utils'
 import { MessageReceipt } from 'credo-ts-receipts'
 
diff --git a/packages/model/package.json b/packages/model/package.json
index 734d88d..bf9e3a8 100644
--- a/packages/model/package.json
+++ b/packages/model/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@2060.io/model",
+  "name": "@2060.io/service-agent-model",
   "main": "build/index",
   "types": "build/index",
   "version": "0.0.1",
diff --git a/packages/model/src/models/events/ConnectionStateUpdated.ts b/packages/model/src/events/ConnectionStateUpdated.ts
similarity index 100%
rename from packages/model/src/models/events/ConnectionStateUpdated.ts
rename to packages/model/src/events/ConnectionStateUpdated.ts
diff --git a/packages/model/src/models/events/Event.ts b/packages/model/src/events/Event.ts
similarity index 100%
rename from packages/model/src/models/events/Event.ts
rename to packages/model/src/events/Event.ts
diff --git a/packages/model/src/models/events/EventType.ts b/packages/model/src/events/EventType.ts
similarity index 100%
rename from packages/model/src/models/events/EventType.ts
rename to packages/model/src/events/EventType.ts
diff --git a/packages/model/src/models/events/MessageReceived.ts b/packages/model/src/events/MessageReceived.ts
similarity index 100%
rename from packages/model/src/models/events/MessageReceived.ts
rename to packages/model/src/events/MessageReceived.ts
diff --git a/packages/model/src/models/events/MessageStateUpdated.ts b/packages/model/src/events/MessageStateUpdated.ts
similarity index 100%
rename from packages/model/src/models/events/MessageStateUpdated.ts
rename to packages/model/src/events/MessageStateUpdated.ts
diff --git a/packages/model/src/models/events/VCAuthnEvent.ts b/packages/model/src/events/VCAuthnEvent.ts
similarity index 100%
rename from packages/model/src/models/events/VCAuthnEvent.ts
rename to packages/model/src/events/VCAuthnEvent.ts
diff --git a/packages/model/src/models/events/index.ts b/packages/model/src/events/index.ts
similarity index 100%
rename from packages/model/src/models/events/index.ts
rename to packages/model/src/events/index.ts
diff --git a/packages/model/src/index.ts b/packages/model/src/index.ts
index ad200c5..c0058a5 100644
--- a/packages/model/src/index.ts
+++ b/packages/model/src/index.ts
@@ -1 +1,3 @@
-export * from './models'
+export * from './messages'
+export * from './events'
+export * from './types'
diff --git a/packages/model/src/models/messages/BaseMessage.ts b/packages/model/src/messages/BaseMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/BaseMessage.ts
rename to packages/model/src/messages/BaseMessage.ts
diff --git a/packages/model/src/models/messages/ContextualMenuRequest.ts b/packages/model/src/messages/ContextualMenuRequest.ts
similarity index 100%
rename from packages/model/src/models/messages/ContextualMenuRequest.ts
rename to packages/model/src/messages/ContextualMenuRequest.ts
diff --git a/packages/model/src/models/messages/ContextualMenuSelect.ts b/packages/model/src/messages/ContextualMenuSelect.ts
similarity index 100%
rename from packages/model/src/models/messages/ContextualMenuSelect.ts
rename to packages/model/src/messages/ContextualMenuSelect.ts
diff --git a/packages/model/src/models/messages/ContextualMenuUpdate.ts b/packages/model/src/messages/ContextualMenuUpdate.ts
similarity index 100%
rename from packages/model/src/models/messages/ContextualMenuUpdate.ts
rename to packages/model/src/messages/ContextualMenuUpdate.ts
diff --git a/packages/model/src/models/messages/CredentialIssuanceMessage.ts b/packages/model/src/messages/CredentialIssuanceMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/CredentialIssuanceMessage.ts
rename to packages/model/src/messages/CredentialIssuanceMessage.ts
diff --git a/packages/model/src/models/messages/CredentialReceptionMessage.ts b/packages/model/src/messages/CredentialReceptionMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/CredentialReceptionMessage.ts
rename to packages/model/src/messages/CredentialReceptionMessage.ts
diff --git a/packages/model/src/models/messages/CredentialRequestMessage.ts b/packages/model/src/messages/CredentialRequestMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/CredentialRequestMessage.ts
rename to packages/model/src/messages/CredentialRequestMessage.ts
diff --git a/packages/model/src/models/messages/IdentityProofRequestMessage.ts b/packages/model/src/messages/IdentityProofRequestMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/IdentityProofRequestMessage.ts
rename to packages/model/src/messages/IdentityProofRequestMessage.ts
diff --git a/packages/model/src/models/messages/IdentityProofResultMessage.ts b/packages/model/src/messages/IdentityProofResultMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/IdentityProofResultMessage.ts
rename to packages/model/src/messages/IdentityProofResultMessage.ts
diff --git a/packages/model/src/models/messages/IdentityProofSubmitMessage.ts b/packages/model/src/messages/IdentityProofSubmitMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/IdentityProofSubmitMessage.ts
rename to packages/model/src/messages/IdentityProofSubmitMessage.ts
diff --git a/packages/model/src/models/messages/InvitationMessage.ts b/packages/model/src/messages/InvitationMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/InvitationMessage.ts
rename to packages/model/src/messages/InvitationMessage.ts
diff --git a/packages/model/src/models/messages/MediaMessage.ts b/packages/model/src/messages/MediaMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/MediaMessage.ts
rename to packages/model/src/messages/MediaMessage.ts
diff --git a/packages/model/src/models/messages/MenuDisplayMessage.ts b/packages/model/src/messages/MenuDisplayMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/MenuDisplayMessage.ts
rename to packages/model/src/messages/MenuDisplayMessage.ts
diff --git a/packages/model/src/models/messages/MenuSelectMessage.ts b/packages/model/src/messages/MenuSelectMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/MenuSelectMessage.ts
rename to packages/model/src/messages/MenuSelectMessage.ts
diff --git a/packages/model/src/models/messages/MessageType.ts b/packages/model/src/messages/MessageType.ts
similarity index 100%
rename from packages/model/src/models/messages/MessageType.ts
rename to packages/model/src/messages/MessageType.ts
diff --git a/packages/model/src/models/messages/ProfileMessage.ts b/packages/model/src/messages/ProfileMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/ProfileMessage.ts
rename to packages/model/src/messages/ProfileMessage.ts
diff --git a/packages/model/src/models/messages/ReceiptsMessage.ts b/packages/model/src/messages/ReceiptsMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/ReceiptsMessage.ts
rename to packages/model/src/messages/ReceiptsMessage.ts
diff --git a/packages/model/src/models/messages/TerminateConnectionMessage.ts b/packages/model/src/messages/TerminateConnectionMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/TerminateConnectionMessage.ts
rename to packages/model/src/messages/TerminateConnectionMessage.ts
diff --git a/packages/model/src/models/messages/TextMessage.ts b/packages/model/src/messages/TextMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/TextMessage.ts
rename to packages/model/src/messages/TextMessage.ts
diff --git a/packages/model/src/models/messages/calls/CallAcceptRequestMessage.ts b/packages/model/src/messages/calls/CallAcceptRequestMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/calls/CallAcceptRequestMessage.ts
rename to packages/model/src/messages/calls/CallAcceptRequestMessage.ts
diff --git a/packages/model/src/models/messages/calls/CallEndRequestMessage.ts b/packages/model/src/messages/calls/CallEndRequestMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/calls/CallEndRequestMessage.ts
rename to packages/model/src/messages/calls/CallEndRequestMessage.ts
diff --git a/packages/model/src/models/messages/calls/CallOfferRequestMessage.ts b/packages/model/src/messages/calls/CallOfferRequestMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/calls/CallOfferRequestMessage.ts
rename to packages/model/src/messages/calls/CallOfferRequestMessage.ts
diff --git a/packages/model/src/models/messages/calls/CallRejectRequestMessage.ts b/packages/model/src/messages/calls/CallRejectRequestMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/calls/CallRejectRequestMessage.ts
rename to packages/model/src/messages/calls/CallRejectRequestMessage.ts
diff --git a/packages/model/src/models/messages/index.ts b/packages/model/src/messages/index.ts
similarity index 100%
rename from packages/model/src/models/messages/index.ts
rename to packages/model/src/messages/index.ts
diff --git a/packages/model/src/models/messages/mrtd/EMrtdDataRequestMessage.ts b/packages/model/src/messages/mrtd/EMrtdDataRequestMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/mrtd/EMrtdDataRequestMessage.ts
rename to packages/model/src/messages/mrtd/EMrtdDataRequestMessage.ts
diff --git a/packages/model/src/models/messages/mrtd/EMrtdDataSubmitMessage.ts b/packages/model/src/messages/mrtd/EMrtdDataSubmitMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/mrtd/EMrtdDataSubmitMessage.ts
rename to packages/model/src/messages/mrtd/EMrtdDataSubmitMessage.ts
diff --git a/packages/model/src/models/messages/mrtd/MrzDataRequestMessage.ts b/packages/model/src/messages/mrtd/MrzDataRequestMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/mrtd/MrzDataRequestMessage.ts
rename to packages/model/src/messages/mrtd/MrzDataRequestMessage.ts
diff --git a/packages/model/src/models/messages/mrtd/MrzDataSubmitMessage.ts b/packages/model/src/messages/mrtd/MrzDataSubmitMessage.ts
similarity index 100%
rename from packages/model/src/models/messages/mrtd/MrzDataSubmitMessage.ts
rename to packages/model/src/messages/mrtd/MrzDataSubmitMessage.ts
diff --git a/packages/model/src/models/messages/proofs/vc/VerifiableCredentialProofItemResult.ts b/packages/model/src/messages/proofs/vc/VerifiableCredentialProofItemResult.ts
similarity index 100%
rename from packages/model/src/models/messages/proofs/vc/VerifiableCredentialProofItemResult.ts
rename to packages/model/src/messages/proofs/vc/VerifiableCredentialProofItemResult.ts
diff --git a/packages/model/src/models/messages/proofs/vc/VerifiableCredentialRequestedProofItem.ts b/packages/model/src/messages/proofs/vc/VerifiableCredentialRequestedProofItem.ts
similarity index 100%
rename from packages/model/src/models/messages/proofs/vc/VerifiableCredentialRequestedProofItem.ts
rename to packages/model/src/messages/proofs/vc/VerifiableCredentialRequestedProofItem.ts
diff --git a/packages/model/src/models/messages/proofs/vc/VerifiableCredentialSubmittedProofItem.ts b/packages/model/src/messages/proofs/vc/VerifiableCredentialSubmittedProofItem.ts
similarity index 100%
rename from packages/model/src/models/messages/proofs/vc/VerifiableCredentialSubmittedProofItem.ts
rename to packages/model/src/messages/proofs/vc/VerifiableCredentialSubmittedProofItem.ts
diff --git a/packages/model/src/models/index.ts b/packages/model/src/models/index.ts
deleted file mode 100644
index c0058a5..0000000
--- a/packages/model/src/models/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './messages'
-export * from './events'
-export * from './types'
diff --git a/packages/model/src/models/types.ts b/packages/model/src/types.ts
similarity index 100%
rename from packages/model/src/models/types.ts
rename to packages/model/src/types.ts