opencode-apigee 0.1.0 → 0.2.0

package/README.md

@@ -71,10 +71,32 @@ config.
 | `clientId` | `APIGEE_CLIENT_ID` | `apigee.client.id` | |
 | `clientSecret` | `APIGEE_CLIENT_SECRET` | `apigee.client.secret` | Prefer `opencode auth login` over the config file |
 | `models` | `APIGEE_MODELS` | `apigee.agents` | Model ids the gateway publishes (array, or comma-separated) |
+| `apiVersion` | `APIGEE_API_VERSION` | `vertex.api.version` | Vertex API version in the path, default `v1` (e.g. `v1beta1`) |
+| `baseUrl` | `APIGEE_BASE_URL` | `vertex.base.url` | The whole URL up to `/models`, for a gateway that doesn't mount Vertex at the standard path. May use `{project}`, `{location}`, `{version}`; with it, `gateway` isn't needed |
 | `providerId` | | | Provider id in OpenCode, default `apigee` |
 | `name` | | | Display name, default `Gemini via Apigee` |
 | `airelay` | | | `false` to ignore AI Relay's config |
 
+### A gateway with its own path
+
+By default requests go to
+`https://<gateway>/<apiVersion>/projects/<project>/locations/<location>/publishers/google/models/<model>:streamGenerateContent`.
+A gateway that mounts Vertex under a prefix only needs the prefix in `gateway`
+(`"gateway": "https://gw.example.com/genai"`); one on another version sets
+`apiVersion`; one with a different shape altogether gives `baseUrl` — everything
+before `/models`:
+
+```json
+["opencode-apigee", {
+  "baseUrl": "https://gw.example.com/ai/{version}/vertex/{project}/{location}",
+  "apiVersion": "v1beta1",
+  "project": "my-gcp-project",
+  "tokenUrl": "https://auth.example.com/oauth/token",
+  "clientId": "my-client-id",
+  "models": ["gemini-3.8-flash"]
+}]
+```
+
 A model you describe yourself under `provider.apigee.models` in
 `opencode.json` keeps your description; the plugin only adds the rest.
 

package/dist/index.js

@@ -39,7 +39,7 @@ export const ApigeePlugin = async (_input, rawOptions) => {
                 // A model the user described in opencode.json keeps their description.
                 models: { ...models, ...(existing.models ?? {}) },
                 options: {
-                    ...(settings.gateway && settings.project ? { baseURL: baseUrl(settings) } : {}),
+                    ...(settings.baseUrl || (settings.gateway && settings.project) ? { baseURL: baseUrl(settings) } : {}),
                     ...(existing.options ?? {}),
                 },
             };

package/dist/settings.d.ts

