Skip to content

chore: merge strands-agents/sdk-typescript into monorepo#2350

Merged
zastrowm merged 477 commits into
strands-agents:mainfrom
zastrowm:merge-in-typescript
May 28, 2026
Merged

chore: merge strands-agents/sdk-typescript into monorepo#2350
zastrowm merged 477 commits into
strands-agents:mainfrom
zastrowm:merge-in-typescript

Conversation

@zastrowm
Copy link
Copy Markdown
Member

@zastrowm zastrowm commented May 27, 2026

Caution

DO NOT squash or rebase — this must be merged with a merge commit to preserve the full TypeScript SDK git history.

Description

Second repository merge in the monorepo convergence series (see #2286). Previous: #2339 (docs). Next: mcp-server.

Merge the strands-agents/sdk-typescript repository into the monorepo with full commit history preserved. The TypeScript SDK's existing workspace structure lands at root level with minimal changes needed.

Layout:

  • strands-ts/ — TypeScript SDK source
  • strands-wasm/ — WASM bindings
  • strands-py-wasm/ — Python WASM bindings
  • strandly/ — CLI tooling
  • wit/ — WIT interface definitions
  • dev-docs/ — TypeScript development documentation
  • package.json, package-lock.json — npm workspace root at repo root
  • pyproject.toml — shared monorepo Python tooling (not published)

Key decisions:

  • All TypeScript workflows already carried a typescript- prefix with path filters — no renaming needed
  • typescript/v* namespaced tags created for all 26 existing releases
  • Issue templates updated to generalized multi-language versions (SDK Language dropdown)
  • .gitignore combined as union of Python, TypeScript, and shared patterns
  • dependabot.yml gained npm / entry with ci(typescript) prefix and pip /strands-py-wasm entry
  • TypeScript integrated into CI gate (ci.yml now routes Python, TypeScript, and Docs)
  • Removed duplicate license files (LICENSE, site/LICENSE, strands-py-wasm/LICENSE.*) — root LICENSE.APACHE + LICENSE.MIT are canonical

Conflict resolutions:

File Resolution
README.md Monorepo version (ours)
CONTRIBUTING.md Monorepo version (ours)
.github/PULL_REQUEST_TEMPLATE.md Monorepo version (ours)
.github/workflows/auto-strands-review.yml Monorepo version (ours)
.github/workflows/strands-command.yml Monorepo version (ours)
.github/ISSUE_TEMPLATE/bug_report.yml Theirs (generalized for multi-language)
.github/ISSUE_TEMPLATE/config.yml Theirs (identical content)
.gitignore Combined (union of all patterns)
.github/dependabot.yml Merged — added npm and pip entries

CI gate updates

  • Added TypeScript path detection and job to ci.yml
  • Removed pull_request trigger from typescript-pr-and-push.yml (gate handles PR routing)
  • Added workflow_call trigger to typescript-pr-and-push.yml
  • Removed top-level concurrency block (incompatible with workflow_call)
  • Added || github.sha fallback for ref in sub-workflow calls

Related Issues

#2286

Documentation PR

N/A — repository convergence.

Type of Change

Other (please describe): Repository convergence — merging TypeScript SDK history into monorepo.

Testing

Validated on fork (zastrowm/sdk-python) via workflow_dispatch:

  • CI Gate — TypeScript jobs all pass (security audit, code quality, tests across Node 20/22/24 on ubuntu/macos/windows)

  • CI Gate — Python and Docs jobs pass alongside TypeScript

  • TypeScript: Pull Request and Push — standalone workflow_dispatch passes

  • I ran hatch run prepare

Checklist

  • I have read the CONTRIBUTING document
  • I have added any necessary tests that prove my fix is effective or my feature works
  • I have updated the documentation accordingly
  • I have added an appropriate example to the documentation to outline the feature, or no new docs are needed
  • My changes generate no new warnings
  • Any dependent changes have been merged and published

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

lizradway and others added 30 commits March 2, 2026 16:22
Co-authored-by: Mackenzie Zastrow <zastrowm@users.noreply.github.com>
Co-authored-by: Mackenzie Zastrow <zastrowm@users.noreply.github.com>
…gents#605)

Co-authored-by: Mackenzie Zastrow <zastrowm@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…gents#569)

Co-authored-by: Mackenzie Zastrow <zastrowm@users.noreply.github.com>
…gents#609)

Co-authored-by: Strands Agent <217235299+strands-agent@users.noreply.github.com>
Co-authored-by: Dean Schmigelski <dbschmigelski+github@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…gents#496)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…nts#526)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@github-actions github-actions Bot removed the size/xl label May 27, 2026
@zastrowm zastrowm force-pushed the merge-in-typescript branch from 7c4bc10 to d0ea0ae Compare May 27, 2026 22:50
@github-actions github-actions Bot added size/xl and removed size/xl labels May 27, 2026
@zastrowm zastrowm changed the title chore: Merge strands-agents/sdk-typescript into monorepo chore: merge strands-agents/sdk-typescript into monorepo May 27, 2026
zastrowm added 2 commits May 28, 2026 09:54
Merge the TypeScript SDK repository (strands-agents/sdk-typescript)
with full commit history.

Layout:
- strands-ts/ — TypeScript SDK source
- strands-wasm/ — WASM bindings
- strands-py-wasm/ — Python WASM bindings
- strandly/ — CLI tooling
- wit/ — WIT interface definitions
- dev-docs/ — TypeScript development documentation
- package.json, package-lock.json — npm workspace root

Workflows: all TypeScript workflows already carry a `typescript-`
prefix with path filters.

Conflict resolutions:
- README.md: keep monorepo version (ours)
- CONTRIBUTING.md: keep monorepo version (ours)
- .github/PULL_REQUEST_TEMPLATE.md: keep monorepo version (ours)
- .github/workflows/auto-strands-review.yml: keep monorepo (ours)
- .github/workflows/strands-command.yml: keep monorepo (ours)
- .github/ISSUE_TEMPLATE/bug_report.yml: take theirs (generalized
  for multi-language with SDK Language dropdown)
- .github/ISSUE_TEMPLATE/config.yml: take theirs (identical content)
- .gitignore: combined (union of all patterns)
- .github/dependabot.yml: merged — added npm / with ci(typescript)
  prefix and pip /strands-py-wasm entry

Also removes duplicate license files:
- LICENSE (duplicate of LICENSE.APACHE minus trailing newline)
- site/LICENSE (duplicate of root LICENSE.APACHE)
- strands-py-wasm/LICENSE.APACHE and LICENSE.MIT (duplicates of root)
- Add typescript path detection and job to ci.yml
- Remove pull_request trigger and concurrency block from
  typescript-pr-and-push.yml (incompatible with workflow_call)
- Add workflow_call trigger
- Add || github.sha fallback for ref in sub-workflow calls
@zastrowm zastrowm force-pushed the merge-in-typescript branch from d0ea0ae to ccdb99e Compare May 28, 2026 13:56
@github-actions github-actions Bot added size/xl and removed size/xl labels May 28, 2026
@zastrowm zastrowm marked this pull request as ready for review May 28, 2026 14:03
Comment thread strands-py-wasm/pyproject.toml
Comment thread strands-py-wasm/pyproject.toml
Comment thread .github/workflows/typescript-npm-publish-on-release.yml
@github-actions
Copy link
Copy Markdown
Contributor

Assessment: Comment

The merge itself is clean — only 7 files actually differ from main, and the TypeScript SDK history is preserved correctly. The license consolidation, CI integration, and conflict resolutions all look sound.

Review Categories
  • Packaging: strands-py-wasm/pyproject.toml has broken license-files paths and stale repository URLs after the license consolidation and monorepo merge.
  • CI/Publish: The NPM publish workflow may be missing explicit NODE_AUTH_TOKEN — worth verifying this still works with the npm environment.

Well-structured convergence PR with excellent documentation of conflict resolutions and key decisions.

@zastrowm zastrowm merged commit edcaf29 into strands-agents:main May 28, 2026
85 of 90 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.