Ensure bsuid is included and add tracking fields

.cursor/.gitignore

@@ -0,0 +1 @@
+plans/

.gitignore

@@ -3,7 +3,9 @@
 /packages/portal/server
 /packages/*/starters
 /packages/*/node_modules
+/packages/*/*/node_modules
 /packages/*/dist
+/packages/*/*/dist
 /packages/*/*/tokens/*
 /packages/*/docs/dist
 /packages/provider/src/venom/tokens
@@ -34,6 +36,7 @@ log/*
 *.tgz
 lib
 tmp/
+!tmp/chatwoot-media/.gitkeep
 .yarn/*
 !.yarn/releases
 !.yarn/plugins/@yarnpkg/plugin-postinstall.cjs

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.1",
+  "version": "1.4.2-alpha.11",
   "packages": [
     "packages/bot",
     "packages/cli",
@@ -25,7 +25,8 @@
     "packages/provider-gohighlevel",
     "packages/provider-email",
     "packages/contexts-dialogflow",
-    "packages/contexts-dialogflow-cx"
+    "packages/contexts-dialogflow-cx",
+    "packages/plugins/chatwoot"
   ],
   "command": {
     "version": {
@@ -34,7 +35,7 @@
         "**/*"
       ],
       "noVerifyAccess": true,
-      "syncWorkspaceLockfile": false
+      "workspaceProtocol": "noop"
     }
   },
   "npmClient": "pnpm",

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@builderbot/root",
-  "version": "1.3.10",
+  "name": "@japcon-bot/root",
+  "version": "1.0.0",
   "description": "Bot de wahtsapp open source para MVP o pequeños negocios",
   "main": "app.js",
   "private": true,
@@ -23,7 +23,8 @@
     "publish:canary": "npx lerna publish from-package --canary",
     "prepare": "npx husky install",
     "publish:dev": "npx lerna publish from-package --dist-tag dev --yes",
-    "next:version": "npx lerna version --force-publish",
+    "check:workspace-deps": "node ./scripts/check-workspace-deps.js",
+    "next:version": "pnpm run check:workspace-deps && npx lerna version --force-publish",
     "preinstall": "npx only-allow pnpm",
     "release": "standard-version -- --prerelease --global",
     "generate:release-summary": "node ./scripts/generate-release-summary.js --version=$(node -p \"require('./lerna.json').version\")",