@@ -9,6 +9,14 @@ export interface ApigeeSettings {
     clientSecret: string;
     /** Model ids the gateway publishes. */
     models: string[];
+    /** Vertex API version in the path (default `v1`). */
+    apiVersion: string;
+    /**
+     * The whole base URL — everything before `/models/<id>:…` — used instead of the
+     * standard path, for a gateway that does not mount Vertex the standard way.
+     * May use `{project}`, `{location}` and `{version}`.
+     */
+    baseUrl: string;
 }
 /** Plugin options, as written in opencode.json: `["opencode-apigee", { ... }]`. */
 export interface ApigeeOptions {
@@ -19,6 +27,10 @@ export interface ApigeeOptions {
     clientId?: string;
     clientSecret?: string;
     models?: string[] | string;
+    /** Vertex API version in the path, e.g. `v1beta1` (default `v1`). */
+    apiVersion?: string;
+    /** Full base URL up to `/models`, replacing the standard path; may use `{project}`, `{location}`, `{version}`. */
+    baseUrl?: string;
     /** Provider id in OpenCode (default `apigee`). */
     providerId?: string;
     /** Display name in OpenCode (default `Gemini via Apigee`). */
@@ -39,6 +51,8 @@ export declare function resolveSettings(options?: ApigeeOptions, env?: Record<st
 /**
  * The Vertex publisher path on the gateway. `@ai-sdk/google` appends
  * `/models/<id>:streamGenerateContent`, which together is Vertex's own URL.
+ * Gateways differ in version and in where they mount Vertex, so neither is
+ * fixed: `apiVersion` changes the one, `baseUrl` replaces the whole path.
  */
 export declare function baseUrl(s: ApigeeSettings): string;
 /** AI Relay's config file, or nothing. Its path follows AIRELAY_CONFIG like AI Relay itself. */

package/dist/settings.js

@@ -18,11 +18,15 @@ export function resolveSettings(options = {}, env = process.env, storedSecret, a
         clientId: pick(options.clientId, "APIGEE_CLIENT_ID", "apigee.client.id") ?? "",
         clientSecret: nonBlank(storedSecret) ?? pick(options.clientSecret, "APIGEE_CLIENT_SECRET", "apigee.client.secret") ?? "",
         models,
+        apiVersion: pick(options.apiVersion, "APIGEE_API_VERSION", "vertex.api.version")?.replace(/^\/+|\/+$/g, "") ?? "v1",
+        baseUrl: pick(options.baseUrl, "APIGEE_BASE_URL", "vertex.base.url") ?? "",
     };
     const missing = [];
-    if (!settings.gateway)
-        missing.push("gateway (APIGEE_GATEWAY)");
-    if (!settings.project)
+    // With a full base URL, the gateway and project are only needed where it names them.
+    const needs = (part) => !settings.baseUrl || settings.baseUrl.includes(`{${part}}`);
+    if (!settings.baseUrl && !settings.gateway)
+        missing.push("gateway (APIGEE_GATEWAY) or baseUrl (APIGEE_BASE_URL)");
+    if (needs("project") && !settings.project)
         missing.push("project (APIGEE_PROJECT)");
     if (!settings.tokenUrl)
         missing.push("tokenUrl (APIGEE_TOKEN_URL)");
@@ -35,10 +39,20 @@ export function resolveSettings(options = {}, env = process.env, storedSecret, a
 /**
  * The Vertex publisher path on the gateway. `@ai-sdk/google` appends
  * `/models/<id>:streamGenerateContent`, which together is Vertex's own URL.
+ * Gateways differ in version and in where they mount Vertex, so neither is
+ * fixed: `apiVersion` changes the one, `baseUrl` replaces the whole path.
  */
 export function baseUrl(s) {
+    const fill = (t) => t
+        .replaceAll("{project}", encodeURIComponent(s.project))
+        .replaceAll("{location}", encodeURIComponent(s.location))
+        .replaceAll("{version}", s.apiVersion);
+    if (s.baseUrl) {
+        const url = fill(s.baseUrl);
+        return (/^https?:\/\//i.test(url) ? url : `https://${url}`).replace(/\/+$/, "");
+    }
     const gateway = /^https?:\/\//i.test(s.gateway) ? s.gateway : `https://${s.gateway}`;
-    return `${gateway.replace(/\/+$/, "")}/v1/projects/${encodeURIComponent(s.project)}/locations/${encodeURIComponent(s.location)}/publishers/google`;
+    return `${gateway.replace(/\/+$/, "")}/${s.apiVersion}/projects/${encodeURIComponent(s.project)}/locations/${encodeURIComponent(s.location)}/publishers/google`;
 }
 /** AI Relay's config file, or nothing. Its path follows AIRELAY_CONFIG like AI Relay itself. */
 export function readAirelayConfig(env = process.env) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-apigee",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "OpenCode provider plugin: Gemini on Vertex AI behind an Apigee gateway (OAuth client credentials).",
   "type": "module",
   "main": "./dist/index.js",
@@ -11,18 +11,29 @@
       "types": "./dist/index.d.ts"
     }
   },
-  "files": ["dist", "README.md", "LICENSE"],
+  "files": [
+    "dist",
+    "README.md",
+    "LICENSE"
+  ],
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "test": "bun test",
     "prepublishOnly": "bun run build && bun test"
   },
-  "keywords": ["opencode", "opencode-plugin", "apigee", "vertex", "gemini", "google"],
+  "keywords": [
+    "opencode",
+    "opencode-plugin",
+    "apigee",
+    "vertex",
+    "gemini",
+    "google"
+  ],
   "author": "Chelayel",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/Chelayel/opencode-apigee"
+    "url": "git+https://github.com/Chelayel/opencode-apigee.git"
   },
   "peerDependencies": {
     "@opencode-ai/plugin": ">=1.0.0"