Skip to content

chore(workflow-executor): merge main into the server-step-mapper branch#1637

Merged
Scra3 merged 19 commits into
feat/prd-214-server-step-mapperfrom
chore/sync-main-into-mapper
Jun 9, 2026
Merged

chore(workflow-executor): merge main into the server-step-mapper branch#1637
Scra3 merged 19 commits into
feat/prd-214-server-step-mapperfrom
chore/sync-main-into-mapper

Conversation

@Scra3

@Scra3 Scra3 commented Jun 9, 2026

Copy link
Copy Markdown
Member

What

Merges main into feat/prd-214-server-step-mapper to keep the long-lived integration branch current and resolve the accumulated conflicts.

Conflicts resolved

  • package.json (resolutions): kept the union of both sides — mapper's @modelcontextprotocol/sdk/hono + ajv/fast-uri and main's @fastify/ajv-compiler/fast-uri + fast-json-stringify/fast-uri.
  • yarn.lock: reconciled via yarn install against the merged package.json.

Verified vs main (no version regression)

  • All package versions match main (agent 1.78.13, ai-proxy 1.10.1, agent-client 1.5.10, forestadmin-client 1.39.9, mcp-server 1.11.11, agent-testing 1.1.23, forest-cloud 1.12.124, datasource-mongo/mongoose).
  • Security-pinned deps match main: tar 7.5.13, qs 6.15.1, fast-xml-parser 5.8.0, ip-address 10.2.0, fast-uri 3.1.2.
  • main's 18 commits were chore(release) version bumps + 2 Dependabot security patches — all integrated.

🤖 Generated with Claude Code

Note

Update dependency resolutions and bump ws to ^8.20.1

  • Updates resolution mappings in package.json: removes **/@langchain/langgraph-sdk/uuid and **/socks/ip-address, and adds **/@fastify/ajv-compiler/fast-uri and **/fast-json-stringify/fast-uri pinned to ^3.1.2.
  • Bumps ws from ^8.16.0 to ^8.20.1 in packages/forest-cloud/package.json.
  • Updates yarn.lock to reflect the above changes.

Macroscope summarized 1a0964e.

matthv and others added 19 commits May 20, 2026 11:42
…-375] (#1588)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
# @forestadmin/ai-proxy [1.10.0](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/ai-proxy@1.9.0...@forestadmin/ai-proxy@1.10.0) (2026-05-20)

### Features

* **ai-proxy:** export FOREST_INTEGRATION_NAMES as runtime const [PRD-375] ([#1588](#1588)) ([89f4f64](89f4f64))
## @forestadmin/agent-client [1.5.9](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent-client@1.5.8...@forestadmin/agent-client@1.5.9) (2026-05-20)

### Dependencies

* **@forestadmin/forestadmin-client:** upgraded to 1.39.8
## @forestadmin/mcp-server [1.11.10](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/mcp-server@1.11.9...@forestadmin/mcp-server@1.11.10) (2026-05-20)

### Dependencies

* **@forestadmin/agent-client:** upgraded to 1.5.9
* **@forestadmin/forestadmin-client:** upgraded to 1.39.8
## @forestadmin/agent [1.78.12](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent@1.78.11...@forestadmin/agent@1.78.12) (2026-05-20)

### Dependencies

* **@forestadmin/forestadmin-client:** upgraded to 1.39.8
* **@forestadmin/mcp-server:** upgraded to 1.11.10
## @forestadmin/agent-testing [1.1.22](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent-testing@1.1.21...@forestadmin/agent-testing@1.1.22) (2026-05-20)

### Dependencies

* **@forestadmin/agent-client:** upgraded to 1.5.9
* **@forestadmin/forestadmin-client:** upgraded to 1.39.8
* **@forestadmin/agent:** upgraded to 1.78.12
…[PRD-375] (#1589)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
## @forestadmin/ai-proxy [1.10.1](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/ai-proxy@1.10.0...@forestadmin/ai-proxy@1.10.1) (2026-05-20)

### Bug Fixes

* **ai-proxy:** re-export FOREST_INTEGRATION_NAMES from package index [PRD-375] ([#1589](#1589)) ([909d050](909d050))
## @forestadmin/agent-client [1.5.10](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent-client@1.5.9...@forestadmin/agent-client@1.5.10) (2026-05-20)

### Dependencies

* **@forestadmin/forestadmin-client:** upgraded to 1.39.9
## @forestadmin/mcp-server [1.11.11](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/mcp-server@1.11.10...@forestadmin/mcp-server@1.11.11) (2026-05-20)

### Dependencies

* **@forestadmin/agent-client:** upgraded to 1.5.10
* **@forestadmin/forestadmin-client:** upgraded to 1.39.9
## @forestadmin/agent [1.78.13](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent@1.78.12...@forestadmin/agent@1.78.13) (2026-05-20)

### Dependencies

* **@forestadmin/forestadmin-client:** upgraded to 1.39.9
* **@forestadmin/mcp-server:** upgraded to 1.11.11
## @forestadmin/agent-testing [1.1.23](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/agent-testing@1.1.22...@forestadmin/agent-testing@1.1.23) (2026-05-20)

### Dependencies

* **@forestadmin/agent-client:** upgraded to 1.5.10
* **@forestadmin/forestadmin-client:** upgraded to 1.39.9
* **@forestadmin/agent:** upgraded to 1.78.13
- Bump `ws` from ^8.16.0 → ^8.20.1 in `@forestadmin/forest-cloud`
  (closes alert #364: uninitialized memory disclosure).
- Add scoped resolutions pinning `fast-uri` to ^3.1.2 in
  `@fastify/ajv-compiler` and `fast-json-stringify` chains
  (closes #357 and #358: host confusion / path traversal).
- Drop 4 redundant resolutions whose natural resolutions already
  satisfy the original pin: `**/socks/ip-address`,
  `**/ajv/fast-uri`, `**/@langchain/langgraph-sdk/uuid`,
  `**/@modelcontextprotocol/sdk/hono`.

Co-authored-by: Claude <noreply@anthropic.com>
…tep-mapper

# Conflicts:
#	package.json
#	yarn.lock
@qltysh

qltysh Bot commented Jun 9, 2026

Copy link
Copy Markdown

Qlty


Coverage Impact

Unable to calculate total coverage change because base branch coverage was not found.

🚦 See full report on Qlty Cloud »

🛟 Help
  • Diff Coverage: Coverage for added or modified lines of code (excludes deleted files). Learn more.

  • Total Coverage: Coverage for the whole repository, calculated as the sum of all File Coverage. Learn more.

  • File Coverage: Covered Lines divided by Covered Lines plus Missed Lines. (Excludes non-executable lines including blank lines and comments.)

    • Indirect Changes: Changes to File Coverage for files that were not modified in this PR. Learn more.

@Scra3 Scra3 merged commit 29afbf0 into feat/prd-214-server-step-mapper Jun 9, 2026
30 checks passed
@Scra3 Scra3 deleted the chore/sync-main-into-mapper branch June 9, 2026 09:07
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.

5 participants