opencode-crs-bedrock 1.0.2 → 1.0.4

package/README.md

@@ -45,7 +45,11 @@ npm install -g opencode-crs-bedrock
 
 ## Configuration
 
-### 1. Set Environment Variables
+> **Note**: Both `apiKey` and `baseURL` are optional. You can configure them via environment variables, use `opencode auth login crs` for interactive setup, or configure them directly in the config file.
+
+### Option 1: Using Environment Variables (Recommended)
+
+Set environment variables for automatic configuration:
 
 ```bash
 export ANTHROPIC_BASE_URL=https://your-crs-endpoint.com/api
@@ -54,9 +58,7 @@ export ANTHROPIC_AUTH_TOKEN=cr_your_api_key_here
 
 Add to your shell profile (`~/.bashrc`, `~/.zshrc`) to persist.
 
-### 2. Create OpenCode Config
-
-Create `opencode.json` in your project or `~/.config/opencode/opencode.json` globally:
+Then create `opencode.json` in your project or `~/.config/opencode/opencode.json`:
 
 ```json
 {
@@ -95,7 +97,58 @@ Create `opencode.json` in your project or `~/.config/opencode/opencode.json` glo
 }
 ```
 
-### 3. Use the Model
+### Option 2: Using OpenCode Auth (Interactive)
+
+The plugin supports interactive authentication. First, create the config **without** `baseURL` or `apiKey`:
+
+```json
+{
+  "$schema": "https://opencode.ai/config.json",
+  "plugin": [
+    "opencode-crs-bedrock"
+  ],
+  "provider": {
+    "crs": {
+      "npm": "@ai-sdk/anthropic",
+      "models": {
+        "claude-sonnet-4-5": {
+          "name": "Sonnet 4.5 [CRS]",
+          "modalities": { "input": ["text", "image", "pdf"], "output": ["text"] }
+        }
+      }
+    }
+  }
+}
+```
+
+Then run the auth login command to store your credentials:
+
+```bash
+opencode auth login crs
+```
+
+OpenCode will prompt you to enter your CRS API key, which will be securely stored. The plugin's auth loader will then be triggered automatically to configure the custom fetch handler for CRS/Bedrock compatibility.
+
+### Option 3: Direct Configuration (No Environment Variables)
+
+You can also hardcode credentials directly in the config (not recommended for shared configs):
+
+```json
+{
+  "provider": {
+    "crs": {
+      "npm": "@ai-sdk/anthropic",
+      "options": {
+        "baseURL": "https://your-crs-endpoint.com/api",
+        "apiKey": "cr_your_api_key_here"
+      },
+      "models": { /* ... */ }
+    }
+  }
+}
+```
+
+### Using the Model
 
 ```bash
 # Interactive mode
@@ -185,13 +238,16 @@ CRS API keys start with `cr_`. The plugin uses the `x-api-key` header instead of
 
 ### Connection Issues
 
-1. Verify environment variables:
-   ```bash
-   echo $ANTHROPIC_BASE_URL
-   echo $ANTHROPIC_AUTH_TOKEN
-   ```
+1. Check your authentication method:
+   - **Environment variables**: Verify they're set:
+     ```bash
+     echo $ANTHROPIC_BASE_URL
+     echo $ANTHROPIC_AUTH_TOKEN
+     ```
+   - **OpenCode auth**: Run `opencode auth list` to see stored credentials
+   - **Direct config**: Check your `opencode.json` has correct values
 
-2. Test the endpoint:
+2. Test the endpoint (if using environment variables):
    ```bash
    curl -H "x-api-key: $ANTHROPIC_AUTH_TOKEN" "$ANTHROPIC_BASE_URL/v1/messages"
    ```
@@ -201,6 +257,16 @@ CRS API keys start with `cr_`. The plugin uses the `x-api-key` header instead of
    CRS_DEBUG_SSE=true opencode run -m crs/claude-sonnet-4-5 "test"
    ```
 
+### Missing API Key or Base URL
+
+Both `apiKey` and `baseURL` are **optional** in the plugin:
+
+- If **not provided via environment variables or config**, use `opencode auth login crs` to store credentials interactively
+- The plugin defaults to `https://crs.tonob.net/api` if no `baseURL` is specified
+- You can mix and match: set `baseURL` in config and use `opencode auth login` for the `apiKey`, or vice versa
+
+**Important**: The plugin's custom fetch handler (which fixes CRS/Bedrock compatibility issues) is only activated when using `opencode auth login` or environment variables. If you hardcode credentials directly in the config, the auth loader may not be triggered.
+
 ## License
 
 MIT

package/index.ts

@@ -12,8 +12,31 @@
  * - Bedrock model ID mapping to standard Anthropic format
  */
 