@@ -45,6 +46,7 @@
   "repository": "https://github.com/leifermendez/bot-whatsapp",
   "license": "ISC",
   "workspaces": [
+    "packages/plugins/*",
     "packages/bot",
     "packages/cli",
     "packages/create-builderbot",

packages/bot/package.json

@@ -1,66 +1,66 @@
 {
-    "name": "@builderbot/bot",
-    "version": "1.4.1",
-    "description": "core typescript",
-    "author": "Leifer Mendez <leifer33@gmail.com>",
-    "homepage": "https://github.com/codigoencasa/bot-whatsapp#readme",
-    "license": "ISC",
-    "main": "dist/index.cjs",
-    "types": "dist/index.d.ts",
-    "type": "module",
-    "scripts": {
-        "build": "rimraf dist && rollup --config",
-        "test": " npx uvu -r tsm ./__tests__ ",
-        "test:coverage": "npx c8  npm run test "
-    },
-    "files": [
-        "./dist/"
-    ],
-    "directories": {
-        "src": "src",
-        "test": "__tests__"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/codigoencasa/bot-whatsapp.git"
-    },
-    "bugs": {
-        "url": "https://github.com/codigoencasa/bot-whatsapp/issues"
-    },
-    "devDependencies": {
-        "@microsoft/api-extractor": "^7.55.2",
-        "@rollup/plugin-commonjs": "^29.0.0",
-        "@rollup/plugin-json": "^6.1.0",
-        "@rollup/plugin-node-resolve": "^16.0.3",
-        "@rollup/plugin-terser": "^0.4.4",
-        "@types/body-parser": "^1.19.6",
-        "@types/cors": "^2.8.19",
-        "@types/fluent-ffmpeg": "^2.1.28",
-        "@types/follow-redirects": "^1.14.4",
-        "@types/mime-types": "^2.1.4",
-        "@types/node": "^24.10.2",
-        "@types/polka": "^0.5.8",
-        "@types/proxyquire": "^1.3.31",
-        "@types/sinon": "^17.0.4",
-        "proxyquire": "^2.1.3",
-        "rimraf": "^6.1.2",
-        "rollup-plugin-typescript2": "^0.36.0",
-        "sinon": "^17.0.1",
-        "tslib": "^2.8.1",
-        "tsm": "^2.3.0"
-    },
-    "dependencies": {
-        "@ffmpeg-installer/ffmpeg": "^1.1.0",
-        "body-parser": "^2.2.1",
-        "cors": "^2.8.5",
-        "fluent-ffmpeg": "^2.1.3",
-        "follow-redirects": "^1.15.11",
-        "mime-types": "^3.0.2",
-        "picocolors": "^1.1.1",
-        "polka": "^0.5.2"
-    },
-    "optionalDependencies": {
-        "sharp": "0.33.3"
-    },
-    "gitHead": "b36178dfb87da8ce270e28b6daaff2c50374b6eb"
+  "name": "@japcon-bot/bot",
+  "version": "1.4.2-alpha.11",
+  "description": "core typescript",
+  "author": "Leifer Mendez <leifer33@gmail.com>",
+  "homepage": "https://github.com/codigoencasa/bot-whatsapp#readme",
+  "license": "ISC",
+  "main": "dist/index.cjs",
+  "types": "dist/index.d.ts",
+  "type": "module",
+  "scripts": {
+    "build": "rimraf dist && rollup --config",
+    "test": " npx uvu -r tsm ./__tests__ ",
+    "test:coverage": "npx c8  npm run test "
+  },
+  "files": [
+    "./dist/"
+  ],
+  "directories": {
+    "src": "src",
+    "test": "__tests__"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/codigoencasa/bot-whatsapp.git"
+  },
+  "bugs": {
+    "url": "https://github.com/codigoencasa/bot-whatsapp/issues"
+  },
+  "devDependencies": {
+    "@microsoft/api-extractor": "^7.55.2",
+    "@rollup/plugin-commonjs": "^29.0.0",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@types/body-parser": "^1.19.6",
+    "@types/cors": "^2.8.19",
+    "@types/fluent-ffmpeg": "^2.1.28",
+    "@types/follow-redirects": "^1.14.4",
+    "@types/mime-types": "^2.1.4",
+    "@types/node": "^24.10.2",
+    "@types/polka": "^0.5.8",
+    "@types/proxyquire": "^1.3.31",
+    "@types/sinon": "^17.0.4",
+    "proxyquire": "^2.1.3",
+    "rimraf": "^6.1.2",
+    "rollup-plugin-typescript2": "^0.36.0",
+    "sinon": "^17.0.1",
+    "tslib": "^2.8.1",
+    "tsm": "^2.3.0"
+  },
+  "dependencies": {
+    "@ffmpeg-installer/ffmpeg": "^1.1.0",
+    "body-parser": "^2.2.1",
+    "cors": "^2.8.5",
+    "fluent-ffmpeg": "^2.1.3",
+    "follow-redirects": "^1.15.11",
+    "mime-types": "^3.0.2",
+    "picocolors": "^1.1.1",
+    "polka": "^0.5.2"
+  },
+  "optionalDependencies": {
+    "sharp": "0.33.3"
+  },
+  "gitHead": "be4c4287fe2fa5847968c98c3d9d32088edeaca3"
 }

packages/bot/src/core/coreClass.ts

@@ -64,17 +64,18 @@ class CoreClass<P extends ProviderClass = any, D extends MemoryDB = any> extends
      * - Setup provider
      * - Setup generalArgs
      */
-    constructor(_flow: any, _database: D, _provider: P, _args: GeneralArgs) {
+    constructor(_flow: any, _database: D, _provider: P, _args: GeneralArgs | null | undefined) {
         super()
         this.flowClass = _flow
         this.database = _database
         this.provider = _provider
+        const args = _args ?? {}
         this.generalArgs = {
             ...this.generalArgs,
-            ..._args,
+            ...args,
             logs: {
                 ...this.generalArgs.logs,
-                ..._args.logs,
+                ...(args.logs ?? {}),
             },
         }
 
@@ -141,7 +142,7 @@ class CoreClass<P extends ProviderClass = any, D extends MemoryDB = any> extends
     handleMsg = async (messageCtxInComing: MessageContextIncoming) => {
         logger.log(`[handleMsg]: `, messageCtxInComing)
         idleForCallback.stop(messageCtxInComing)
-        const { body, from } = messageCtxInComing
+        const { body, from, source_id, source_type, ctwa_id } = messageCtxInComing
         let msgToSend = []
         let endFlowFlag = this.stateHandler.get(from)('__end_flow__') || false
         const fallBackFlag = false
@@ -158,6 +159,9 @@ class CoreClass<P extends ProviderClass = any, D extends MemoryDB = any> extends
                 body,
                 from,
                 prevRef: prevMsg.refSerialize,
+                source_id,
+                source_type,
+                ctwa_id,
             })
             await this.database.save(ctxByNumber)
         }
@@ -206,6 +210,9 @@ class CoreClass<P extends ProviderClass = any, D extends MemoryDB = any> extends
                 keyword,
                 index,
                 options: { media, buttons, capture, delay },
+                source_id,
+                source_type,
+                ctwa_id,
             })
         }
 

packages/bot/src/io/methods/toCtx.ts

@@ -10,20 +10,36 @@ interface ToCtxParams {
     keyword?: string
     options?: Options
     index?: number
+    source_id?: string
+    source_type?: string
+    ctwa_id?: string
 }
 
 /**
  * @param params ToCtxParams
  * @returns Context
  */
-const toCtx = ({ body, from, prevRef, keyword, options = {}, index }: ToCtxParams): TContext => {
+const toCtx = ({
+    body,
+    from,
+    prevRef,
+    keyword,
+    options = {},
+    index,
+    source_id,
+    source_type,
+    ctwa_id,
+}: ToCtxParams): TContext => {
     return {
         ref: generateRef(),
         keyword: prevRef ?? keyword,
         answer: body,
         options: options,
         from,
         refSerialize: generateRefSerialize({ index, answer: body }),
+        source_id,
+        source_type,
+        ctwa_id,
     }
 }
 

packages/bot/src/types.ts

@@ -96,6 +96,9 @@ export type MessageContextIncoming = {
     ref?: string
     body?: string
     host?: string
+    source_id?: string
+    source_type?: string
+    ctwa_id?: string
 }
 
 /**
@@ -224,6 +227,9 @@ export interface TContext {
     keyword: string | string[]
     from?: string
     answer?: string | string[]
+    source_id?: string
+    source_type?: string
+    ctwa_id?: string
     refSerialize?: string
     endFlow?: boolean
     options: TCTXoptions