@hasna/switcher 0.1.1 → 0.1.2

package/dist/serve/index.js

@@ -12,9 +12,9 @@ import { dirname, resolve } from "path";
 
 // src/domain.ts
 import { z } from "zod";
-var VERSION = "0.1.1";
-var harnessSchema = z.enum(["claude", "codex", "grok", "opencode2", "pi"]);
-var protocolSchema = z.enum(["anthropic-messages", "openai-responses", "openai-chat"]);
+var VERSION = "0.1.2";
+var harnessSchema = z.enum(["claude", "codex", "grok", "opencode", "opencode2", "pi", "omp", "dsh", "cline", "hermes", "prime-agent", "gemini", "aider", "kilo"]);
+var protocolSchema = z.enum(["anthropic-messages", "openai-responses", "openai-chat", "gemini-generate-content"]);
 var idSchema = z.string().regex(/^[a-zA-Z0-9][a-zA-Z0-9._-]{0,79}$/);
 var label = z.string().min(1).max(200);
 var envRef = z.string().regex(/^SWITCHER_PROVIDER_[A-Z0-9_]+$/);
@@ -46,7 +46,8 @@ var modelSchema = z.object({
   maxOutputTokens: z.number().int().positive().optional(),
   inputModalities: z.array(z.string().max(50)).max(20).optional(),
   outputModalities: z.array(z.string().max(50)).max(20).optional(),
-  supportedParameters: z.array(z.string().max(100)).max(100).optional()
+  supportedParameters: z.array(z.string().max(100)).max(100).optional(),
+  supportedGenerationMethods: z.array(z.string().min(1).max(100)).max(100).optional()
 }).strict();
 var providerInputSchema = z.object({
   id: idSchema,
@@ -54,10 +55,10 @@ var providerInputSchema = z.object({
   baseUrl: urlSchema,
   protocol: protocolSchema,
   credentialEnv: envRef.optional(),
-  authStyle: z.enum(["bearer", "x-api-key"]).default("bearer"),
+  authStyle: z.enum(["bearer", "x-api-key", "api-key"]).default("bearer"),
   catalogBaseUrl: urlSchema.optional(),
-  catalogFormat: z.enum(["openai", "ollama", "mistral", "together", "fireworks", "dashscope", "none"]).optional(),
-  catalogAuthStyle: z.enum(["bearer", "x-api-key", "none"]).optional(),
+  catalogFormat: z.enum(["openai", "ollama", "mistral", "together", "fireworks", "dashscope", "gemini", "none"]).optional(),
+  catalogAuthStyle: z.enum(["bearer", "x-api-key", "api-key", "none"]).optional(),
   catalogCredentialEnv: envRef.optional(),
   catalogAccountId: z.string().regex(/^[A-Za-z0-9][A-Za-z0-9._-]{0,127}$/).optional(),
   modelsPath: z.string().regex(/^[a-zA-Z0-9_/-]+$/).max(200).default("models"),
@@ -71,10 +72,10 @@ var providerPresetSchema = z.object({
   protocols: z.array(z.object({
     protocol: protocolSchema,
     baseUrl: urlSchema.optional(),
-    authStyle: z.enum(["bearer", "x-api-key"]),
+    authStyle: z.enum(["bearer", "x-api-key", "api-key"]),
     catalogBaseUrl: urlSchema.optional(),
-    catalogFormat: z.enum(["openai", "ollama", "mistral", "together", "fireworks", "dashscope", "none"]),
-    catalogAuthStyle: z.enum(["bearer", "x-api-key", "none"]).optional(),
+    catalogFormat: z.enum(["openai", "ollama", "mistral", "together", "fireworks", "dashscope", "gemini", "none"]),
+    catalogAuthStyle: z.enum(["bearer", "x-api-key", "api-key", "none"]).optional(),
     modelsPath: z.string(),
     notes: z.array(z.string())
   }).strict()).min(1),
@@ -115,10 +116,27 @@ function parse(schema, value) {
   return result.data;
 }
 function compatible(harness, protocol) {
-  return harness === "claude" ? protocol === "anthropic-messages" : harness === "codex" ? protocol === "openai-responses" : true;
+  if (harness === "claude")
+    return protocol === "anthropic-messages";
+  if (harness === "codex")
+    return protocol === "openai-responses";
+  if (harness === "gemini")
+    return protocol === "gemini-generate-content";
+  if (protocol === "gemini-generate-content")
+    return false;
+  return true;
+}
+function validateHarnessProvider(harness, provider) {
+  if (!compatible(harness, provider.protocol))
+    throw new Fault(422, "protocol_mismatch", "Harness does not support this provider protocol.");
+  if (harness === "gemini" && provider.authStyle !== "x-api-key")
+    throw new Fault(422, "auth_mismatch", "Gemini CLI requires x-api-key authentication for its native generateContent protocol.");
 }
 function codingEligible(model) {
-  return model.available !== false && (!model.outputModalities || model.outputModalities.includes("text")) && (!model.supportedParameters || model.supportedParameters.includes("tools"));
+  return model.available !== false && (!model.supportedGenerationMethods || model.supportedGenerationMethods.includes("generateContent")) && (!model.outputModalities || model.outputModalities.includes("text")) && (!model.supportedParameters || model.supportedParameters.includes("tools"));
+}
+function harnessEligible(model, harness) {
+  return harness === "aider" ? model.available !== false && (!model.supportedGenerationMethods || model.supportedGenerationMethods.includes("generateContent")) && (!model.inputModalities || model.inputModalities.includes("text")) && (!model.outputModalities || model.outputModalities.includes("text")) : codingEligible(model);
 }
 
 // src/store.ts
@@ -317,6 +335,13 @@ async function boundedJson(response, maxBytes = MAX_BYTES) {
   }
 }
 
+// src/auth.ts
+function authHeader(style, credential) {
+  if (/[^\x20-\x7e]/.test(credential))
+    throw new Error("Provider credential contains invalid header characters.");
+  return style === "bearer" ? ["authorization", `Bearer ${credential}`] : [style, credential];
+}
+
 // src/catalog.ts
 var positive = (v) => typeof v === "number" && Number.isInteger(v) && v > 0 ? v : undefined;
 var strings = (v) => Array.isArray(v) && v.every((i) => typeof i === "string") ? v : undefined;
@@ -327,6 +352,64 @@ var modalities = (v) => {
     throw new Fault(502, "invalid_catalog", "Provider returned malformed modality metadata.");
   return v.map((i) => i.toLowerCase());
 };
+var CATALOG_REQUEST_TIMEOUT_MS = 20000;
+var CATALOG_REFRESH_DEADLINE_MS = 60000;
+var CATALOG_MAX_RETRIES = 2;
+var TRANSIENT_CATALOG_STATUSES = new Set([408, 425, 429, 500, 502, 503, 504]);
+function retryAfterMs(value) {
+  if (!value)
+    return;
+  const trimmed = value.trim();
+  if (/^\d+$/.test(trimmed)) {
+    try {
+      const milliseconds = BigInt(trimmed) * 1000n;
+      if (milliseconds > BigInt(Number.MAX_SAFE_INTEGER))
+        return Number.POSITIVE_INFINITY;
+      return Number(milliseconds);
+    } catch {
+      return Number.POSITIVE_INFINITY;
+    }
+  }
+  const date = Date.parse(trimmed);
+  return Number.isNaN(date) ? undefined : Math.max(0, date - Date.now());
+}
+function catalogDeadlineFault() {
+  return new Fault(502, "provider_unavailable", "Provider catalog refresh exceeded its bounded deadline.");
+}
+async function waitForCatalogRetry(delayMs, deadline) {
+  if (Date.now() + delayMs > deadline)
+    throw catalogDeadlineFault();
+  if (delayMs > 0)
+    await new Promise((resolve2) => setTimeout(resolve2, delayMs));
+}
+async function fetchCatalogPage(url, headers, deadline) {
+  for (let retry = 0;; retry++) {
+    const remaining = deadline - Date.now();
+    if (remaining <= 0)
+      throw catalogDeadlineFault();
+    let response;
+    try {
+      response = await fetch(url, {
+        headers,
+        redirect: "manual",
+        signal: AbortSignal.timeout(Math.max(1, Math.min(CATALOG_REQUEST_TIMEOUT_MS, remaining)))
+      });
+    } catch {
+      if (retry >= CATALOG_MAX_RETRIES)
+        throw new Fault(502, "provider_unavailable", "Provider catalog request failed.");
+      await waitForCatalogRetry(100 * 2 ** retry, deadline);
+      continue;
+    }
+    if (response.ok)
+      return response;
+    const retryable = TRANSIENT_CATALOG_STATUSES.has(response.status);
+    await response.body?.cancel().catch(() => {});
+    if (!retryable || retry >= CATALOG_MAX_RETRIES)
+      throw new Fault(502, "provider_rejected", `Provider catalog returned HTTP ${response.status}.`);
+    const delay = retryAfterMs(response.headers.get("retry-after"));
+    await waitForCatalogRetry(delay ?? 100 * 2 ** retry, deadline);
+  }
+}
 async function discover(provider, env = process.env, resolveCredential) {
   const refreshedAt = new Date().toISOString();
   if (provider.manualModels.length)
@@ -352,7 +435,8 @@ async function discover(provider, env = process.env, resolveCredential) {
       throw new Fault(422, "credential_missing", "Provider credential environment variable is not available on the server.");
     if (/[\r\n]/.test(credential))
       throw new Fault(422, "credential_invalid", "Catalog credential contains invalid header characters.");
-    headers[authStyle === "x-api-key" ? "x-api-key" : "authorization"] = authStyle === "x-api-key" ? credential : `Bearer ${credential}`;
+    const [header, value] = authHeader(authStyle, credential);
+    headers[provider.catalogFormat === "gemini" && header === "x-api-key" ? "x-goog-api-key" : header] = value;
   }
   if (provider.protocol === "anthropic-messages" && url.hostname !== "openrouter.ai")
     headers["anthropic-version"] = "2023-06-01";
@@ -361,18 +445,10 @@ async function discover(provider, env = process.env, resolveCredential) {
   const models = new Map;
   const seenCursors = new Set;
   const seenPages = new Set([url.href]);
+  const deadline = Date.now() + CATALOG_REFRESH_DEADLINE_MS;
   let fireworksTotal;
   for (let page = 0;page < 100; page++) {
-    let response;
-    try {
-      response = await fetch(url, { headers, redirect: "manual", signal: AbortSignal.timeout(20000) });
-    } catch {
-      throw new Fault(502, "provider_unavailable", "Provider catalog request failed.");
-    }
-    if (!response.ok) {
-      await response.body?.cancel();
-      throw new Fault(502, "provider_rejected", `Provider catalog returned HTTP ${response.status}.`);
-    }
+    const response = await fetchCatalogPage(url, headers, deadline);
     const data = await boundedJson(response);
     if (provider.catalogFormat === "fireworks" && data?.totalSize !== undefined) {
       if (typeof data.totalSize !== "number" || !Number.isInteger(data.totalSize) || data.totalSize < 0)
@@ -381,11 +457,11 @@ async function discover(provider, env = process.env, resolveCredential) {
         throw new Fault(502, "incomplete_catalog", "Provider catalog count changed during pagination; retry the refresh.");
       fireworksTotal = data.totalSize;
     }
-    const rows = provider.catalogFormat === "together" ? data : provider.catalogFormat === "ollama" ? data?.models : provider.catalogFormat === "fireworks" ? data?.models : provider.catalogFormat === "dashscope" ? data?.output?.models : data?.data;
+    const rows = provider.catalogFormat === "together" ? data : provider.catalogFormat === "ollama" ? data?.models : provider.catalogFormat === "fireworks" || provider.catalogFormat === "gemini" ? data?.models : provider.catalogFormat === "dashscope" ? data?.output?.models : data?.data;
     if (!Array.isArray(rows))
       throw new Fault(502, "invalid_catalog", "Expected a provider catalog with a model array matching its configured format.");
     for (const row of rows) {
-      const id = provider.catalogFormat === "ollama" ? row?.model ?? row?.name : provider.catalogFormat === "fireworks" ? row?.name : provider.catalogFormat === "dashscope" ? row?.model : row?.id;
+      const id = provider.catalogFormat === "ollama" ? row?.model ?? row?.name : provider.catalogFormat === "fireworks" ? row?.name : provider.catalogFormat === "gemini" ? typeof row?.name === "string" ? row.name.replace(/^models\//, "") : undefined : provider.catalogFormat === "dashscope" ? row?.model : row?.id;
       if (typeof id !== "string")
         throw new Fault(502, "invalid_catalog", "Catalog entry is missing a model ID.");
       const candidate = {
@@ -393,11 +469,12 @@ async function discover(provider, env = process.env, resolveCredential) {
         name: row.displayName ?? row.name ?? row.display_name ?? id,
         available: provider.catalogFormat === "mistral" && typeof row.archived === "boolean" ? !row.archived : undefined,
         description: typeof row.description === "string" ? row.description.slice(0, 8000) : undefined,
-        contextWindow: positive(row.context_length ?? row.context_window ?? row.contextLength ?? row.model_info?.context_window ?? (provider.catalogFormat === "mistral" ? row.max_context_length : undefined)),
-        maxOutputTokens: positive(row.top_provider?.max_completion_tokens ?? row.max_output_tokens ?? row.model_info?.max_output_tokens),
+        contextWindow: positive(row.context_length ?? row.context_window ?? row.contextLength ?? row.inputTokenLimit ?? row.model_info?.context_window ?? (provider.catalogFormat === "mistral" ? row.max_context_length : undefined)),
+        maxOutputTokens: positive(row.top_provider?.max_completion_tokens ?? row.max_output_tokens ?? row.outputTokenLimit ?? row.model_info?.max_output_tokens),
         inputModalities: strings(row.architecture?.input_modalities ?? row.input_modalities) ?? modalities(row.inference_metadata?.request_modality),
         outputModalities: strings(row.architecture?.output_modalities ?? row.output_modalities) ?? modalities(row.inference_metadata?.response_modality),
-        supportedParameters: strings(row.supported_parameters)
+        supportedParameters: strings(row.supported_parameters),
+        ...provider.catalogFormat === "gemini" && row.supportedGenerationMethods !== undefined ? { supportedGenerationMethods: row.supportedGenerationMethods } : {}
       };
       if (provider.catalogFormat === "mistral") {
         const capabilities = row.capabilities;
@@ -468,6 +545,21 @@ async function discover(provider, env = process.env, resolveCredential) {
         throw new Fault(502, "incomplete_catalog", "Provider catalog count does not match the collected models; retry the refresh.");
       return { models: [...models.values()], source: "remote", refreshedAt };
     }
+    if (provider.catalogFormat === "gemini") {
+      const nextPageToken = data.nextPageToken;
+      if (nextPageToken !== undefined && nextPageToken !== null) {
+        if (typeof nextPageToken !== "string" || nextPageToken.length > 2000)
+          throw new Fault(502, "invalid_catalog", "Gemini catalog pagination token is malformed.");
+        if (nextPageToken) {
+          if (seenCursors.has(nextPageToken))
+            throw new Fault(502, "invalid_catalog", "Provider catalog pagination did not advance.");
+          seenCursors.add(nextPageToken);
+          url.searchParams.set("pageToken", nextPageToken);
+          continue;
+        }
+      }
+      return { models: [...models.values()], source: "remote", refreshedAt };
+    }
     if (provider.catalogFormat === "dashscope") {
       const output = data.output;
       const total = output?.total;
@@ -529,7 +621,18 @@ var providerPresets = [
   ], ["https://api-docs.deepseek.com/guides/anthropic_api", "https://api-docs.deepseek.com/api/list-models"], "DEEPSEEK_API_KEY"),
   preset("openrouter", "OpenRouter", ["openai-chat", "openai-responses", "anthropic-messages"].map((protocol) => route(protocol, "https://openrouter.ai/api/v1", { catalogAuthStyle: "none" })), ["https://openrouter.ai/docs/api/api-reference/models/list-all-models-and-their-properties", "https://openrouter.ai/docs/guides/overview"], "OPENROUTER_API_KEY"),
   preset("anthropic", "Anthropic", [route("anthropic-messages", "https://api.anthropic.com/v1", { authStyle: "x-api-key" })], ["https://platform.claude.com/docs/en/api/overview", "https://platform.claude.com/docs/en/api/models/list"], "ANTHROPIC_API_KEY"),
+  preset("gemini", "Google Gemini", [route("gemini-generate-content", "https://generativelanguage.googleapis.com/v1beta", {
+    authStyle: "x-api-key",
+    catalogBaseUrl: "https://generativelanguage.googleapis.com/v1beta",
+    catalogFormat: "gemini",
+    catalogAuthStyle: "x-api-key",
+    notes: ["Gemini CLI uses the native generateContent wire with x-goog-api-key authentication; model IDs are returned as models/{id}."]
+  }), route("openai-chat", "https://generativelanguage.googleapis.com/v1beta/openai")], ["https://ai.google.dev/api", "https://ai.google.dev/api/models", "https://github.com/google-gemini/gemini-cli", "https://ai.google.dev/gemini-api/docs/openai"], "GEMINI_API_KEY"),
   preset("openai", "OpenAI", [route("openai-responses", "https://api.openai.com/v1"), route("openai-chat", "https://api.openai.com/v1")], ["https://platform.openai.com/docs/api-reference/introduction", "https://platform.openai.com/docs/api-reference/models/list"], "OPENAI_API_KEY"),
+  preset("azure-openai", "Azure OpenAI (v1)", [
+    route("openai-responses", undefined, { authStyle: "api-key", catalogFormat: "none", notes: ["Pass the Azure OpenAI v1 resource endpoint ending in /openai/v1. The request model is your deployment name. Azure's model-definition list is not a deployment catalog, so configure manual deployment models or an explicit deployment catalog parser; Switcher does not synthesize deployment paths or api-version query parameters."] }),
+    route("openai-chat", undefined, { authStyle: "api-key", catalogFormat: "none", notes: ["Pass the Azure OpenAI v1 resource endpoint ending in /openai/v1. Chat Completions is POST /chat/completions and accepts the literal api-key header. The request model is your deployment name; configure manual deployment models or an explicit deployment catalog parser because GET /models does not establish deployment names."] })
+  ], ["https://learn.microsoft.com/en-us/rest/api/aifoundry/azureopenai/models", "https://learn.microsoft.com/en-us/rest/api/microsoft-foundry/azureopenai/chat", "https://learn.microsoft.com/en-us/rest/api/aifoundry/azureopenai/responses"], "AZURE_OPENAI_API_KEY"),
   preset("xai", "xAI", ["openai-chat", "openai-responses", "anthropic-messages"].map((protocol) => route(protocol, "https://api.x.ai/v1")), ["https://api.x.ai/docs/", "https://docs.x.ai/developers/model-capabilities/text/generate-text"], "XAI_API_KEY"),
   preset("ollama", "Ollama", ["openai-chat", "openai-responses"].map((protocol) => route(protocol, "http://127.0.0.1:11434/v1", {
     catalogBaseUrl: "http://127.0.0.1:11434",
@@ -587,7 +690,7 @@ var openapi_default = {
   openapi: "3.0.3",
   info: {
     title: "Switcher API",
-    version: "0.1.1",
+    version: "0.1.2",
     description: "Authenticated provider/profile/catalog control plane. Launches run locally; the API never returns provider credentials."
   },
   security: [
@@ -1801,7 +1904,8 @@ var openapi_default = {
                   enum: [
                     "anthropic-messages",
                     "openai-responses",
-                    "openai-chat"
+                    "openai-chat",
+                    "gemini-generate-content"
                   ]
                 },
                 baseUrl: {
@@ -1812,7 +1916,8 @@ var openapi_default = {
                   type: "string",
                   enum: [
                     "bearer",
-                    "x-api-key"
+                    "x-api-key",
+                    "api-key"
                   ]
                 },
                 catalogBaseUrl: {
@@ -1828,6 +1933,7 @@ var openapi_default = {
                     "together",
                     "fireworks",
                     "dashscope",
+                    "gemini",
                     "none"
                   ]
                 },
@@ -1836,6 +1942,7 @@ var openapi_default = {
                   enum: [
                     "bearer",
                     "x-api-key",
+                    "api-key",
                     "none"
                   ]
                 },
@@ -1905,7 +2012,8 @@ var openapi_default = {
             enum: [
               "anthropic-messages",
               "openai-responses",
-              "openai-chat"
+              "openai-chat",
+              "gemini-generate-content"
             ]
           },
           credentialEnv: {
@@ -1916,7 +2024,8 @@ var openapi_default = {
             type: "string",
             enum: [
               "bearer",
-              "x-api-key"
+              "x-api-key",
+              "api-key"
             ],
             default: "bearer"
           },
@@ -1933,6 +2042,7 @@ var openapi_default = {
               "together",
               "fireworks",
               "dashscope",
+              "gemini",
               "none"
             ]
           },
@@ -1941,6 +2051,7 @@ var openapi_default = {
             enum: [
               "bearer",
               "x-api-key",
+              "api-key",
               "none"
             ]
           },
@@ -2013,6 +2124,15 @@ var openapi_default = {
                     maxLength: 100
                   },
                   maxItems: 100
+                },
+                supportedGenerationMethods: {
+                  type: "array",
+                  items: {
+                    type: "string",
+                    minLength: 1,
+                    maxLength: 100
+                  },
+                  maxItems: 100
                 }
               },
               required: [
@@ -2054,7 +2174,8 @@ var openapi_default = {
             enum: [
               "anthropic-messages",
               "openai-responses",
-              "openai-chat"
+              "openai-chat",
+              "gemini-generate-content"
             ]
           },
           credentialEnv: {
@@ -2065,7 +2186,8 @@ var openapi_default = {
             type: "string",
             enum: [
               "bearer",
-              "x-api-key"
+              "x-api-key",
+              "api-key"
             ],
             default: "bearer"
           },
@@ -2082,6 +2204,7 @@ var openapi_default = {
               "together",
               "fireworks",
               "dashscope",
+              "gemini",
               "none"
             ]
           },
@@ -2090,6 +2213,7 @@ var openapi_default = {
             enum: [
               "bearer",
               "x-api-key",
+              "api-key",
               "none"
             ]
           },
@@ -2162,6 +2286,15 @@ var openapi_default = {
                     maxLength: 100
                   },
                   maxItems: 100
+                },
+                supportedGenerationMethods: {
+                  type: "array",
+                  items: {
+                    type: "string",
+                    minLength: 1,
+                    maxLength: 100
+                  },
+                  maxItems: 100
                 }
               },
               required: [
@@ -2214,8 +2347,17 @@ var openapi_default = {
               "claude",
               "codex",
               "grok",
+              "opencode",
               "opencode2",
-              "pi"
+              "pi",
+              "omp",
+              "dsh",
+              "cline",
+              "hermes",
+              "prime-agent",
+              "gemini",
+              "aider",
+              "kilo"
             ]
           },
           model: {
@@ -2255,8 +2397,17 @@ var openapi_default = {
               "claude",
               "codex",
               "grok",
+              "opencode",
               "opencode2",
-              "pi"
+              "pi",
+              "omp",
+              "dsh",
+              "cline",
+              "hermes",
+              "prime-agent",
+              "gemini",
+              "aider",
+              "kilo"
             ]
           },
           model: {
@@ -2337,6 +2488,15 @@ var openapi_default = {
               maxLength: 100
             },
             maxItems: 100
+          },
+          supportedGenerationMethods: {
+            type: "array",
+            items: {
+              type: "string",
+              minLength: 1,
+              maxLength: 100
+            },
+            maxItems: 100
           }
         },
         required: [
@@ -2404,6 +2564,15 @@ var openapi_default = {
                   },
                   maxItems: 100
                 },
+                supportedGenerationMethods: {
+                  type: "array",
+                  items: {
+                    type: "string",
+                    minLength: 1,
+                    maxLength: 100
+                  },
+                  maxItems: 100
+                },
                 codingEligible: {
                   type: "boolean"
                 }
@@ -2504,6 +2673,15 @@ var openapi_default = {
                     maxLength: 100
                   },
                   maxItems: 100
+                },
+                supportedGenerationMethods: {
+                  type: "array",
+                  items: {
+                    type: "string",
+                    minLength: 1,
+                    maxLength: 100
+                  },
+                  maxItems: 100
                 }
               },
               required: [
@@ -2555,7 +2733,8 @@ var openapi_default = {
                 enum: [
                   "anthropic-messages",
                   "openai-responses",
-                  "openai-chat"
+                  "openai-chat",
+                  "gemini-generate-content"
                 ]
               },
               credentialEnv: {
@@ -2566,7 +2745,8 @@ var openapi_default = {
                 type: "string",
                 enum: [
                   "bearer",
-                  "x-api-key"
+                  "x-api-key",
+                  "api-key"
                 ],
                 default: "bearer"
               },
@@ -2583,6 +2763,7 @@ var openapi_default = {
                   "together",
                   "fireworks",
                   "dashscope",
+                  "gemini",
                   "none"
                 ]
               },
@@ -2591,6 +2772,7 @@ var openapi_default = {
                 enum: [
                   "bearer",
                   "x-api-key",
+                  "api-key",
                   "none"
                 ]
               },
@@ -2663,6 +2845,15 @@ var openapi_default = {
                         maxLength: 100
                       },
                       maxItems: 100
+                    },
+                    supportedGenerationMethods: {
+                      type: "array",
+                      items: {
+                        type: "string",
+                        minLength: 1,
+                        maxLength: 100
+                      },
+                      maxItems: 100
                     }
                   },
                   required: [
@@ -2715,8 +2906,17 @@ var openapi_default = {
                   "claude",
                   "codex",
                   "grok",
+                  "opencode",
                   "opencode2",
-                  "pi"
+                  "pi",
+                  "omp",
+                  "dsh",
+                  "cline",
+                  "hermes",
+                  "prime-agent",
+                  "gemini",
+                  "aider",
+                  "kilo"
                 ]
               },
               model: {
@@ -2802,6 +3002,15 @@ var openapi_default = {
                         maxLength: 100
                       },
                       maxItems: 100
+                    },
+                    supportedGenerationMethods: {
+                      type: "array",
+                      items: {
+                        type: "string",
+                        minLength: 1,
+                        maxLength: 100
+                      },
+                      maxItems: 100
                     }
                   },
                   required: [
@@ -2861,8 +3070,17 @@ var openapi_default = {
               "claude",
               "codex",
               "grok",
+              "opencode",
               "opencode2",
-              "pi"
+              "pi",
+              "omp",
+              "dsh",
+              "cline",
+              "hermes",
+              "prime-agent",
+              "gemini",
+              "aider",
+              "kilo"
             ]
           },
           model: {
@@ -2919,8 +3137,17 @@ var openapi_default = {
               "claude",
               "codex",
               "grok",
+              "opencode",
               "opencode2",
-              "pi"
+              "pi",
+              "omp",
+              "dsh",
+              "cline",
+              "hermes",
+              "prime-agent",
+              "gemini",
+              "aider",
+              "kilo"
             ]
           },
           model: {
@@ -3198,8 +3425,7 @@ function createHandler(store, apiKey, providerEnv = process.env, resolveCredenti
             if (resource === "profiles") {
               const profile = value;
               const provider = await store.get("providers", profile.providerId, db);
-              if (!compatible(profile.harness, provider.protocol))
-                throw new Fault(422, "protocol_mismatch", "Harness does not support this provider protocol.");
+              validateHarnessProvider(profile.harness, provider);
             }
             const saved = await store.put(resource, value, id ? version() : undefined, db);
             if (resource === "providers" && id)
@@ -3227,8 +3453,7 @@ function createHandler(store, apiKey, providerEnv = process.env, resolveCredenti
           const { profileId } = parse(z2.object({ profileId: idSchema }).strict(), body);
           const profile = await store.get("profiles", profileId, db);
           const provider = await store.get("providers", profile.providerId, db);
-          if (!compatible(profile.harness, provider.protocol))
-            throw new Fault(422, "protocol_mismatch", "Harness does not support this provider protocol.");
+          validateHarnessProvider(profile.harness, provider);
           let catalog;
           try {
             catalog = await store.get("catalogs", provider.id, db);
@@ -3240,10 +3465,10 @@ function createHandler(store, apiKey, providerEnv = process.env, resolveCredenti
           const selected = catalog.models.find((m) => m.id === profile.model);
           if (!selected)
             throw new Fault(422, "model_missing", "Selected model is not in the provider catalog.");
-          if (!codingEligible(selected))
-            throw new Fault(422, "model_ineligible", "Selected model explicitly lacks text output or tool support.");
+          if (!harnessEligible(selected, profile.harness))
+            throw new Fault(422, "model_ineligible", "Selected model is unavailable or explicitly lacks a required generation method, text output or tool support.");
           const warnings = [];
-          if (!selected.supportedParameters)
+          if (profile.harness !== "aider" && !selected.supportedParameters)
             warnings.push("Provider does not declare tool capabilities; execution compatibility is unverified.");
           if (profile.harness === "claude" && !/claude/i.test(profile.model))
             warnings.push("Anthropic does not support non-Claude models in Claude Code; this combination is experimental.");