Skip to content

Resolve conflicts 05 07 26#133

Merged
asafcohenpx merged 26 commits into
mainfrom
resolve-conflicts-05-07-26
Jul 5, 2026
Merged

Resolve conflicts 05 07 26#133
asafcohenpx merged 26 commits into
mainfrom
resolve-conflicts-05-07-26

Conversation

@asafcohenpx

Copy link
Copy Markdown
Collaborator

No description provided.

DorAshkenaziHuman and others added 26 commits September 8, 2025 16:33
* release: v1.0.1 with Docker marketplace support

- Upgrade docker/build-push-action from v4 to v6 for annotations support
- Add required Google Cloud Marketplace annotation to manifest index
- Update version from 1.1.0 to 1.0.1 for proper release sequence
- Include Docker container support with multi-platform builds
- Add graceful shutdown on SIGINT/SIGTERM signals

* Update CHANGELOG for version 1.0.1

Updated release date for version 1.0.1 and added Docker support.
- Fix service name annotation to use full Google Cloud endpoints format
- Update to services/human-mcp-server.endpoints.px-gcp-marketplace-prod.cloud.goog
- This matches the exact format expected by Google Cloud Marketplace verification
- Bump version to 1.0.2
* Changed docker image registry location

* Remove old Docker tags from cd.yaml

Removed deprecated Docker tags from the workflow.
- Update version from 1.0.3 to 1.0.4
- Update changelog with version bump note
- Resolves NPM publish conflict for 1.0.3
Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 8.42.0 to 8.43.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.43.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-version: 8.43.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 8.42.0 to 8.43.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.43.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-version: 8.43.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4 to 5.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [lint-staged](https://github.com/lint-staged/lint-staged) from 16.1.6 to 16.2.0.
- [Release notes](https://github.com/lint-staged/lint-staged/releases)
- [Changelog](https://github.com/lint-staged/lint-staged/blob/main/CHANGELOG.md)
- [Commits](lint-staged/lint-staged@v16.1.6...v16.2.0)

---
updated-dependencies:
- dependency-name: lint-staged
  dependency-version: 16.2.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@modelcontextprotocol/sdk](https://github.com/modelcontextprotocol/typescript-sdk) from 1.17.5 to 1.18.1.
- [Release notes](https://github.com/modelcontextprotocol/typescript-sdk/releases)
- [Commits](modelcontextprotocol/typescript-sdk@1.17.5...1.18.1)

---
updated-dependencies:
- dependency-name: "@modelcontextprotocol/sdk"
  dependency-version: 1.18.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [chai](https://github.com/chaijs/chai) from 5.3.3 to 6.2.0.
- [Release notes](https://github.com/chaijs/chai/releases)
- [Changelog](https://github.com/chaijs/chai/blob/main/History.md)
- [Commits](chaijs/chai@v5.3.3...v6.2.0)

---
updated-dependencies:
- dependency-name: chai
  dependency-version: 6.2.0
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 8.44.0 to 8.45.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.45.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-version: 8.45.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix: README updates

* fix links
Updated Node.js version from 22.x to 24.x and added npm update step.
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [@modelcontextprotocol/sdk](https://github.com/modelcontextprotocol/typescript-sdk) from 1.18.1 to 1.20.2.
- [Release notes](https://github.com/modelcontextprotocol/typescript-sdk/releases)
- [Commits](modelcontextprotocol/typescript-sdk@1.18.1...1.20.2)

---
updated-dependencies:
- dependency-name: "@modelcontextprotocol/sdk"
  dependency-version: 1.20.2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* 1.0.4 (#75)

* release: v1.0.1 with Docker marketplace support (#70)

* release: v1.0.1 with Docker marketplace support

- Upgrade docker/build-push-action from v4 to v6 for annotations support
- Add required Google Cloud Marketplace annotation to manifest index
- Update version from 1.1.0 to 1.0.1 for proper release sequence
- Include Docker container support with multi-platform builds
- Add graceful shutdown on SIGINT/SIGTERM signals

* Update CHANGELOG for version 1.0.1

Updated release date for version 1.0.1 and added Docker support.

* release: v1.0.2 with correct marketplace service name

- Fix service name annotation to use full Google Cloud endpoints format
- Update to services/human-mcp-server.endpoints.px-gcp-marketplace-prod.cloud.goog
- This matches the exact format expected by Google Cloud Marketplace verification
- Bump version to 1.0.2

* update package-lock.json for version 1.0.2

* Changed docker image registry location (#73)

* Changed docker image registry location

* Remove old Docker tags from cd.yaml

Removed deprecated Docker tags from the workflow.

* bump version to 1.0.4 to resolve NPM publish conflict

- Update version from 1.0.3 to 1.0.4
- Update changelog with version bump note
- Resolves NPM publish conflict for 1.0.3

* Fix API token links in README (#110)

Updated API token links for Cyberfraud and Code Defender in the support section.

* adjust to new routes

---------

Co-authored-by: DorAshkenaziHuman <dor.ashkenazi@humansecurity.com>
Co-authored-by: Gilad Winterfeld <67740138+giladwpx@users.noreply.github.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
* raw activities capablities and query search
# Conflicts:
#	CHANGELOG.md
#	package.json
#	src/services/cyberfraudService.ts
#	src/tools/getTrafficData.ts
#	src/types/cyberfraud/trafficData.ts
#	test/services/cyberfraudService.test.ts
@asafcohenpx asafcohenpx merged commit 4845c6d into main Jul 5, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants