@dbx-tools/appkit-model-gateway 0.9.36 → 0.9.37

package/index.ts

@@ -3,7 +3,7 @@
 // Hand edits are overwritten on the next watch; this file is read-only.
 
 export const PACKAGE_IDENTIFIER = "@dbx-tools/appkit-model-gateway";
-export const PACKAGE_VERSION = "0.9.36";
+export const PACKAGE_VERSION = "0.9.37";
 export * as gateway from "./src/gateway.ts";
 export * as models from "./src/models.ts";
 export * as plugin from "./src/plugin.ts";

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 export declare const PACKAGE_IDENTIFIER = "@dbx-tools/appkit-model-gateway";
-export declare const PACKAGE_VERSION = "0.9.36";
+export declare const PACKAGE_VERSION = "0.9.37";
 export * as gateway from "./src/gateway.ts";
 export * as models from "./src/models.ts";
 export * as plugin from "./src/plugin.ts";

package/lib/index.js

@@ -2,7 +2,7 @@
 // Regenerated from the exporting modules in ./src.
 // Hand edits are overwritten on the next watch; this file is read-only.
 export const PACKAGE_IDENTIFIER = "@dbx-tools/appkit-model-gateway";
-export const PACKAGE_VERSION = "0.9.36";
+export const PACKAGE_VERSION = "0.9.37";
 export * as gateway from "./src/gateway.js";
 export * as models from "./src/models.js";
 export * as plugin from "./src/plugin.js";
