Skip to content

Merge upstream 20260203#8

Merged
brunoborges merged 5 commits intomainfrom
merge-upstream-20260203
Feb 3, 2026
Merged

Merge upstream 20260203#8
brunoborges merged 5 commits intomainfrom
merge-upstream-20260203

Conversation

@brunoborges
Copy link
Member

No description provided.

- Change ask-user to ask_user snapshot directory name
- Change mcp-and-agents to mcp_and_agents snapshot directory name
- Add fake token for CI environment to avoid auth issues in E2E tests
- Add isAlive() and restart() methods to CapiProxy for crash recovery
- Add ensureProxyAlive() to E2ETestContext to restart proxy if crashed
- Fix testSendAndWaitThrowsOnTimeout to use correct snapshot and prompt
- Skip testSendAndWaitThrowsOnTimeout in CI (no snapshot to replay)
- Update pom.xml to checkout specific commit from .lastmerge for reproducible builds
Upstream changes since last merge:
- 73c1431: Update all dependencies (#332)
- 685df87: [go] Accept and propagate context (#340)

No Java SDK changes required - only dependency updates and Go-specific changes.
@brunoborges brunoborges merged commit face1a7 into main Feb 3, 2026
2 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.

1 participant