Add amazonbedrock support #106

marckraw · 2025-11-25T10:25:26Z

No description provided.

changeset-bot · 2025-11-25T10:25:31Z

🦋 Changeset detected

Latest commit: 2bfa6a4

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 7 packages

Name	Type
@mrck-labs/grid-core	Minor
@mrck-labs/grid-agents	Patch
@mrck-labs/grid-workflows	Major
express-test	Patch
hono-test	Patch
nextjs-test	Patch
terminal-agent	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

vercel · 2025-11-25T10:25:31Z

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Preview	Comments	Updated (UTC)
grid-docs	Ready	Preview	Comment	Nov 25, 2025 2:14pm

Copilot

Pull request overview

This PR adds support for Amazon Bedrock as an AI provider, enabling the use of Claude, Llama, Titan, and other models hosted on AWS Bedrock. The implementation integrates the @ai-sdk/amazon-bedrock package and extends the existing LLM service architecture to support provider-specific options like Bedrock guardrails.

Key Changes:

Added @ai-sdk/amazon-bedrock dependency (v2.2.8) and integrated it into the LLM service
Introduced ProviderOptionsMap type system to support provider-specific options across different AI providers
Updated LLM service methods to handle Bedrock provider and forward provider-specific options

Reviewed changes

Copilot reviewed 5 out of 6 changed files in this pull request and generated 9 comments.

Show a summary per file

File	Description
pnpm-lock.yaml	Added @ai-sdk/amazon-bedrock package (v2.2.12) and its dependencies including AWS crypto utilities and Smithy packages
packages/core/package.json	Added @ai-sdk/amazon-bedrock dependency with version constraint ^2.2.8
packages/core/src/types/llm.types.ts	Defined provider-specific option types (BedrockProviderOptions, AnthropicProviderOptions, OpenAIProviderOptions) and ProviderOptionsMap interface
packages/core/src/services/base.llm.service.ts	Integrated Bedrock provider throughout all LLM methods and added providerOptions parameter forwarding
packages/core/src/factories/configurable-agent.factory.ts	Contains unrelated MCP client lifecycle management changes and formatting updates

Files not reviewed (1)

pnpm-lock.yaml: Language not supported

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-11-25T10:29:53Z

packages/core/src/factories/configurable-agent.factory.ts

+    // Cleanup method to close MCP connections when agent is done
+    cleanup: async () => {
+      if (mcpClientService) {
+        try {
+          console.log(`[${config.id}] Closing MCP clients...`);
+          await mcpClientService.closeAll();
+          console.log(`[${config.id}] ✅ MCP clients closed`);
+        } catch (error) {
+          console.error(`[${config.id}] Error closing MCP clients:`, error);
+        }
+      }
+    },


[nitpick] This change appears to be unrelated to the "Add amazonbedrock support" PR. The addition of a cleanup method for MCP clients should be in a separate PR. Mixing unrelated changes makes it harder to review and potentially revert changes if needed.

Suggested change

// Cleanup method to close MCP connections when agent is done

cleanup: async () => {

if (mcpClientService) {

try {

console.log(`[${config.id}] Closing MCP clients...`);

await mcpClientService.closeAll();

console.log(`[${config.id}] ✅ MCP clients closed`);

} catch (error) {

console.error(`[${config.id}] Error closing MCP clients:`, error);

}

}

},

Copilot · 2025-11-25T10:29:54Z

packages/core/src/services/base.llm.service.ts

        temperature,
        maxOutputTokens,
+        // Forward provider-specific options (bedrock guardrails, anthropic cache, etc.)
+        ...(providerOptions ? { providerOptions } : {}),


The providerOptions object should not be nested under a providerOptions key when passing to AI SDK functions. The AI SDK expects provider-specific options (like guardrailConfig for Bedrock) to be passed directly at the top level of the configuration object.

Instead of:

...(providerOptions ? { providerOptions } : {})

It should be:

