@m8i-51/shoal 0.1.5 → 0.1.6

package/README.md

@@ -215,12 +215,15 @@ shoal defaults to Anthropic Claude. To use a different provider, set these varia
 | Provider | Variables |
 |---|---|
 | Anthropic (default) | `ANTHROPIC_API_KEY` |
+| Amazon Bedrock | `LLM_PROVIDER=bedrock`, `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, `AWS_REGION` |
 | OpenAI | `LLM_PROVIDER=openai`, `LLM_API_KEY`, `LLM_MODEL` |
 | OpenRouter | `LLM_PROVIDER=openrouter`, `LLM_API_KEY`, `LLM_MODEL` |
 | Codex (ChatGPT subscription) | run `npm run auth:codex` once, then `LLM_PROVIDER=codex` |
 | Ollama | `LLM_BASE_URL=http://localhost:11434/v1`, `LLM_MODEL` |
 | LM Studio | `LLM_BASE_URL=http://localhost:1234/v1`, `LLM_MODEL` |
 
+For Bedrock, set `LLM_MODEL` to a Bedrock model ID such as `anthropic.claude-3-5-sonnet-20241022-v2:0`. Cross-region inference profiles (e.g. `us.anthropic.claude-3-5-sonnet-20241022-v2:0`) are also supported.
+
 See `.env.example` for full examples.
 
 ---

package/bin/init.js

@@ -4,6 +4,7 @@ import { join } from "path";
 
 const PROVIDERS = [
   { value: "anthropic",   label: "Anthropic (Claude)",  hint: "recommended",        defaultModel: "claude-haiku-4-5-20251001" },
+  { value: "bedrock",     label: "Amazon Bedrock",      hint: "AWS credentials",    defaultModel: "anthropic.claude-3-5-haiku-20241022-v1:0" },
   { value: "openai",      label: "OpenAI",                                           defaultModel: "gpt-4o-mini" },
   { value: "groq",        label: "Groq",                hint: "free tier available", defaultModel: "llama-3.3-70b-versatile" },
   { value: "gemini",      label: "Gemini",              hint: "free tier available", defaultModel: "gemini-2.0-flash" },
@@ -47,6 +48,22 @@ export async function runInit(cwd) {
       placeholder: "sk-ant-...",
       validate: (v) => v?.trim() ? undefined : "Required",
     }));
