@jeffusion/bungee-core 5.23.0 → 5.23.1

package/dist/plugins/codex-router/index.js

@@ -1,6 +1,6 @@
 // @bun
 // plugins/codex-router/server/index.ts
-import { createHash as createHash2 } from "crypto";
+import { createHash as createHash3 } from "crypto";
 
 // packages/core/src/plugin-logger.ts
 var sinkKey = Symbol.for("@jeffusion/bungee/plugin-log-sink");
@@ -704,25 +704,6 @@ function protocolAdapter(input) {
     });
   } };
 }
-
-// plugins/models-dev/contract.ts
-var MODELS_DEV_CATALOG_SNAPSHOT_ID = "models-dev.catalog.snapshot.v1";
-var MODELS_DEV_CATALOG_SNAPSHOT_CONTRACT_VERSION = 1;
-var MODELS_DEV_CATALOG_SNAPSHOT_SCHEMA = Object.freeze({
-  type: "object",
-  properties: {
-    version: { type: "number", integer: true, minimum: 1 },
-    fetchedAt: { type: "number", minimum: 0 },
-    catalog: { type: "json", maxBytes: 32 * 1024 * 1024 }
-  }
-});
-var MODELS_DEV_CATALOG_SNAPSHOT_CONTRACT = Object.freeze({
-  id: MODELS_DEV_CATALOG_SNAPSHOT_ID,
-  version: MODELS_DEV_CATALOG_SNAPSHOT_CONTRACT_VERSION,
-  content: MODELS_DEV_CATALOG_SNAPSHOT_SCHEMA
-});
-var MODELS_DEV_CAPABILITIES_SERVICE_ID = "models-dev.capabilities.v1";
-var MODELS_DEV_CAPABILITIES_CONTRACT_VERSION = 1;
 // plugins/codex-router/manifest.json
 var manifest_default = {
   name: "codex-router",
@@ -763,13 +744,6 @@ var manifest_default = {
         process: "control",
         kind: "local"
       },
-      {
-        plugin: "models-dev",
-        id: "models-dev.catalog.v1",
-        version: 1,
-        process: "worker",
-        kind: "local"
-      },
       {
         plugin: "models-dev",
         id: "models-dev.capabilities.v1",
@@ -777,13 +751,6 @@ var manifest_default = {
         process: "control",
         kind: "local"
       },
-      {
-        plugin: "models-dev",
-        id: "models-dev.capabilities.v1",
-        version: 1,
-        process: "worker",
-        kind: "local"
-      },
       {
         plugin: "llm-protocol-adapter",
         id: "llm-protocol-adapter.conversion.v1",
@@ -804,9 +771,23 @@ var manifest_default = {
         version: 1,
         process: "worker",
         kind: "rpc"
+      },
+      {
+        plugin: "codex-router",
+        id: "codex-router.catalog-validators.v1",
+        version: 1,
+        process: "worker",
+        kind: "rpc"
       }
     ],
-    provides: []
+    provides: [
+      {
+        id: "codex-router.catalog-validators.v1",
+        version: 1,
+        process: "control",
+        kind: "rpc"
+      }
+    ]
   },
   configSchema: [
     {
@@ -1218,8 +1199,61 @@ function mergeCatalog(native, bindings, catalog) {
   }
   return { ...body, [rich ? "models" : "data"]: [...existing.filter((entry) => !unavailable.has(rich ? entry.slug : entry.id)).map((entry) => replacements.get(rich ? entry.slug : entry.id) ?? entry), ...added] };
 }
-function catalogEtag(body, version, clientVersion) {
-  return `"${createHash("sha256").update(JSON.stringify([body, version, clientVersion])).digest("hex")}"`;
+function catalogEtag(body) {
+  return `"${createHash("sha256").update(body, "utf8").digest("hex")}"`;
+}
+
+// plugins/codex-router/contract.ts
+var key2 = { type: "string", minLength: 64, maxLength: 64 };
+var etag = { type: "string", minLength: 66, maxLength: 66 };
+var catalogValidatorsRpc = defineRpcService({
+  id: "codex-router.catalog-validators.v1",
+  version: 1,
+  methods: {
+    get: {
+      kind: "query",
+      input: { type: "object", properties: { key: key2 } },
+      output: { type: "union", variants: [etag, { type: "null" }] },
+      purposes: ["request", "attempt"]
+    },
+    put: {
+      kind: "command",
+      input: { type: "object", properties: { key: key2, etag } },
+      output: { type: "null" },
+      purposes: ["request", "attempt"],
+      command: { deduplication: "none", resultRetentionMs: 1, quotaBytes: 1024, maxResultBytes: 1024 }
+    }
+  }
+});
+function catalogValidatorsClient(services) {
+  return services.rpc.consume("codex-router", catalogValidatorsRpc);
+}
+
+// plugins/codex-router/server/catalog-validators.ts
+import { createHash as createHash2 } from "crypto";
+function header(headers, name) {
+  return Object.entries(headers).find(([key]) => key.toLowerCase() === name)?.[1] ?? "";
+}
+function catalogValidatorKey({ context, principal, servingRevision }, bindings) {
+  const directory = context.method === "GET" && /\/models$/.test(context.originalUrl.pathname);
+  const generation = context.method === "POST" && /\/responses$/.test(context.originalUrl.pathname);
+  if (!directory && !generation || !context.routeId)
+    return null;
+  const versions = context.originalUrl.searchParams.getAll("client_version");
+  const version = directory ? versions.length === 1 ? versions[0] : "" : header(context.headers, "version");
+  if (!version || version.length > 128 || /[\u0000-\u0020\u007f]/.test(version))
+    return null;
+  return createHash2("sha256").update(JSON.stringify([
+    context.routeId,
+    servingRevision ?? null,
+    bindings,
+    principal ? [principal.domain, principal.keyId, principal.credentialVersion] : ["anonymous", "", 0],
+    header(context.headers, "authorization"),
+    header(context.headers, "x-api-key"),
+    header(context.headers, "api-key"),
+    header(context.headers, "chatgpt-account-id"),
+    version
+  ])).digest("hex");
 }
 
 // plugins/codex-router/server/index.ts
@@ -1230,7 +1264,8 @@ var CodexRouterPlugin = definePlugin(class {
   bindings;
   relay;
   history;
-  catalog;
+  validators;
+  catalogRequests = new Map;
   conversion;
   constructor(options) {
     this.bindings = parseBindings(options?.models);
@@ -1241,19 +1276,29 @@ var CodexRouterPlugin = definePlugin(class {
       throw new Error("codex_router_requires_route_scope");
     this.history = historyClient(context.services.rpc.consume(ADAPTER_PLUGIN, historyRpc));
     this.conversion = context.services.consume(ADAPTER_PLUGIN, CONVERSION_SERVICE_ID, CONVERSION_VERSION);
-    this.catalog = context.services.consume("models-dev", MODELS_DEV_CAPABILITIES_SERVICE_ID, MODELS_DEV_CAPABILITIES_CONTRACT_VERSION);
+    try {
+      this.validators = catalogValidatorsClient(context.services);
+    } catch {}
+    context.services.onDispose?.(() => this.catalogRequests.clear());
   }
   bodyRequirements(context) {
     return { request: context.method === "POST" && /\/responses$/.test(context.url.pathname) ? "json-write" : "none", response: context.method === "GET" && /\/models$/.test(context.url.pathname) ? ["json"] : [] };
   }
   register(hooks) {
     hooks.onWebSocketSessionMode.tap("codex-router.session", (url) => /\/responses$/.test(url.pathname) ? "responses" : undefined);
+    hooks.onDispatchRequest.tap("codex-router.catalog-identity", (input) => {
+      const key = catalogValidatorKey(input, this.bindings);
+      if (key)
+        this.catalogRequests.set(input.context.requestId, { key, signal: input.signal });
+    });
     hooks.onDispatchRequest.tapPromise("codex-router.binding", async ({ context, targets }) => {
       if (context.method !== "POST" || !/\/responses$/.test(context.originalUrl.pathname))
         return;
       const binding = this.bindings.find((binding) => bindingSource(binding) === context.body?.model);
       if (!binding)
         return;
+      const notification = this.catalogRequests.get(context.requestId);
+      this.catalogRequests.delete(context.requestId);
       if (!targets.some((target) => target.type === binding.target.type && target.id === binding.target.id))
         throw new DataAdmissionError(422, "codex_router_target_unavailable");
       const protocol = binding.target.protocol;
@@ -1262,8 +1307,8 @@ var CodexRouterPlugin = definePlugin(class {
         throw new DataAdmissionError(503, "codex_router_model_unavailable");
       context.body = { ...context.body, model: binding.model };
       return { target: binding.target, protocol, prepareRequest: async ({ context, principal, servingRevision, signal, executeAuxiliary, webSocketConnection }) => {
-        const entryScope = createHash2("sha256").update(JSON.stringify([context.routeId, servingRevision ?? null, this.bindings, this.relay])).digest("hex");
-        const scope = principal?.domain !== "anonymous" && principal?.keyId ? createHash2("sha256").update(JSON.stringify([principal, entryScope])).digest("hex") : null;
+        const entryScope = createHash3("sha256").update(JSON.stringify([context.routeId, servingRevision ?? null, this.bindings, this.relay])).digest("hex");
+        const scope = principal?.domain !== "anonymous" && principal?.keyId ? createHash3("sha256").update(JSON.stringify([principal, entryScope])).digest("hex") : null;
         let input = structuredClone(context.body);
         let requiredUpstreamId;
         let opaqueRestored = false;
@@ -1346,9 +1391,7 @@ var CodexRouterPlugin = definePlugin(class {
             throw new DataAdmissionError(422, `llm_adapter_${e.code}`, undefined, { message: e.message, param: e.param });
           throw error;
         }
-        if (protocol !== "responses")
-          context.url.pathname = context.url.pathname.replace(/\/responses$/, protocol === "chat_completions" ? "/chat/completions" : "/messages");
-        const adapter = protocolAdapter({
+        const converted = protocolAdapter({
           session,
           protocol,
           model: bindingSource(binding),
@@ -1358,6 +1401,13 @@ var CodexRouterPlugin = definePlugin(class {
               await this.history.put({ scope, id: response.id, value: { target: binding.target, origin: { provider: binding.provider, model: binding.model, upstreamId: responseContext?.upstreamId }, items: [...logicalInput, ...response.output] } }, { signal, operationId: crypto.randomUUID() });
           }
         });
+        const adapter = { bodyRequirements: converted.bodyRequirements.bind(converted), register: (hooks) => {
+          converted.register(hooks);
+          hooks.onRawResponse.tapPromise("codex-router.catalog-notification", async (result) => {
+            await this.rewriteCatalogNotification(result.response, notification);
+            return result;
+          });
+        } };
         return { requiredUpstreamId, adapter, ...protocol !== "responses" ? { canonicalInput: logicalInput, diagnostics } : {} };
       } };
     });
@@ -1369,20 +1419,49 @@ var CodexRouterPlugin = definePlugin(class {
       }
       return context;
     });
+    hooks.onRawResponse.tapPromise("codex-router.catalog-notification", async (result, context) => {
+      if (context.method === "POST" && /\/responses$/.test(context.originalUrl.pathname)) {
+        await this.rewriteCatalogNotification(result.response, this.catalogRequests.get(context.requestId));
+      }
+      return result;
+    });
     hooks.onResponse.tapPromise("codex-router.catalog", async (response, context) => {
+      const record = this.catalogRequests.get(context.requestId);
       if (context.method !== "GET" || !/\/models$/.test(context.originalUrl.pathname) || !response.ok)
         return response;
       const native = await context.bodyHandle.json({ id: "codex-router.catalog", mandatory: true });
-      const body = mergeCatalog(native, this.bindings, this.conversion);
+      const body = JSON.stringify(mergeCatalog(native, this.bindings, this.conversion));
+      const etag = catalogEtag(body);
       const headers = new Headers(response.headers);
       for (const key of ["content-length", "content-encoding", "etag", "last-modified"])
         headers.delete(key);
       headers.set("content-type", "application/json");
       headers.set("cache-control", "private, no-store");
-      headers.set("etag", catalogEtag(body, this.catalog.status().version, context.originalUrl.searchParams.get("client_version") ?? ""));
-      return new Response(JSON.stringify(body), { status: response.status, headers });
+      headers.set("etag", etag);
+      if (record && this.validators) {
+        try {
+          await this.validators.put({ key: record.key, etag }, { signal: record.signal, timeoutMs: 1000, operationId: crypto.randomUUID() });
+        } catch {}
+      }
+      return new Response(body, { status: response.status, headers });
+    });
+    hooks.onFinally.tap("codex-router.catalog-cleanup", (context) => {
+      this.catalogRequests.delete(context.requestId);
     });
   }
+  async rewriteCatalogNotification(response, record) {
+    response.headers.delete("x-models-etag");
+    if (record && this.validators) {
+      try {
+        const etag = await this.validators.get({ key: record.key }, { signal: record.signal, timeoutMs: 1000 });
+        if (etag && !record.signal.aborted)
+          response.headers.set("x-models-etag", etag);
+      } catch {}
+    }
+  }
+  reset() {
+    this.catalogRequests.clear();
+  }
 });
 var server_default = CodexRouterPlugin;
 export {
@@ -1390,4 +1469,4 @@ export {
   server_default as default
 };
 
-//# debugId=15F3624284EDF84064756E2164756E21
+//# debugId=C5F01ADAD6007FBF64756E2164756E21