Skip to content

fix/mcp-lazy-rebased-for-upstream: rebased onto latest dev - #1

Open
seglo wants to merge 1649 commits into
stephanschielke:fix/mcp-lazy-rebased-for-upstreamfrom
seglo:fix/mcp-lazy-rebased-for-upstream
Open

seglo wants to merge 1649 commits into
stephanschielke:fix/mcp-lazy-rebased-for-upstreamfrom
seglo:fix/mcp-lazy-rebased-for-upstream

Conversation

@seglo

@seglo seglo commented Jun 17, 2026

Copy link
Copy Markdown

Summary

  • Rebased fix/mcp-lazy-rebased-for-upstream onto the latest dev branch
  • Resolved merge conflict in packages/opencode/test/tool/registry.test.ts (both MCP import and upstream schema imports preserved)
  • Fixed pre-existing type error in packages/opencode/src/bus/global.ts to pass typecheck

Hona and others added 30 commits June 7, 2026 07:54
@github-actions

Copy link
Copy Markdown

This PR doesn't fully meet our contributing guidelines and PR template.

What needs to be fixed:

  • PR description is missing required template sections. Please use the PR template.

Please edit this PR description to address the above within 2 hours, or it will be automatically closed.

If you believe this was flagged incorrectly, please let a maintainer know.

@github-actions

Copy link
Copy Markdown

Hey! Your PR title fix/mcp-lazy-rebased-for-upstream: rebased onto latest dev doesn't follow conventional commit format.

Please update it to start with one of:

  • feat: or feat(scope): new feature
  • fix: or fix(scope): bug fix
  • docs: or docs(scope): documentation changes
  • chore: or chore(scope): maintenance tasks
  • refactor: or refactor(scope): code refactoring
  • test: or test(scope): adding or updating tests

Where scope is the package name (e.g., app, desktop, opencode).

See CONTRIBUTING.md for details.

stephanschielke and others added 5 commits June 17, 2026 18:54
closeClient now kills descendant MCP processes on disconnect.
instance-store evicts LRU instances beyond OPENCODE_MAX_INSTANCES (default 5).
Ignore .sisyphus/, agents.json.txt, .bin-vault/ in git.
Document MCP lifecycle behavior and orphan prevention in AGENTS.md.
Cherry-pick of TheOutdoorProgrammer's original feat commit (9f84574),
conflict-resolved against current upstream/dev, with the following fixes:

- Port mcp-search.ts from async namespace to Effect service architecture
- Use Schema.Struct for parameters (LLM gets proper JSON schema with field names)
- Accept mcp_name/tool_name/arguments as aliases (weak model resilience)
- Updated tool description with explicit param docs and workflow examples
- Add mcpServers() to SystemPrompt for mcp_lazy system prompt injection
- Provide MCP/Config layers in SystemPrompt and ToolRegistry defaultLayer
- Use Effect.serviceOption for optional MCP in ToolRegistry (no crash when disabled)
- Updated system.test.ts and registry.test.ts for new layer requirements

Co-authored-by: TheOutdoorProgrammer <[email protected]>
@seglo
seglo force-pushed the fix/mcp-lazy-rebased-for-upstream branch from d7d9342 to 4e3b2d6 Compare June 17, 2026 23:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.