+  } else if (provider === "bedrock") {
+    env.LLM_PROVIDER = "bedrock";
+    env.AWS_ACCESS_KEY_ID = guard(await text({
+      message: "AWS_ACCESS_KEY_ID",
+      placeholder: "AKIA...",
+      validate: (v) => v?.trim() ? undefined : "Required",
+    }));
+    env.AWS_SECRET_ACCESS_KEY = guard(await text({
+      message: "AWS_SECRET_ACCESS_KEY",
+      placeholder: "...",
+      validate: (v) => v?.trim() ? undefined : "Required",
+    }));
+    env.AWS_REGION = guard(await text({
+      message: "AWS region",
+      defaultValue: "us-east-1",
+    }));
   } else if (provider === "ollama") {
     env.LLM_PROVIDER = "ollama";
     const baseUrl = guard(await text({

package/framework/cost.ts

@@ -9,6 +9,14 @@ const ANTHROPIC_PRICING: Record<string, { input: number; output: number }> = {
   "claude-3-opus-20240229":     { input: 15 / 1e6,  output: 75 / 1e6  },
 };
 
+// Bedrock on-demand pricing (us-east-1, as of 2026-04)
+const BEDROCK_PRICING: Record<string, { input: number; output: number }> = {
+  "anthropic.claude-3-5-sonnet-20241022-v2:0": { input: 3 / 1e6,   output: 15 / 1e6  },
+  "anthropic.claude-3-5-haiku-20241022-v1:0":  { input: 0.8 / 1e6, output: 4 / 1e6   },
+  "anthropic.claude-3-opus-20240229-v1:0":     { input: 15 / 1e6,  output: 75 / 1e6  },
+  "anthropic.claude-3-haiku-20240307-v1:0":    { input: 0.25 / 1e6, output: 1.25 / 1e6 },
+};
+
 const OPENAI_PRICING: Record<string, { input: number; output: number }> = {
   "gpt-4o":           { input: 5 / 1e6,    output: 15 / 1e6  },
   "gpt-4o-mini":      { input: 0.15 / 1e6, output: 0.6 / 1e6 },
@@ -71,6 +79,13 @@ export async function estimateCost(
       const key = Object.keys(ANTHROPIC_PRICING).find((k) => model.startsWith(k));
       if (key) pricing = ANTHROPIC_PRICING[key];
     }
+  } else if (provider === "bedrock") {
+    pricing = BEDROCK_PRICING[model];
+    if (!pricing) {
+      // cross-region prefix (e.g. "us.anthropic.claude-..." → strip prefix)
+      const stripped = model.replace(/^[a-z]{2}\./, "");
+      pricing = BEDROCK_PRICING[stripped];
+    }
   } else if (provider === "openai") {
     pricing = OPENAI_PRICING[model];
   } else if (provider === "openrouter") {

package/framework/llm-client.ts

@@ -10,6 +10,7 @@
  */
 
 import Anthropic from "@anthropic-ai/sdk";
+import AnthropicBedrock from "@anthropic-ai/bedrock-sdk";
 import OpenAI from "openai";
 import * as fs from "fs";
 import * as os from "os";
@@ -46,6 +47,21 @@ class AnthropicClient {
   }
 }
 
+// ---- Amazon Bedrock クライアント ----
+
+class BedrockClient {
+  private client: AnthropicBedrock;
+
+  constructor() {
+    // AWS_ACCESS_KEY_ID / AWS_SECRET_ACCESS_KEY / AWS_REGION を自動読み取り
+    this.client = new AnthropicBedrock();
+  }
+
+  async createMessage(params: CreateMessageParams): Promise<Message> {
+    return this.client.messages.create(params) as Promise<Message>;
+  }
+}
+
 // ---- OpenAI 互換クライアント ----
 
 function toOpenAITools(tools: Tool[]): OpenAI.ChatCompletionTool[] {
@@ -452,7 +468,7 @@ class CodexClient {
 
 // ---- Factory ----
 
-export type LLMClient = AnthropicClient | OpenAICompatClient | CodexClient;
+export type LLMClient = AnthropicClient | BedrockClient | OpenAICompatClient | CodexClient;
 
 // OpenAI-compat プロバイダのデフォルト設定
 // LLM_BASE_URL / LLM_MODEL で個別上書き可能
@@ -470,6 +486,17 @@ export function createLLMClient(): { client: LLMClient; defaultModel: string; pr
   const baseURL = process.env.LLM_BASE_URL;
   const model = process.env.LLM_MODEL;
 
+  // Bedrock
+  if (provider === "bedrock") {
+    const effectiveModel = model ?? "anthropic.claude-3-5-haiku-20241022-v1:0";
+    console.log(`[LLM] provider: Amazon Bedrock (region: ${process.env.AWS_REGION ?? "us-east-1"}), model: ${effectiveModel}`);
+    return {
+      client: new BedrockClient(),
+      defaultModel: effectiveModel,
+      provider: "bedrock",
+    };
+  }
+
   // Codex は独自クライアント
   if (provider === "codex") {
     const effectiveModel = model ?? "gpt-5.1-codex-mini";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m8i-51/shoal",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "type": "module",
   "description": "Multi-agent web exploration framework — finds bugs, UX issues, and missing features by running AI agents against your app",
   "repository": {
@@ -34,6 +34,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
+    "@anthropic-ai/bedrock-sdk": "^0.29.1",
     "@anthropic-ai/sdk": "^0.91.1",
     "@clack/prompts": "^1.3.0",
     "dotenv": "^17.3.1",