-import type { Plugin } from "@opencode-ai/plugin";
-import type { Auth, Provider } from "@opencode-ai/sdk";
+import type { Plugin, PluginInput } from "@opencode-ai/plugin";
+import type { Provider } from "@opencode-ai/sdk";
+
+// ============================================================================
+// Type Definitions for Plugin
+// ============================================================================
+
+interface AuthDetails {
+  type?: string;
+  [key: string]: unknown;
+}
+
+type GetAuth = () => Promise<AuthDetails>;
+
+interface LoaderResult {
+  apiKey?: string;
+  baseURL?: string;
+  fetch: typeof fetch;
+}
+
+type PluginClient = PluginInput["client"];
+
+interface PluginContext {
+  client: PluginClient;
+}
 
 // ============================================================================
 // Type Definitions
@@ -1004,26 +1027,47 @@ function createCRSFetch(
 /**
  * CRS Auth Plugin for OpenCode
  */
-export const CRSAuthPlugin: Plugin = async () => {
+export const CRSAuthPlugin: Plugin = async ({ client }: PluginContext) => {
+  debugLog("CRS Bedrock plugin initializing...");
+
   return {
     auth: {
       provider: PROVIDER_ID,
 
-      methods: [],
+      loader: async (
+        getAuth: GetAuth,
+        _provider: Provider
+      ): Promise<LoaderResult | Record<string, unknown>> => {
+        debugLog("CRS auth loader called");
+        
+        const auth = await getAuth();
+        const apiKey = auth.apiKey as string | undefined;
+        const baseURL = (auth.baseURL as string | undefined) || process.env.ANTHROPIC_BASE_URL || "https://crs.tonob.net/api";
+
+        debugLog("Auth details:", { hasApiKey: !!apiKey, baseURL });
+
+        if (!apiKey) {
+          debugLog("No API key found, returning baseURL only");
+          return { baseURL };
+        }
 
-      async loader(
-        _getAuth: () => Promise<Auth>,
-        provider: Provider
-      ) {
-        const baseURL = provider?.options?.baseURL as string | undefined;
-        const apiKey = provider?.options?.apiKey as string | undefined;
+        debugLog("Returning full config with custom fetch");
 
         return {
           apiKey,
           baseURL,
-          fetch: createCRSFetch(apiKey!),
+          fetch: createCRSFetch(apiKey),
         };
       },
+
+      methods: [
+        {
+          label: "Enter CRS API Key",
+          type: "api",
+        },
+      ],
     },
   };
 };
+
+export default CRSAuthPlugin;

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "opencode-crs-bedrock",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "OpenCode plugin for FeedMob CRS proxy to AWS Bedrock Anthropic models",
   "type": "module",
   "module": "index.ts",
+  "files": [
+    "index.ts"
+  ],
   "keywords": [
     "opencode",
     "plugin",
@@ -13,7 +16,8 @@
     "anthropic"
   ],
   "dependencies": {
-    "@opencode-ai/plugin": "^0.4.45"
+    "@opencode-ai/sdk": "^1.1.23 ",
+    "@opencode-ai/plugin": "^1.1.23"
   },
   "devDependencies": {
     "@types/bun": "latest"

package/bun.lock

@@ -1,28 +0,0 @@
-{
-  "lockfileVersion": 1,
-  "configVersion": 1,
-  "workspaces": {
-    "": {
-      "name": "opencode-crs-bedrock",
-      "dependencies": {
-        "@opencode-ai/plugin": "^0.4.45",
-      },
-      "devDependencies": {
-        "@types/bun": "latest",
-      },
-    },
-  },
-  "packages": {
-    "@opencode-ai/plugin": ["@opencode-ai/plugin@0.4.45", "", { "dependencies": { "@opencode-ai/sdk": "0.4.19" } }, "sha512-TuD+FNmA6vN+/B82qayCvOyTXRuAtfvU0U95UKSZoNrYgIBhpD/sW/oS65iUv5QwQqzO8BxI4DYWjmLIqCz8uw=="],
-
-    "@opencode-ai/sdk": ["@opencode-ai/sdk@0.4.19", "", {}, "sha512-7V+wDR1+m+TQZAraAh/bOSObiA/uysG1YIXZVe6gl1sQAXDtkG2FYCzs0gTZ/ORdkUKEnr3vyQIk895Mu0CC/w=="],
-
-    "@types/bun": ["@types/bun@1.3.6", "", { "dependencies": { "bun-types": "1.3.6" } }, "sha512-uWCv6FO/8LcpREhenN1d1b6fcspAB+cefwD7uti8C8VffIv0Um08TKMn98FynpTiU38+y2dUO55T11NgDt8VAA=="],
-
-    "@types/node": ["@types/node@22.19.7", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-MciR4AKGHWl7xwxkBa6xUGxQJ4VBOmPTF7sL+iGzuahOFaO0jHCsuEfS80pan1ef4gWId1oWOweIhrDEYLuaOw=="],
-
-    "bun-types": ["bun-types@1.3.6", "", { "dependencies": { "@types/node": "*" } }, "sha512-OlFwHcnNV99r//9v5IIOgQ9Uk37gZqrNMCcqEaExdkVq3Avwqok1bJFmvGMCkCE0FqzdY8VMOZpfpR3lwI+CsQ=="],
-
-    "undici-types": ["undici-types@6.21.0", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="],
-  }
-}