@@ -18,4 +18,4 @@ export { ModelGatewayError, ModelGateway } from "./src/gateway.js";
 export { ModelGatewayPlugin, modelGateway } from "./src/plugin.js";
 export { DatabricksModelRegistry } from "./src/registry.js";
 export { UnsupportedGatewayFeatureError } from "./src/router.js";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxpQ0FBaUMsQ0FBQztBQUNwRSxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDO0FBQ3hDLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxLQUFLLE1BQU0sTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEtBQUssTUFBTSxNQUFNLGlCQUFpQixDQUFDO0FBQzFDLE9BQU8sS0FBSyxlQUFlLE1BQU0sMkJBQTJCLENBQUM7QUFDN0QsT0FBTyxLQUFLLGVBQWUsTUFBTSwyQkFBMkIsQ0FBQztBQUM3RCxPQUFPLEtBQUssY0FBYyxNQUFNLDBCQUEwQixDQUFDO0FBQzNELE9BQU8sS0FBSyxRQUFRLE1BQU0sbUJBQW1CLENBQUM7QUFDOUMsT0FBTyxLQUFLLE1BQU0sTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEtBQUssTUFBTSxNQUFNLGlCQUFpQixDQUFDO0FBQzFDLE9BQU8sS0FBSyxXQUFXLE1BQU0sc0JBQXNCLENBQUM7QUFDcEQsT0FBTyxLQUFLLFNBQVMsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsWUFBWSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBS25FLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRTVELE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGlCQUFpQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gR0VORVJBVEVEIGJ5IHByb2plbiB3YXRjaCAtIERPIE5PVCBFRElULlxuLy8gUmVnZW5lcmF0ZWQgZnJvbSB0aGUgZXhwb3J0aW5nIG1vZHVsZXMgaW4gLi9zcmMuXG4vLyBIYW5kIGVkaXRzIGFyZSBvdmVyd3JpdHRlbiBvbiB0aGUgbmV4dCB3YXRjaDsgdGhpcyBmaWxlIGlzIHJlYWQtb25seS5cblxuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfSURFTlRJRklFUiA9IFwiQGRieC10b29scy9hcHBraXQtbW9kZWwtZ2F0ZXdheVwiO1xuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfVkVSU0lPTiA9IFwiMC45LjM2XCI7XG5leHBvcnQgKiBhcyBnYXRld2F5IGZyb20gXCIuL3NyYy9nYXRld2F5LnRzXCI7XG5leHBvcnQgKiBhcyBtb2RlbHMgZnJvbSBcIi4vc3JjL21vZGVscy50c1wiO1xuZXhwb3J0ICogYXMgcGx1Z2luIGZyb20gXCIuL3NyYy9wbHVnaW4udHNcIjtcbmV4cG9ydCAqIGFzIHByb3RvY29sc0RlY29kZSBmcm9tIFwiLi9zcmMvcHJvdG9jb2xzL2RlY29kZS50c1wiO1xuZXhwb3J0ICogYXMgcHJvdG9jb2xzRW5jb2RlIGZyb20gXCIuL3NyYy9wcm90b2NvbHMvZW5jb2RlLnRzXCI7XG5leHBvcnQgKiBhcyByZWFzb25pbmdBZGFwdCBmcm9tIFwiLi9zcmMvcmVhc29uaW5nLWFkYXB0LnRzXCI7XG5leHBvcnQgKiBhcyByZWdpc3RyeSBmcm9tIFwiLi9zcmMvcmVnaXN0cnkudHNcIjtcbmV4cG9ydCAqIGFzIHJvdXRlciBmcm9tIFwiLi9zcmMvcm91dGVyLnRzXCI7XG5leHBvcnQgKiBhcyByb3V0ZXMgZnJvbSBcIi4vc3JjL3JvdXRlcy50c1wiO1xuZXhwb3J0ICogYXMgdHJhbnNsYXRpb24gZnJvbSBcIi4vc3JjL3RyYW5zbGF0aW9uLnRzXCI7XG5leHBvcnQgKiBhcyB0cmFuc3BvcnQgZnJvbSBcIi4vc3JjL3RyYW5zcG9ydC50c1wiO1xuZXhwb3J0IHsgTW9kZWxHYXRld2F5RXJyb3IsIE1vZGVsR2F0ZXdheSB9IGZyb20gXCIuL3NyYy9nYXRld2F5LnRzXCI7XG5leHBvcnQgdHlwZSB7IE1vZGVsR2F0ZXdheU9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvZ2F0ZXdheS50c1wiO1xuZXhwb3J0IHsgTW9kZWxHYXRld2F5UGx1Z2luLCBtb2RlbEdhdGV3YXkgfSBmcm9tIFwiLi9zcmMvcGx1Z2luLnRzXCI7XG5leHBvcnQgdHlwZSB7IE1vZGVsR2F0ZXdheVBsdWdpbkNvbmZpZyB9IGZyb20gXCIuL3NyYy9wbHVnaW4udHNcIjtcbmV4cG9ydCB0eXBlIHsgRGVjb2RlZEdhdGV3YXlSZXF1ZXN0IH0gZnJvbSBcIi4vc3JjL3Byb3RvY29scy9kZWNvZGUudHNcIjtcbmV4cG9ydCB0eXBlIHsgQ29tcGxldGVkR2VuZXJhdGlvbiB9IGZyb20gXCIuL3NyYy9wcm90b2NvbHMvZW5jb2RlLnRzXCI7XG5leHBvcnQgdHlwZSB7IEFkYXB0ZWRJbmZlcmVuY2VCb2R5IH0gZnJvbSBcIi4vc3JjL3JlYXNvbmluZy1hZGFwdC50c1wiO1xuZXhwb3J0IHsgRGF0YWJyaWNrc01vZGVsUmVnaXN0cnkgfSBmcm9tIFwiLi9zcmMvcmVnaXN0cnkudHNcIjtcbmV4cG9ydCB0eXBlIHsgTW9kZWxSZWdpc3RyeVJlc29sdmVPcHRpb25zLCBNb2RlbFJlZ2lzdHJ5LCBNb2RlbFJlZ2lzdHJ5T3B0aW9ucyB9IGZyb20gXCIuL3NyYy9yZWdpc3RyeS50c1wiO1xuZXhwb3J0IHsgVW5zdXBwb3J0ZWRHYXRld2F5RmVhdHVyZUVycm9yIH0gZnJvbSBcIi4vc3JjL3JvdXRlci50c1wiO1xuZXhwb3J0IHR5cGUgeyBEYXRhYnJpY2tzVHJhbnNwb3J0UmVxdWVzdCB9IGZyb20gXCIuL3NyYy90cmFuc3BvcnQudHNcIjtcbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSwyQ0FBMkM7QUFDM0MsbURBQW1EO0FBQ25ELHdFQUF3RTtBQUV4RSxNQUFNLENBQUMsTUFBTSxrQkFBa0IsR0FBRyxpQ0FBaUMsQ0FBQztBQUNwRSxNQUFNLENBQUMsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDO0FBQ3hDLE9BQU8sS0FBSyxPQUFPLE1BQU0sa0JBQWtCLENBQUM7QUFDNUMsT0FBTyxLQUFLLE1BQU0sTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEtBQUssTUFBTSxNQUFNLGlCQUFpQixDQUFDO0FBQzFDLE9BQU8sS0FBSyxlQUFlLE1BQU0sMkJBQTJCLENBQUM7QUFDN0QsT0FBTyxLQUFLLGVBQWUsTUFBTSwyQkFBMkIsQ0FBQztBQUM3RCxPQUFPLEtBQUssY0FBYyxNQUFNLDBCQUEwQixDQUFDO0FBQzNELE9BQU8sS0FBSyxRQUFRLE1BQU0sbUJBQW1CLENBQUM7QUFDOUMsT0FBTyxLQUFLLE1BQU0sTUFBTSxpQkFBaUIsQ0FBQztBQUMxQyxPQUFPLEtBQUssTUFBTSxNQUFNLGlCQUFpQixDQUFDO0FBQzFDLE9BQU8sS0FBSyxXQUFXLE1BQU0sc0JBQXNCLENBQUM7QUFDcEQsT0FBTyxLQUFLLFNBQVMsTUFBTSxvQkFBb0IsQ0FBQztBQUNoRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsWUFBWSxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFbkUsT0FBTyxFQUFFLGtCQUFrQixFQUFFLFlBQVksRUFBRSxNQUFNLGlCQUFpQixDQUFDO0FBS25FLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBRTVELE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGlCQUFpQixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gR0VORVJBVEVEIGJ5IHByb2plbiB3YXRjaCAtIERPIE5PVCBFRElULlxuLy8gUmVnZW5lcmF0ZWQgZnJvbSB0aGUgZXhwb3J0aW5nIG1vZHVsZXMgaW4gLi9zcmMuXG4vLyBIYW5kIGVkaXRzIGFyZSBvdmVyd3JpdHRlbiBvbiB0aGUgbmV4dCB3YXRjaDsgdGhpcyBmaWxlIGlzIHJlYWQtb25seS5cblxuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfSURFTlRJRklFUiA9IFwiQGRieC10b29scy9hcHBraXQtbW9kZWwtZ2F0ZXdheVwiO1xuZXhwb3J0IGNvbnN0IFBBQ0tBR0VfVkVSU0lPTiA9IFwiMC45LjM3XCI7XG5leHBvcnQgKiBhcyBnYXRld2F5IGZyb20gXCIuL3NyYy9nYXRld2F5LnRzXCI7XG5leHBvcnQgKiBhcyBtb2RlbHMgZnJvbSBcIi4vc3JjL21vZGVscy50c1wiO1xuZXhwb3J0ICogYXMgcGx1Z2luIGZyb20gXCIuL3NyYy9wbHVnaW4udHNcIjtcbmV4cG9ydCAqIGFzIHByb3RvY29sc0RlY29kZSBmcm9tIFwiLi9zcmMvcHJvdG9jb2xzL2RlY29kZS50c1wiO1xuZXhwb3J0ICogYXMgcHJvdG9jb2xzRW5jb2RlIGZyb20gXCIuL3NyYy9wcm90b2NvbHMvZW5jb2RlLnRzXCI7XG5leHBvcnQgKiBhcyByZWFzb25pbmdBZGFwdCBmcm9tIFwiLi9zcmMvcmVhc29uaW5nLWFkYXB0LnRzXCI7XG5leHBvcnQgKiBhcyByZWdpc3RyeSBmcm9tIFwiLi9zcmMvcmVnaXN0cnkudHNcIjtcbmV4cG9ydCAqIGFzIHJvdXRlciBmcm9tIFwiLi9zcmMvcm91dGVyLnRzXCI7XG5leHBvcnQgKiBhcyByb3V0ZXMgZnJvbSBcIi4vc3JjL3JvdXRlcy50c1wiO1xuZXhwb3J0ICogYXMgdHJhbnNsYXRpb24gZnJvbSBcIi4vc3JjL3RyYW5zbGF0aW9uLnRzXCI7XG5leHBvcnQgKiBhcyB0cmFuc3BvcnQgZnJvbSBcIi4vc3JjL3RyYW5zcG9ydC50c1wiO1xuZXhwb3J0IHsgTW9kZWxHYXRld2F5RXJyb3IsIE1vZGVsR2F0ZXdheSB9IGZyb20gXCIuL3NyYy9nYXRld2F5LnRzXCI7XG5leHBvcnQgdHlwZSB7IE1vZGVsR2F0ZXdheU9wdGlvbnMgfSBmcm9tIFwiLi9zcmMvZ2F0ZXdheS50c1wiO1xuZXhwb3J0IHsgTW9kZWxHYXRld2F5UGx1Z2luLCBtb2RlbEdhdGV3YXkgfSBmcm9tIFwiLi9zcmMvcGx1Z2luLnRzXCI7XG5leHBvcnQgdHlwZSB7IE1vZGVsR2F0ZXdheVBsdWdpbkNvbmZpZyB9IGZyb20gXCIuL3NyYy9wbHVnaW4udHNcIjtcbmV4cG9ydCB0eXBlIHsgRGVjb2RlZEdhdGV3YXlSZXF1ZXN0IH0gZnJvbSBcIi4vc3JjL3Byb3RvY29scy9kZWNvZGUudHNcIjtcbmV4cG9ydCB0eXBlIHsgQ29tcGxldGVkR2VuZXJhdGlvbiB9IGZyb20gXCIuL3NyYy9wcm90b2NvbHMvZW5jb2RlLnRzXCI7XG5leHBvcnQgdHlwZSB7IEFkYXB0ZWRJbmZlcmVuY2VCb2R5IH0gZnJvbSBcIi4vc3JjL3JlYXNvbmluZy1hZGFwdC50c1wiO1xuZXhwb3J0IHsgRGF0YWJyaWNrc01vZGVsUmVnaXN0cnkgfSBmcm9tIFwiLi9zcmMvcmVnaXN0cnkudHNcIjtcbmV4cG9ydCB0eXBlIHsgTW9kZWxSZWdpc3RyeVJlc29sdmVPcHRpb25zLCBNb2RlbFJlZ2lzdHJ5LCBNb2RlbFJlZ2lzdHJ5T3B0aW9ucyB9IGZyb20gXCIuL3NyYy9yZWdpc3RyeS50c1wiO1xuZXhwb3J0IHsgVW5zdXBwb3J0ZWRHYXRld2F5RmVhdHVyZUVycm9yIH0gZnJvbSBcIi4vc3JjL3JvdXRlci50c1wiO1xuZXhwb3J0IHR5cGUgeyBEYXRhYnJpY2tzVHJhbnNwb3J0UmVxdWVzdCB9IGZyb20gXCIuL3NyYy90cmFuc3BvcnQudHNcIjtcbiJdfQ==