...(providerOptions?.bedrock || {}), ...(providerOptions?.anthropic || {}), ...(providerOptions?.openai || {}),

Or filter to only spread options for the current provider:

...(providerOptions?.[sdkProvider] || {})

Suggested change

...(providerOptions ? { providerOptions } : {}),

...(providerOptions?.[sdkProvider] || {}),

Copilot · 2025-11-25T10:29:54Z

packages/core/src/services/base.llm.service.ts

      maxOutputTokens,
      tools,
+      // Forward provider-specific options (bedrock guardrails, anthropic cache, etc.)
+      ...(providerOptions ? { providerOptions } : {}),


The providerOptions object should not be nested under a providerOptions key when passing to AI SDK functions. The AI SDK expects provider-specific options to be passed directly at the top level. This should be updated to spread only the relevant provider's options based on the sdkProvider variable.

For example:

...(providerOptions?.[sdkProvider] || {})

Suggested change

...(providerOptions ? { providerOptions } : {}),

...(providerOptions?.[sdkProvider] || {}),

Copilot · 2025-11-25T10:29:54Z

packages/core/src/factories/configurable-agent.factory.ts

+          // DON'T close MCP clients here - they need to stay open for subsequent calls
+          // MCP clients will be closed when the agent is destroyed or process exits
+          // Closing them here causes "closed client" errors on tool execution


[nitpick] This change appears to be unrelated to the "Add amazonbedrock support" PR. The MCP client lifecycle management changes should be in a separate PR focused on fixing MCP client connection issues. Mixing unrelated changes makes it harder to review and potentially revert changes if needed.

Suggested change

// DON'T close MCP clients here - they need to stay open for subsequent calls

// MCP clients will be closed when the agent is destroyed or process exits

// Closing them here causes "closed client" errors on tool execution

Copilot · 2025-11-25T10:29:54Z

packages/core/src/factories/configurable-agent.factory.ts

+      console.error(
+        `[${config.id}] ❌ Failed to initialize MCP clients:`,
+        error
+      );


[nitpick] This formatting change appears to be unrelated to the "Add amazonbedrock support" PR. Pure formatting changes should ideally be in separate commits or PRs to avoid cluttering the main feature changes.

Suggested change

console.error(

`[${config.id}] ❌ Failed to initialize MCP clients:`,

error

);

console.error(`[${config.id}] ❌ Failed to initialize MCP clients:`, error);

Copilot · 2025-11-25T10:29:55Z

packages/core/src/services/base.llm.service.ts

      temperature,
      maxOutputTokens,
+      // Forward provider-specific options
+      ...(providerOptions ? { providerOptions } : {}),


The providerOptions object should not be nested under a providerOptions key when passing to AI SDK functions. The AI SDK expects provider-specific options to be passed directly at the top level. This method needs access to the provider/sdkProvider variable to determine which provider's options to spread.

For example:

...(providerOptions?.[provider === 'anthropic' ? 'anthropic' : provider === 'bedrock' ? 'bedrock' : provider === 'openrouter' ? 'openrouter' : 'openai'] || {})

Suggested change

...(providerOptions ? { providerOptions } : {}),

...(providerOptions?.[provider === 'anthropic' ? 'anthropic' : provider === 'bedrock' ? 'bedrock' : provider === 'openrouter' ? 'openrouter' : 'openai'] || {}),

Copilot · 2025-11-25T10:29:55Z

packages/core/src/services/base.llm.service.ts

      maxOutputTokens,
      tools: tools && tools.length > 0 ? (tools as any) : undefined,
+      // Forward provider-specific options
+      ...(providerOptions ? { providerOptions } : {}),


The providerOptions object should not be nested under a providerOptions key when passing to AI SDK functions. The AI SDK expects provider-specific options to be passed directly at the top level. This method needs access to the provider variable to determine which provider's options to spread.

For example:

...(providerOptions?.[provider === 'anthropic' ? 'anthropic' : provider === 'bedrock' ? 'bedrock' : provider === 'openrouter' ? 'openrouter' : 'openai'] || {})

Suggested change

...(providerOptions ? { providerOptions } : {}),

...(providerOptions?.[provider === 'anthropic' ? 'anthropic' : provider === 'bedrock' ? 'bedrock' : provider === 'openrouter' ? 'openrouter' : 'openai'] || {}),

Copilot · 2025-11-25T10:29:55Z

packages/core/src/types/llm.types.ts

+  cacheControl?: { type: "ephemeral" };
+  // Extended thinking/reasoning
+  thinking?: {
+    type: "enabled";
+    budgetTokens: number;
+  };


The AnthropicProviderOptions interface appears to have incorrect structure. Based on the AI SDK for Anthropic, cache control and thinking options are not passed as top-level properties.

Cache control is passed via experimental_providerMetadata.anthropic.cacheControl, and extended thinking is a model parameter. This interface should either be removed or restructured to match the actual AI SDK API for Anthropic provider options.

Suggested change

cacheControl?: { type: "ephemeral" };

// Extended thinking/reasoning

thinking?: {

type: "enabled";

budgetTokens: number;

};

experimental_providerMetadata?: {

anthropic?: {

cacheControl?: { type: "ephemeral" };

};

};

// Extended thinking is a model parameter, not a provider option.

Copilot · 2025-11-25T10:29:56Z

packages/core/src/factories/configurable-agent.factory.ts

+            // DON'T close MCP clients on error either - they might be needed for retry or next call
+            // MCP clients will be closed when the agent is destroyed or process exits


[nitpick] This change appears to be unrelated to the "Add amazonbedrock support" PR. The MCP client lifecycle management changes should be in a separate PR. Mixing unrelated changes makes it harder to review and potentially revert changes if needed.

Suggested change

// DON'T close MCP clients on error either - they might be needed for retry or next call

// MCP clients will be closed when the agent is destroyed or process exits

marckraw added 2 commits November 8, 2025 16:53

fix: refresh mcp servers when needeed

6242ea9

feat: add amazon bedrock support

254c360

marckraw requested a review from Copilot November 25, 2025 10:25

Copilot started reviewing on behalf of marckraw November 25, 2025 10:25 View session

vercel bot deployed to Preview November 25, 2025 10:26 View deployment

chore: changset

745a3bb

vercel bot deployed to Preview November 25, 2025 10:27 View deployment

Copilot finished reviewing on behalf of marckraw November 25, 2025 10:27

Copilot AI reviewed Nov 25, 2025

View reviewed changes

fix: types

4e32fae

vercel bot deployed to Preview November 25, 2025 10:36 View deployment

fix: overrides

2bfa6a4

vercel bot deployed to Preview November 25, 2025 14:14 View deployment

marckraw merged commit b3e0154 into develop Nov 25, 2025
3 checks passed

	...(providerOptions ? { providerOptions } : {}),
	...(providerOptions?.[sdkProvider] \|\| {}),

	// DON'T close MCP clients here - they need to stay open for subsequent calls
	// MCP clients will be closed when the agent is destroyed or process exits
	// Closing them here causes "closed client" errors on tool execution

	...(providerOptions ? { providerOptions } : {}),
	...(providerOptions?.[provider === 'anthropic' ? 'anthropic' : provider === 'bedrock' ? 'bedrock' : provider === 'openrouter' ? 'openrouter' : 'openai'] \|\| {}),

		// DON'T close MCP clients on error either - they might be needed for retry or next call
		// MCP clients will be closed when the agent is destroyed or process exits

Add amazonbedrock support #106

Add amazonbedrock support #106

Uh oh!

Conversation

marckraw commented Nov 25, 2025

Uh oh!

changeset-bot bot commented Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

vercel bot commented Nov 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

changeset-bot bot commented Nov 25, 2025 •

edited

Loading

vercel bot commented Nov 25, 2025 •

edited

Loading