package/lib/src/models.js

@@ -4,6 +4,7 @@
  * @module
  */
 import { isChatClass } from "@dbx-tools/model/classes";
+import { modelFamily } from "@dbx-tools/model/policy";
 const CODEX_BASE_INSTRUCTIONS = "You are a coding agent. Follow the user's instructions and use the available tools to work in the current repository.";
 const REASONING_DESCRIPTIONS = {
     none: "Disable explicit reasoning",
@@ -19,7 +20,7 @@ export function listModelsPayload(targets, includeCodex) {
         .filter((target) => target.endpoint?.status?.deprecated !== true)
         .filter((target) => !includeCodex || hasChatClass(target))
         .slice()
-        .sort(compareCatalogueTargets);
+        .sort((left, right) => compareCatalogueTargets(left, right, (target) => target.displayName));
     if (includeCodex) {
         return {
             models: available.map((target, index) => codexModel(target, index + 1)),
@@ -88,32 +89,37 @@ function codexModel(target, priority) {
     };
 }
 /**
- * Order listed models by family A-Z, then display name. Targets with no family
- * follow every named family, still sorted by display name.
+ * Order listed models in three groups: non-embedding models with a detected
+ * family, the remaining non-embedding models, then embeddings. Each group is
+ * sorted by the published label (`display_name` for Codex, `name` otherwise)
+ * with numeric segments ordered naturally so "Veo 3.1" precedes "Veo 3.10".
  */
-function compareCatalogueTargets(left, right) {
-    const leftFamily = catalogueFamily(left);
-    const rightFamily = catalogueFamily(right);
-    if (Boolean(leftFamily) !== Boolean(rightFamily))
-        return leftFamily ? -1 : 1;
-    if (leftFamily && rightFamily) {
-        const familyOrder = leftFamily.localeCompare(rightFamily, undefined, { sensitivity: "base" });
-        if (familyOrder !== 0)
-            return familyOrder;
-    }
-    return catalogueName(left).localeCompare(catalogueName(right), undefined, {
-        sensitivity: "base",
-    });
+function compareCatalogueTargets(left, right, label) {
+    const group = catalogueGroup(left) - catalogueGroup(right);
+    if (group !== 0)
+        return group;
+    return compareCatalogueLabel(label(left), label(right));
+}
+function catalogueGroup(target) {
+    if (isEmbeddingTarget(target))
+        return 2;
+    return catalogueFamily(target) ? 0 : 1;
 }
 function catalogueFamily(target) {
-    const family = target.family?.trim() || target.endpoint?.family?.trim();
-    return family || undefined;
+    const stamped = target.family?.trim() || target.endpoint?.family?.trim();
+    return (modelFamily(target.displayName) ??
+        modelFamily(target.id) ??
+        (target.endpoint?.name ? modelFamily(target.endpoint.name) : undefined) ??
+        (stamped ? modelFamily(stamped) : undefined));
+}
+function isEmbeddingTarget(target) {
+    return (target.capabilities.embeddings === true || target.endpoint?.task === "llm/v1/embeddings");
 }
-function catalogueName(target) {
-    return target.displayName.trim() || target.id;
+function compareCatalogueLabel(left, right) {
+    return left.localeCompare(right, undefined, { numeric: true, sensitivity: "base" });
 }
 function hasChatClass(target) {
     const modelClass = target.endpoint?.class;
     return modelClass !== undefined && isChatClass(modelClass);
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/models.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAUvD,MAAM,uBAAuB,GAC3B,uHAAuH,CAAC;AAE1H,MAAM,sBAAsB,GAAqC;IAC/D,IAAI,EAAE,4BAA4B;IAClC,OAAO,EAAE,6CAA6C;IACtD,GAAG,EAAE,4BAA4B;IACjC,MAAM,EAAE,+BAA+B;IACvC,IAAI,EAAE,6BAA6B;IACnC,KAAK,EAAE,oCAAoC;IAC3C,GAAG,EAAE,4CAA4C;CAClD,CAAC;AAeF,MAAM,UAAU,iBAAiB,CAC/B,OAA+B,EAC/B,YAAqB;IAErB,MAAM,SAAS,GAAG,OAAO;SACtB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;SAChE,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC;SACzD,KAAK,EAAE;SACP,IAAI,CAAC,uBAAuB,CAAC,CAAC;IACjC,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;SACxE,CAAC;IACJ,CAAC;IACD,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC;KACjC,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,MAAmB;IACtC,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,MAAM,EAAE,OAAO;QACf,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,YAAY;QACtB,IAAI,EAAE,MAAM,CAAC,WAAW;QACxB,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI;QAC3B,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;QACxD,YAAY,EAAE;YACZ,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK;YAChC,SAAS,EAAE,MAAM,CAAC,gBAAgB;YAClC,SAAS,EAAE,MAAM,CAAC,YAAY,CAAC,SAAS;YACxC,cAAc,EAAE,MAAM,CAAC,YAAY,CAAC,aAAa;YACjD,SAAS,EAAE,MAAM,CAAC,YAAY,CAAC,SAAS;YACxC,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,UAAU;YAC1C,gBAAgB,EAAE,MAAM,CAAC,YAAY,CAAC,cAAc;YACpD,SAAS,EAAE,MAAM,CAAC,YAAY,CAAC,SAAS;SACzC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,MAAmB,EAAE,QAAgB;IACvD,MAAM,KAAK,GACT,MAAM,CAAC,YAAY,CAAC,cAAc,IAAI,MAAM,CAAC,gBAAgB;QAC3D,CAAC,CAAC,MAAM,CAAC,gBAAgB;QACzB,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;IAChB,MAAM,OAAO,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACxC,OAAO;QACL,IAAI,EAAE,cAAc,KAAK,EAAE;QAC3B,YAAY,EAAE,MAAM,CAAC,WAAW;QAChC,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAE,WAAW,IAAI,0BAA0B;QACvE,iBAAiB,EAAE,uBAAuB;QAC1C,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;QACxD,0BAA0B,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACnD,MAAM;YACN,WAAW,EAAE,sBAAsB,CAAC,MAAM,CAAC,IAAI,WAAW,MAAM,mBAAmB;SACpF,CAAC,CAAC;QACH,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YACpB,CAAC,CAAC,EAAE,uBAAuB,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACjF,CAAC,CAAC,EAAE,CAAC;QACP,UAAU,EAAE,cAAc;QAC1B,UAAU,EAAE,MAAM;QAClB,gBAAgB,EAAE,IAAI;QACtB,QAAQ;QACR,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,IAAI;QACb,iBAAiB,EAAE,KAAK;QACxB,iBAAiB,EAAE,IAAI;QACvB,qBAAqB,EAAE,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI;QAC1E,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE;QACrD,cAAc,EAAE,IAAI;QACpB,4BAA4B,EAAE,EAAE;QAChC,gBAAgB,EAAE,CAAC,MAAM,CAAC;QAC1B,oBAAoB,EAAE,MAAM;QAC5B,oBAAoB,EAAE,KAAK;QAC3B,8BAA8B,EAAE,KAAK;KACtC,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,SAAS,uBAAuB,CAAC,IAAiB,EAAE,KAAkB;IACpE,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,WAAW,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IAC3C,IAAI,OAAO,CAAC,UAAU,CAAC,KAAK,OAAO,CAAC,WAAW,CAAC;QAAE,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7E,IAAI,UAAU,IAAI,WAAW,EAAE,CAAC;QAC9B,MAAM,WAAW,GAAG,UAAU,CAAC,aAAa,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;QAC9F,IAAI,WAAW,KAAK,CAAC;YAAE,OAAO,WAAW,CAAC;IAC5C,CAAC;IACD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE;QACxE,WAAW,EAAE,MAAM;KACpB,CAAC,CAAC;AACL,CAAC;AAED,SAAS,eAAe,CAAC,MAAmB;IAC1C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACxE,OAAO,MAAM,IAAI,SAAS,CAAC;AAC7B,CAAC;AAED,SAAS,aAAa,CAAC,MAAmB;IACxC,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,MAAM,CAAC,EAAE,CAAC;AAChD,CAAC;AAED,SAAS,YAAY,CAAC,MAAmB;IACvC,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC;IAC1C,OAAO,UAAU,KAAK,SAAS,IAAI,WAAW,CAAC,UAAU,CAAC,CAAC;AAC7D,CAAC","sourcesContent":["/**\n * OpenAI and Codex model-list payloads derived from the live registry.\n *\n * @module\n */\n\nimport { isChatClass } from \"@dbx-tools/model/classes\";\nimport type {\n  CodexModel,\n  CodexModelListResponse,\n  ModelListResponse,\n  ModelTarget,\n  OpenAIModel,\n  OpenAIModelListResponse,\n} from \"@dbx-tools/shared-model-gateway\";\n\nconst CODEX_BASE_INSTRUCTIONS =\n  \"You are a coding agent. Follow the user's instructions and use the available tools to work in the current repository.\";\n\nconst REASONING_DESCRIPTIONS: Readonly<Record<string, string>> = {\n  none: \"Disable explicit reasoning\",\n  minimal: \"Use the smallest available reasoning budget\",\n  low: \"Use a low reasoning budget\",\n  medium: \"Use a medium reasoning budget\",\n  high: \"Use a high reasoning budget\",\n  xhigh: \"Use an extra-high reasoning budget\",\n  max: \"Use the largest available reasoning budget\",\n};\n\n/** Build the combined OpenAI and optional Codex model catalogue. */\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: true,\n): CodexModelListResponse;\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: false,\n): OpenAIModelListResponse;\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: boolean,\n): ModelListResponse;\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: boolean,\n): ModelListResponse {\n  const available = targets\n    .filter((target) => target.endpoint?.status?.deprecated !== true)\n    .filter((target) => !includeCodex || hasChatClass(target))\n    .slice()\n    .sort(compareCatalogueTargets);\n  if (includeCodex) {\n    return {\n      models: available.map((target, index) => codexModel(target, index + 1)),\n    };\n  }\n  return {\n    object: \"list\",\n    data: available.map(openAiModel),\n  };\n}\n\nfunction openAiModel(target: ModelTarget): OpenAIModel {\n  return {\n    id: target.id,\n    object: \"model\",\n    created: 0,\n    owned_by: \"databricks\",\n    name: target.displayName,\n    task: target.endpoint?.task,\n    status: target.endpoint?.status ?? { deprecated: false },\n    capabilities: {\n      tools: target.capabilities.tools,\n      reasoning: target.reasoningEfforts,\n      responses: target.capabilities.responses,\n      open_responses: target.capabilities.openResponses,\n      anthropic: target.capabilities.anthropic,\n      embeddings: target.capabilities.embeddings,\n      ai_gateway_codex: target.capabilities.aiGatewayCodex,\n      streaming: target.capabilities.streaming,\n    },\n  };\n}\n\nfunction codexModel(target: ModelTarget, priority: number): CodexModel {\n  const model =\n    target.capabilities.aiGatewayCodex && target.modelServiceName\n      ? target.modelServiceName\n      : target.id;\n  const efforts = target.reasoningEfforts;\n  return {\n    slug: `databricks/${model}`,\n    display_name: target.displayName,\n    description: target.endpoint?.description ?? \"Databricks model service\",\n    base_instructions: CODEX_BASE_INSTRUCTIONS,\n    status: target.endpoint?.status ?? { deprecated: false },\n    supported_reasoning_levels: efforts.map((effort) => ({\n      effort,\n      description: REASONING_DESCRIPTIONS[effort] ?? `Use the ${effort} reasoning budget`,\n    })),\n    ...(efforts.length > 0\n      ? { default_reasoning_level: efforts.includes(\"medium\") ? \"medium\" : efforts[0] }\n      : {}),\n    shell_type: \"unified_exec\",\n    visibility: \"list\",\n    supported_in_api: true,\n    priority,\n    availability_nux: null,\n    upgrade: null,\n    support_verbosity: false,\n    default_verbosity: null,\n    apply_patch_tool_type: target.capabilities.customTools ? \"freeform\" : null,\n    truncation_policy: { mode: \"tokens\", limit: 128_000 },\n    context_window: null,\n    experimental_supported_tools: [],\n    input_modalities: [\"text\"],\n    web_search_tool_type: \"text\",\n    supports_search_tool: false,\n    supports_image_detail_original: false,\n  };\n}\n\n/**\n * Order listed models by family A-Z, then display name. Targets with no family\n * follow every named family, still sorted by display name.\n */\nfunction compareCatalogueTargets(left: ModelTarget, right: ModelTarget): number {\n  const leftFamily = catalogueFamily(left);\n  const rightFamily = catalogueFamily(right);\n  if (Boolean(leftFamily) !== Boolean(rightFamily)) return leftFamily ? -1 : 1;\n  if (leftFamily && rightFamily) {\n    const familyOrder = leftFamily.localeCompare(rightFamily, undefined, { sensitivity: \"base\" });\n    if (familyOrder !== 0) return familyOrder;\n  }\n  return catalogueName(left).localeCompare(catalogueName(right), undefined, {\n    sensitivity: \"base\",\n  });\n}\n\nfunction catalogueFamily(target: ModelTarget): string | undefined {\n  const family = target.family?.trim() || target.endpoint?.family?.trim();\n  return family || undefined;\n}\n\nfunction catalogueName(target: ModelTarget): string {\n  return target.displayName.trim() || target.id;\n}\n\nfunction hasChatClass(target: ModelTarget): boolean {\n  const modelClass = target.endpoint?.class;\n  return modelClass !== undefined && isChatClass(modelClass);\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/models.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAUtD,MAAM,uBAAuB,GAC3B,uHAAuH,CAAC;AAE1H,MAAM,sBAAsB,GAAqC;IAC/D,IAAI,EAAE,4BAA4B;IAClC,OAAO,EAAE,6CAA6C;IACtD,GAAG,EAAE,4BAA4B;IACjC,MAAM,EAAE,+BAA+B;IACvC,IAAI,EAAE,6BAA6B;IACnC,KAAK,EAAE,oCAAoC;IAC3C,GAAG,EAAE,4CAA4C;CAClD,CAAC;AAeF,MAAM,UAAU,iBAAiB,CAC/B,OAA+B,EAC/B,YAAqB;IAErB,MAAM,SAAS,GAAG,OAAO;SACtB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;SAChE,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,YAAY,IAAI,YAAY,CAAC,MAAM,CAAC,CAAC;SACzD,KAAK,EAAE;SACP,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CACpB,uBAAuB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CACrE,CAAC;IACJ,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO;YACL,MAAM,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;SACxE,CAAC;IACJ,CAAC;IACD,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC;KACjC,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,MAAmB;IACtC,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,MAAM,EAAE,OAAO;QACf,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,YAAY;QACtB,IAAI,EAAE,MAAM,CAAC,WAAW;QACxB,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,IAAI;QAC3B,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;QACxD,YAAY,EAAE;YACZ,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK;YAChC,SAAS,EAAE,MAAM,CAAC,gBAAgB;YAClC,SAAS,EAAE,MAAM,CAAC,YAAY,CAAC,SAAS;YACxC,cAAc,EAAE,MAAM,CAAC,YAAY,CAAC,aAAa;YACjD,SAAS,EAAE,MAAM,CAAC,YAAY,CAAC,SAAS;YACxC,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,UAAU;YAC1C,gBAAgB,EAAE,MAAM,CAAC,YAAY,CAAC,cAAc;YACpD,SAAS,EAAE,MAAM,CAAC,YAAY,CAAC,SAAS;SACzC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,MAAmB,EAAE,QAAgB;IACvD,MAAM,KAAK,GACT,MAAM,CAAC,YAAY,CAAC,cAAc,IAAI,MAAM,CAAC,gBAAgB;QAC3D,CAAC,CAAC,MAAM,CAAC,gBAAgB;QACzB,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;IAChB,MAAM,OAAO,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACxC,OAAO;QACL,IAAI,EAAE,cAAc,KAAK,EAAE;QAC3B,YAAY,EAAE,MAAM,CAAC,WAAW;QAChC,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAE,WAAW,IAAI,0BAA0B;QACvE,iBAAiB,EAAE,uBAAuB;QAC1C,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE;QACxD,0BAA0B,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACnD,MAAM;YACN,WAAW,EAAE,sBAAsB,CAAC,MAAM,CAAC,IAAI,WAAW,MAAM,mBAAmB;SACpF,CAAC,CAAC;QACH,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YACpB,CAAC,CAAC,EAAE,uBAAuB,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACjF,CAAC,CAAC,EAAE,CAAC;QACP,UAAU,EAAE,cAAc;QAC1B,UAAU,EAAE,MAAM;QAClB,gBAAgB,EAAE,IAAI;QACtB,QAAQ;QACR,gBAAgB,EAAE,IAAI;QACtB,OAAO,EAAE,IAAI;QACb,iBAAiB,EAAE,KAAK;QACxB,iBAAiB,EAAE,IAAI;QACvB,qBAAqB,EAAE,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI;QAC1E,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE;QACrD,cAAc,EAAE,IAAI;QACpB,4BAA4B,EAAE,EAAE;QAChC,gBAAgB,EAAE,CAAC,MAAM,CAAC;QAC1B,oBAAoB,EAAE,MAAM;QAC5B,oBAAoB,EAAE,KAAK;QAC3B,8BAA8B,EAAE,KAAK;KACtC,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,SAAS,uBAAuB,CAC9B,IAAiB,EACjB,KAAkB,EAClB,KAAsC;IAEtC,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;IAC3D,IAAI,KAAK,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9B,OAAO,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,cAAc,CAAC,MAAmB;IACzC,IAAI,iBAAiB,CAAC,MAAM,CAAC;QAAE,OAAO,CAAC,CAAC;IACxC,OAAO,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,eAAe,CAAC,MAAmB;IAC1C,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACzE,OAAO,CACL,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC;QAC/B,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;QACtB,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACvE,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAC7C,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,MAAmB;IAC5C,OAAO,CACL,MAAM,CAAC,YAAY,CAAC,UAAU,KAAK,IAAI,IAAI,MAAM,CAAC,QAAQ,EAAE,IAAI,KAAK,mBAAmB,CACzF,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,IAAY,EAAE,KAAa;IACxD,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,YAAY,CAAC,MAAmB;IACvC,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC;IAC1C,OAAO,UAAU,KAAK,SAAS,IAAI,WAAW,CAAC,UAAU,CAAC,CAAC;AAC7D,CAAC","sourcesContent":["/**\n * OpenAI and Codex model-list payloads derived from the live registry.\n *\n * @module\n */\n\nimport { isChatClass } from \"@dbx-tools/model/classes\";\nimport { modelFamily } from \"@dbx-tools/model/policy\";\nimport type {\n  CodexModel,\n  CodexModelListResponse,\n  ModelListResponse,\n  ModelTarget,\n  OpenAIModel,\n  OpenAIModelListResponse,\n} from \"@dbx-tools/shared-model-gateway\";\n\nconst CODEX_BASE_INSTRUCTIONS =\n  \"You are a coding agent. Follow the user's instructions and use the available tools to work in the current repository.\";\n\nconst REASONING_DESCRIPTIONS: Readonly<Record<string, string>> = {\n  none: \"Disable explicit reasoning\",\n  minimal: \"Use the smallest available reasoning budget\",\n  low: \"Use a low reasoning budget\",\n  medium: \"Use a medium reasoning budget\",\n  high: \"Use a high reasoning budget\",\n  xhigh: \"Use an extra-high reasoning budget\",\n  max: \"Use the largest available reasoning budget\",\n};\n\n/** Build the combined OpenAI and optional Codex model catalogue. */\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: true,\n): CodexModelListResponse;\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: false,\n): OpenAIModelListResponse;\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: boolean,\n): ModelListResponse;\nexport function listModelsPayload(\n  targets: readonly ModelTarget[],\n  includeCodex: boolean,\n): ModelListResponse {\n  const available = targets\n    .filter((target) => target.endpoint?.status?.deprecated !== true)\n    .filter((target) => !includeCodex || hasChatClass(target))\n    .slice()\n    .sort((left, right) =>\n      compareCatalogueTargets(left, right, (target) => target.displayName),\n    );\n  if (includeCodex) {\n    return {\n      models: available.map((target, index) => codexModel(target, index + 1)),\n    };\n  }\n  return {\n    object: \"list\",\n    data: available.map(openAiModel),\n  };\n}\n\nfunction openAiModel(target: ModelTarget): OpenAIModel {\n  return {\n    id: target.id,\n    object: \"model\",\n    created: 0,\n    owned_by: \"databricks\",\n    name: target.displayName,\n    task: target.endpoint?.task,\n    status: target.endpoint?.status ?? { deprecated: false },\n    capabilities: {\n      tools: target.capabilities.tools,\n      reasoning: target.reasoningEfforts,\n      responses: target.capabilities.responses,\n      open_responses: target.capabilities.openResponses,\n      anthropic: target.capabilities.anthropic,\n      embeddings: target.capabilities.embeddings,\n      ai_gateway_codex: target.capabilities.aiGatewayCodex,\n      streaming: target.capabilities.streaming,\n    },\n  };\n}\n\nfunction codexModel(target: ModelTarget, priority: number): CodexModel {\n  const model =\n    target.capabilities.aiGatewayCodex && target.modelServiceName\n      ? target.modelServiceName\n      : target.id;\n  const efforts = target.reasoningEfforts;\n  return {\n    slug: `databricks/${model}`,\n    display_name: target.displayName,\n    description: target.endpoint?.description ?? \"Databricks model service\",\n    base_instructions: CODEX_BASE_INSTRUCTIONS,\n    status: target.endpoint?.status ?? { deprecated: false },\n    supported_reasoning_levels: efforts.map((effort) => ({\n      effort,\n      description: REASONING_DESCRIPTIONS[effort] ?? `Use the ${effort} reasoning budget`,\n    })),\n    ...(efforts.length > 0\n      ? { default_reasoning_level: efforts.includes(\"medium\") ? \"medium\" : efforts[0] }\n      : {}),\n    shell_type: \"unified_exec\",\n    visibility: \"list\",\n    supported_in_api: true,\n    priority,\n    availability_nux: null,\n    upgrade: null,\n    support_verbosity: false,\n    default_verbosity: null,\n    apply_patch_tool_type: target.capabilities.customTools ? \"freeform\" : null,\n    truncation_policy: { mode: \"tokens\", limit: 128_000 },\n    context_window: null,\n    experimental_supported_tools: [],\n    input_modalities: [\"text\"],\n    web_search_tool_type: \"text\",\n    supports_search_tool: false,\n    supports_image_detail_original: false,\n  };\n}\n\n/**\n * Order listed models in three groups: non-embedding models with a detected\n * family, the remaining non-embedding models, then embeddings. Each group is\n * sorted by the published label (`display_name` for Codex, `name` otherwise)\n * with numeric segments ordered naturally so \"Veo 3.1\" precedes \"Veo 3.10\".\n */\nfunction compareCatalogueTargets(\n  left: ModelTarget,\n  right: ModelTarget,\n  label: (target: ModelTarget) => string,\n): number {\n  const group = catalogueGroup(left) - catalogueGroup(right);\n  if (group !== 0) return group;\n  return compareCatalogueLabel(label(left), label(right));\n}\n\nfunction catalogueGroup(target: ModelTarget): number {\n  if (isEmbeddingTarget(target)) return 2;\n  return catalogueFamily(target) ? 0 : 1;\n}\n\nfunction catalogueFamily(target: ModelTarget): string | undefined {\n  const stamped = target.family?.trim() || target.endpoint?.family?.trim();\n  return (\n    modelFamily(target.displayName) ??\n    modelFamily(target.id) ??\n    (target.endpoint?.name ? modelFamily(target.endpoint.name) : undefined) ??\n    (stamped ? modelFamily(stamped) : undefined)\n  );\n}\n\nfunction isEmbeddingTarget(target: ModelTarget): boolean {\n  return (\n    target.capabilities.embeddings === true || target.endpoint?.task === \"llm/v1/embeddings\"\n  );\n}\n\nfunction compareCatalogueLabel(left: string, right: string): number {\n  return left.localeCompare(right, undefined, { numeric: true, sensitivity: \"base\" });\n}\n\nfunction hasChatClass(target: ModelTarget): boolean {\n  const modelClass = target.endpoint?.class;\n  return modelClass !== undefined && isChatClass(modelClass);\n}\n"]}

package/package.json

@@ -31,11 +31,11 @@
     "@ai-sdk/open-responses": "^2.0.58",
     "@ai-sdk/openai-compatible": "^3.0.62",
     "@databricks/appkit": "0.81.0",
-    "@dbx-tools/databricks": "^0.9.36",
-    "@dbx-tools/model": "^0.9.36",
-    "@dbx-tools/shared-core": "^0.9.36",
-    "@dbx-tools/shared-model": "^0.9.36",
-    "@dbx-tools/shared-model-gateway": "^0.9.36",
+    "@dbx-tools/databricks": "^0.9.37",
+    "@dbx-tools/model": "^0.9.37",
+    "@dbx-tools/shared-core": "^0.9.37",
+    "@dbx-tools/shared-model": "^0.9.37",
+    "@dbx-tools/shared-model-gateway": "^0.9.37",
     "ai": "^7.0.0",
     "zod": "4.3.6"
   },
@@ -89,7 +89,7 @@
       "./package.json": "./package.json"
     }
   },
-  "version": "0.9.36",
+  "version": "0.9.37",
   "types": "./lib/index.d.ts",
   "dbxToolsConfig": {
     "tags": [

package/src/models.ts

@@ -5,6 +5,7 @@
  */
 
 import { isChatClass } from "@dbx-tools/model/classes";
+import { modelFamily } from "@dbx-tools/model/policy";
 import type {
   CodexModel,
   CodexModelListResponse,
@@ -48,7 +49,9 @@ export function listModelsPayload(
     .filter((target) => target.endpoint?.status?.deprecated !== true)
     .filter((target) => !includeCodex || hasChatClass(target))
     .slice()
-    .sort(compareCatalogueTargets);
+    .sort((left, right) =>
+      compareCatalogueTargets(left, right, (target) => target.displayName),
+    );
   if (includeCodex) {
     return {
       models: available.map((target, index) => codexModel(target, index + 1)),
@@ -121,29 +124,44 @@ function codexModel(target: ModelTarget, priority: number): CodexModel {
 }
 
 /**
- * Order listed models by family A-Z, then display name. Targets with no family
- * follow every named family, still sorted by display name.
+ * Order listed models in three groups: non-embedding models with a detected
+ * family, the remaining non-embedding models, then embeddings. Each group is
+ * sorted by the published label (`display_name` for Codex, `name` otherwise)
+ * with numeric segments ordered naturally so "Veo 3.1" precedes "Veo 3.10".
  */
-function compareCatalogueTargets(left: ModelTarget, right: ModelTarget): number {
-  const leftFamily = catalogueFamily(left);
-  const rightFamily = catalogueFamily(right);
-  if (Boolean(leftFamily) !== Boolean(rightFamily)) return leftFamily ? -1 : 1;
-  if (leftFamily && rightFamily) {
-    const familyOrder = leftFamily.localeCompare(rightFamily, undefined, { sensitivity: "base" });
-    if (familyOrder !== 0) return familyOrder;
-  }
-  return catalogueName(left).localeCompare(catalogueName(right), undefined, {
-    sensitivity: "base",
-  });
+function compareCatalogueTargets(
+  left: ModelTarget,
+  right: ModelTarget,
+  label: (target: ModelTarget) => string,
+): number {
+  const group = catalogueGroup(left) - catalogueGroup(right);
+  if (group !== 0) return group;
+  return compareCatalogueLabel(label(left), label(right));
+}
+
+function catalogueGroup(target: ModelTarget): number {
+  if (isEmbeddingTarget(target)) return 2;
+  return catalogueFamily(target) ? 0 : 1;
 }
 
 function catalogueFamily(target: ModelTarget): string | undefined {
-  const family = target.family?.trim() || target.endpoint?.family?.trim();
-  return family || undefined;
+  const stamped = target.family?.trim() || target.endpoint?.family?.trim();
+  return (
+    modelFamily(target.displayName) ??
+    modelFamily(target.id) ??
+    (target.endpoint?.name ? modelFamily(target.endpoint.name) : undefined) ??
+    (stamped ? modelFamily(stamped) : undefined)
+  );
+}
+
+function isEmbeddingTarget(target: ModelTarget): boolean {
+  return (
+    target.capabilities.embeddings === true || target.endpoint?.task === "llm/v1/embeddings"
+  );
 }
 
-function catalogueName(target: ModelTarget): string {
-  return target.displayName.trim() || target.id;
+function compareCatalogueLabel(left: string, right: string): number {
+  return left.localeCompare(right, undefined, { numeric: true, sensitivity: "base" });
 }
 
 function hasChatClass(target: ModelTarget): boolean {