@dbx-tools/model 0.9.153 → 0.9.157

package/package.json

@@ -25,12 +25,12 @@
   },
   "dependencies": {
     "@databricks/appkit": "0.81.0",
-    "@dbx-tools/appkit": "^0.9.153",
-    "@dbx-tools/auth": "^0.9.153",
-    "@dbx-tools/cache": "^0.9.153",
-    "@dbx-tools/shared-auth": "^0.9.153",
-    "@dbx-tools/shared-core": "^0.9.153",
-    "@dbx-tools/shared-model": "^0.9.153",
+    "@dbx-tools/appkit": "^0.9.157",
+    "@dbx-tools/auth": "^0.9.157",
+    "@dbx-tools/cache": "^0.9.157",
+    "@dbx-tools/shared-auth": "^0.9.157",
+    "@dbx-tools/shared-core": "^0.9.157",
+    "@dbx-tools/shared-model": "^0.9.157",
     "cheerio": "^1.2.0",
     "fuse.js": "^7.4.2"
   },
@@ -45,62 +45,10 @@
         "types": "./lib/index.d.ts",
         "default": "./lib/index.js"
       },
-      "./bindings": {
-        "types": "./lib/src/bindings.d.ts",
-        "default": "./lib/src/bindings.js"
-      },
-      "./classes": {
-        "types": "./lib/src/classes.d.ts",
-        "default": "./lib/src/classes.js"
-      },
-      "./classify": {
-        "types": "./lib/src/classify.d.ts",
-        "default": "./lib/src/classify.js"
-      },
-      "./fallback": {
-        "types": "./lib/src/fallback.d.ts",
-        "default": "./lib/src/fallback.js"
-      },
-      "./invoke": {
-        "types": "./lib/src/invoke.d.ts",
-        "default": "./lib/src/invoke.js"
-      },
-      "./metadata-cache": {
-        "types": "./lib/src/metadata-cache.d.ts",
-        "default": "./lib/src/metadata-cache.js"
-      },
-      "./metadata": {
-        "types": "./lib/src/metadata.d.ts",
-        "default": "./lib/src/metadata.js"
-      },
-      "./model-catalog": {
-        "types": "./lib/src/model-catalog.d.ts",
-        "default": "./lib/src/model-catalog.js"
-      },
-      "./model-client": {
-        "types": "./lib/src/model-client.d.ts",
-        "default": "./lib/src/model-client.js"
-      },
-      "./policy": {
-        "types": "./lib/src/policy.d.ts",
-        "default": "./lib/src/policy.js"
-      },
-      "./reasoning-translation": {
-        "types": "./lib/src/reasoning-translation.d.ts",
-        "default": "./lib/src/reasoning-translation.js"
-      },
-      "./resolve": {
-        "types": "./lib/src/resolve.d.ts",
-        "default": "./lib/src/resolve.js"
-      },
-      "./*": {
-        "types": "./lib/src/*/index.d.ts",
-        "default": "./lib/src/*/index.js"
-      },
       "./package.json": "./package.json"
     }
   },
-  "version": "0.9.153",
+  "version": "0.9.157",
   "types": "./lib/index.d.ts",
   "dbxToolsConfig": {
     "tags": [
@@ -113,64 +61,11 @@
       "types": "./lib/index.d.ts",
       "default": "./lib/index.js"
     },
-    "./bindings": {
-      "types": "./lib/src/bindings.d.ts",
-      "default": "./lib/src/bindings.js"
-    },
-    "./classes": {
-      "types": "./lib/src/classes.d.ts",
-      "default": "./lib/src/classes.js"
-    },
-    "./classify": {
-      "types": "./lib/src/classify.d.ts",
-      "default": "./lib/src/classify.js"
-    },
-    "./fallback": {
-      "types": "./lib/src/fallback.d.ts",
-      "default": "./lib/src/fallback.js"
-    },
-    "./invoke": {
-      "types": "./lib/src/invoke.d.ts",
-      "default": "./lib/src/invoke.js"
-    },
-    "./metadata-cache": {
-      "types": "./lib/src/metadata-cache.d.ts",
-      "default": "./lib/src/metadata-cache.js"
-    },
-    "./metadata": {
-      "types": "./lib/src/metadata.d.ts",
-      "default": "./lib/src/metadata.js"
-    },
-    "./model-catalog": {
-      "types": "./lib/src/model-catalog.d.ts",
-      "default": "./lib/src/model-catalog.js"
-    },
-    "./model-client": {
-      "types": "./lib/src/model-client.d.ts",
-      "default": "./lib/src/model-client.js"
-    },
-    "./policy": {
-      "types": "./lib/src/policy.d.ts",
-      "default": "./lib/src/policy.js"
-    },
-    "./reasoning-translation": {
-      "types": "./lib/src/reasoning-translation.d.ts",
-      "default": "./lib/src/reasoning-translation.js"
-    },
-    "./resolve": {
-      "types": "./lib/src/resolve.d.ts",
-      "default": "./lib/src/resolve.js"
-    },
-    "./*": {
-      "types": "./lib/src/*/index.d.ts",
-      "default": "./lib/src/*/index.js"
-    },
     "./package.json": "./package.json"
   },
   "files": [
-    "index.ts",
+    "index*.ts",
     "src",
-    "exports.ts",
     "lib"
   ],
   "//": "~~ Generated by projen. To modify, edit .projenrc.js and run \"bunx projen\"."

package/src/_cache.ts

@@ -1,4 +1,4 @@
-import { projectCache } from "@dbx-tools/cache/cache";
+import { projectCache } from "@dbx-tools/cache";
 
 /** Memory-first cache for endpoint catalogues, isolated for full invalidation. */
 export const modelCatalogueCache = projectCache("model-catalog", {

package/src/_metadata-generator.ts

@@ -6,7 +6,7 @@ import type {
   ModelRateLimitsSnapshot,
   ReasoningModelsSnapshot,
   RetiredModelsSnapshot,
-} from "./_metadata-contract.ts";
+} from "./metadata-contract.ts";
 import { inheritsNativeWebSearch, modelSearchQuery } from "./policy.ts";
 import {
   parseReasoning,

package/src/_ranking.ts

@@ -1,15 +1,14 @@
-import { object, stringUtils } from "@dbx-tools/shared-core";
+import { isRecord, trimToUndefined } from "@dbx-tools/shared-core";
 import {
   ModelClass as ModelClassValues,
   type ModelClass as ModelClassType,
   type ModelQuery,
   type RankedModel,
   type ServingEndpointSummary,
-} from "@dbx-tools/shared-model/contracts";
-import { toModelDisplayName } from "@dbx-tools/shared-model/display";
+} from "@dbx-tools/shared-model";
+import { toModelDisplayName } from "@dbx-tools/shared-model";
 import Fuse from "fuse.js";
 
-import { modelStatusFor } from "./_retirement.ts";
 import { classesAtOrBelow, CHAT_CLASS_ORDER, MODEL_CLASS_ORDER } from "./classes.ts";
 import {
   classifyEndpoints,
@@ -23,6 +22,7 @@ import {
   modelReasoningEfforts,
   modelServiceNames,
 } from "./policy.ts";
+import { modelStatusFor } from "./retirement.ts";
 
 type ModelClass = ModelClassType;
 const ModelClass = ModelClassValues;
@@ -201,49 +201,46 @@ export function classifyEndpointClasses(
 export function normalizeEndpoints(endpoints: readonly unknown[]): ServingEndpointSummary[] {
   const summaries = endpoints.flatMap((value) => {
     const endpoint = record(value);
-    const name = stringUtils.trimToUndefined(endpoint.name);
+    const name = trimToUndefined(endpoint.name);
     if (!name) return [];
     const entities = arrayValue(record(endpoint.config).served_entities).map(record);
     const identities = [
       name,
       ...entities.flatMap((entity) =>
         [
-          stringUtils.trimToUndefined(entity.entity_name),
-          stringUtils.trimToUndefined(record(entity.foundation_model).name),
-          stringUtils.trimToUndefined(record(entity.external_model).name),
+          trimToUndefined(entity.entity_name),
+          trimToUndefined(record(entity.foundation_model).name),
+          trimToUndefined(record(entity.external_model).name),
         ].filter((identity): identity is string => Boolean(identity)),
       ),
     ];
     const modelServiceName = entities
       .map(
         (entity) =>
-          stringUtils.trimToUndefined(record(entity.foundation_model).name) ??
-          stringUtils.trimToUndefined(entity.entity_name),
+          trimToUndefined(record(entity.foundation_model).name) ??
+          trimToUndefined(entity.entity_name),
       )
       .find(Boolean);
     const foundationModels = entities.map((entity) => record(entity.foundation_model));
     const family =
-      foundationModels
-        .map((model) => stringUtils.trimToUndefined(model.model_class))
-        .find(Boolean) ?? identities.map(modelFamily).find(Boolean);
+      foundationModels.map((model) => trimToUndefined(model.model_class)).find(Boolean) ??
+      identities.map(modelFamily).find(Boolean);
     const reasoningEfforts =
       identities.map(modelReasoningEfforts).sort((left, right) => right.length - left.length)[0] ??
       [];
     const profile = entities.map(modelProfile).find(Boolean);
     const capabilitiesRecord = record(endpoint.capabilities);
     const foundationDescription = foundationModels
-      .map((model) => stringUtils.trimToUndefined(model.description))
+      .map((model) => trimToUndefined(model.description))
       .find(Boolean);
-    const description = stringUtils.trimToUndefined(endpoint.description) ?? foundationDescription;
+    const description = trimToUndefined(endpoint.description) ?? foundationDescription;
     const summary: ServingEndpointSummary = {
       name,
       displayName: toModelDisplayName(name, providedDisplayName(endpoint, entities)),
       ...(family ? { family } : {}),
-      ...(stringUtils.trimToUndefined(endpoint.task)
-        ? { task: stringUtils.trimToUndefined(endpoint.task) }
-        : {}),
-      ...(stringUtils.trimToUndefined(record(endpoint.state).ready)
-        ? { state: stringUtils.trimToUndefined(record(endpoint.state).ready) }
+      ...(trimToUndefined(endpoint.task) ? { task: trimToUndefined(endpoint.task) } : {}),
+      ...(trimToUndefined(record(endpoint.state).ready)
+        ? { state: trimToUndefined(record(endpoint.state).ready) }
         : {}),
       ...(description ? { description } : {}),
       supportsTools:
@@ -336,21 +333,19 @@ function providedDisplayName(
 ): string | undefined {
   for (const tag of arrayValue(endpoint.tags).map(record)) {
     if (!["display_name", "displayName", "name"].includes(String(tag.key))) continue;
-    const value = stringUtils.trimToUndefined(tag.value);
+    const value = trimToUndefined(tag.value);
     if (value) return value;
   }
   return (
     entities
-      .map((entity) => stringUtils.trimToUndefined(record(entity.foundation_model).display_name))
+      .map((entity) => trimToUndefined(record(entity.foundation_model).display_name))
       .find(Boolean) ??
-    entities
-      .map((entity) => stringUtils.trimToUndefined(record(entity.external_model).name))
-      .find(Boolean)
+    entities.map((entity) => trimToUndefined(record(entity.external_model).name)).find(Boolean)
   );
 }
 
 function record(value: unknown): Record<string, unknown> {
-  return object.isRecord(value) ? value : {};
+  return isRecord(value) ? value : {};
 }
 
 function arrayValue(value: unknown): unknown[] {

package/src/classes.ts

@@ -13,7 +13,7 @@
 import {
   ModelClass as ModelClassValues,
   type ModelClass as ModelClassType,
-} from "@dbx-tools/shared-model/contracts";
+} from "@dbx-tools/shared-model";
 
 type ModelClass = ModelClassType;
 const ModelClass = ModelClassValues;

package/src/classify.ts

@@ -32,7 +32,7 @@ import {
   ModelClass as ModelClassValues,
   type ModelClass as ModelClassType,
   type ServingEndpointSummary,
-} from "@dbx-tools/shared-model/contracts";
+} from "@dbx-tools/shared-model";
 
 type ModelClass = ModelClassType;
 const ModelClass = ModelClassValues;

package/src/fallback.ts

@@ -20,7 +20,7 @@ import {
   ModelClass as ModelClassValues,
   type ModelClass as ModelClassType,
   type ServingEndpointSummary,
-} from "@dbx-tools/shared-model/contracts";
+} from "@dbx-tools/shared-model";
 
 import { rankEndpoints } from "./_ranking.ts";
 

package/src/metadata-cache.ts

@@ -4,12 +4,11 @@
  * @module
  */
 
-import { createCache, getOrSet } from "@dbx-tools/cache/cache";
-import * as errorUtils from "@dbx-tools/shared-core/error-utils";
-import * as log from "@dbx-tools/shared-core/log";
+import { createCache, getOrSet } from "@dbx-tools/cache";
+import { toError, log } from "@dbx-tools/shared-core";
 
 import { modelMetadataCache } from "./_cache.ts";
-import { MODEL_METADATA_TTL_MS } from "./_metadata-contract.ts";
+import { MODEL_METADATA_TTL_MS } from "./metadata-contract.ts";
 
 const logger = log.logger("model/metadata-cache");
 
@@ -78,7 +77,7 @@ export function createMetadataCache<T>(
           } catch (error) {
             logger.warn("metadata cache refresh failed; using cached or committed value", {
               key: options.key,
-              error: errorUtils.toError(error),
+              error: toError(error),
             });
             staleRefreshFailed = previous !== undefined;
           }

package/src/{_metadata-contract.ts → metadata-contract.ts}

@@ -1,4 +1,4 @@
-import type { ModelRateLimits } from "@dbx-tools/shared-model/contracts";
+import type { ModelRateLimits } from "@dbx-tools/shared-model";
 
 /** One day, matching the refresh cadence of Databricks model documentation. */
 export const MODEL_METADATA_TTL_MS = 24 * 60 * 60 * 1000;

package/src/metadata.ts

@@ -11,38 +11,20 @@
  *
  * @module
  */
-import * as functionUtils from "@dbx-tools/shared-core/function-utils";
+import { memoize } from "@dbx-tools/shared-core";
 import type {
   ModelCapabilities,
   ModelMetadata,
   ModelRateLimits,
   ServingEndpointSummary,
-} from "@dbx-tools/shared-model/contracts";
+} from "@dbx-tools/shared-model";
 
-import {
-  MODEL_METADATA_TTL_MS,
-  MODEL_RATE_LIMITS_URL,
-  OPENAI_RESPONSES_MODELS_URL,
-  QUERY_REASON_MODELS_URL,
-  RETIRED_MODELS_URL,
-  WEB_SEARCH_MODELS_URL,
-  type ModelCapabilitiesSnapshot,
-  type ModelCapabilityCatalogue,
-  type ModelRateLimitsSnapshot,
-  type ReasoningModelsSnapshot,
-} from "./_metadata-contract.ts";
 import {
   parseModelCapabilities,
   parseModelRateLimits,
   parseReasoningModels,
   parseRetiredModels,
 } from "./_metadata-generator.ts";
-import {
-  COMMITTED_RETIRED_MODELS,
-  modelStatusFor,
-  replaceRetiredModelNames,
-  RETIRED_MODELS_GENERATED_AT,
-} from "./_retirement.ts";
 import capabilitiesSnapshotJson from "./generated/model-capabilities.json" with { type: "json" };
 import rateLimitsSnapshotJson from "./generated/model-rate-limits.json" with { type: "json" };
 import reasoningSnapshotJson from "./generated/model-reasoning.json" with { type: "json" };
@@ -52,6 +34,17 @@ import {
   mergePreferFreshRecord,
   type MetadataCache,
 } from "./metadata-cache.ts";
+import {
+  MODEL_RATE_LIMITS_URL,
+  OPENAI_RESPONSES_MODELS_URL,
+  QUERY_REASON_MODELS_URL,
+  RETIRED_MODELS_URL,
+  WEB_SEARCH_MODELS_URL,
+  type ModelCapabilitiesSnapshot,
+  type ModelCapabilityCatalogue,
+  type ModelRateLimitsSnapshot,
+  type ReasoningModelsSnapshot,
+} from "./metadata-contract.ts";
 import { inheritsNativeWebSearch, isFoundationModelIdentity, modelSearchQuery } from "./policy.ts";
 import {
   defaultReasoningLevels,
@@ -62,15 +55,12 @@ import {
   type ReasoningModelCatalogue,
   uniqueReasoningLevels,
 } from "./reasoning-translation.ts";
-
-export {
-  MODEL_METADATA_TTL_MS,
-  MODEL_RATE_LIMITS_URL,
-  OPENAI_RESPONSES_MODELS_URL,
-  QUERY_REASON_MODELS_URL,
-  RETIRED_MODELS_URL,
-  WEB_SEARCH_MODELS_URL,
-};
+import {
+  COMMITTED_RETIRED_MODELS,
+  modelStatusFor,
+  replaceRetiredModelNames,
+  RETIRED_MODELS_GENERATED_AT,
+} from "./retirement.ts";
 
 const capabilitiesSnapshot = capabilitiesSnapshotJson as ModelCapabilitiesSnapshot;
 const rateLimitsSnapshot = rateLimitsSnapshotJson as ModelRateLimitsSnapshot;
@@ -156,9 +146,7 @@ const learnedReasoningCache = createMetadataCache<
 
 let liveIndex: MetadataIndex | undefined;
 
-const metadataIndex = functionUtils.memoize<MetadataIndex>(
-  () => liveIndex ?? buildIndexFromCommitted(),
-);
+const metadataIndex = memoize<MetadataIndex>(() => liveIndex ?? buildIndexFromCommitted());
 
 function buildIndexFromCommitted(): MetadataIndex {
   return buildIndex({
@@ -277,8 +265,6 @@ async function peekOrFallback<T>(cache: MetadataCache<T>, fallback: T): Promise<
   return cache.get().catch(() => fallback);
 }
 
-export { modelStatusFor, retiredModelNames } from "./_retirement.ts";
-
 /** Return the committed reasoning-effort catalogue. Cached per process. */
 export function reasoningModelCatalogue(): ReasoningModelCatalogue {
   return metadataIndex().reasoning;

package/src/model-catalog.ts

@@ -23,21 +23,19 @@
 
 import { createHash } from "node:crypto";
 import { appkit } from "@dbx-tools/appkit";
-import { deleteCachedValue, getOrSet } from "@dbx-tools/cache/cache";
-import { errorUtils, log } from "@dbx-tools/shared-core";
+import { deleteCachedValue, getOrSet } from "@dbx-tools/cache";
+import { log, toError } from "@dbx-tools/shared-core";
 import {
-  model,
   type ResolvedModel,
   type ResolveModelOptions,
   type ScoredEndpoint,
   type ServingEndpointSummary,
+  ModelClass,
 } from "@dbx-tools/shared-model";
 
 import { modelCatalogueCache } from "./_cache.ts";
 import { classifyEndpointClasses, normalizeEndpoints, rankEndpoints } from "./_ranking.ts";
 
-const { ModelClass } = model;
-
 const logger = log.logger("model/serving");
 
 /**
@@ -189,7 +187,7 @@ async function pingEmbeddingDimension(
     logger.warn("embedding ping returned no vector", { name });
     return undefined;
   } catch (err) {
-    logger.warn("embedding ping failed", { name, error: errorUtils.toError(err) });
+    logger.warn("embedding ping failed", { name, error: toError(err) });
     return undefined;
   }
 }

package/src/model-client.ts

@@ -12,12 +12,10 @@ import {
   createAuthClient,
   type AuthClient,
   type DatabricksAuthDependencies,
-} from "@dbx-tools/auth/client";
-import { listProfiles as listAuthProfiles } from "@dbx-tools/auth/profile";
+} from "@dbx-tools/auth";
+import { listProfiles as listAuthProfiles } from "@dbx-tools/auth";
 import type { DatabricksProfileSummary } from "@dbx-tools/shared-auth";
-import * as errorUtils from "@dbx-tools/shared-core/error-utils";
-import * as log from "@dbx-tools/shared-core/log";
-import * as object from "@dbx-tools/shared-core/object";
+import { toError, log, isRecord } from "@dbx-tools/shared-core";
 import {
   ModelClass,
   type ModelMetadata,
@@ -26,10 +24,9 @@ import {
   type ResolvedModelSelection,
   type ResolveModelInput,
   type ServingEndpointSummary,
-} from "@dbx-tools/shared-model/contracts";
+} from "@dbx-tools/shared-model";
 
 import { normalizeEndpoints } from "./_ranking.ts";
-import { lookupModels, resolveModel } from "./_selection.ts";
 import {
   aiGatewayCodexResponsesUrl,
   chatCompletionsUrl,
@@ -38,6 +35,7 @@ import {
 } from "./invoke.ts";
 import { hydrateModelMetadata, modelMetadataFor } from "./metadata.ts";
 import { modelServingApi, prefersSystemModelService, systemModelService } from "./policy.ts";
+import { lookupModels, resolveModel } from "./selection.ts";
 
 const logger = log.logger("model/client");
 
@@ -269,7 +267,7 @@ class DefaultModelClient implements ModelClient {
   private async fetchCatalogue(): Promise<readonly ServingEndpointSummary[]> {
     const startedAt = Date.now();
     const response = await this.client.request("/api/2.0/serving-endpoints");
-    if (!object.isRecord(response) || !Array.isArray(response.endpoints)) {
+    if (!isRecord(response) || !Array.isArray(response.endpoints)) {
       throw new Error("Databricks serving-endpoints response is missing an endpoints array");
     }
     const endpoints = await this.measureEmbeddingDimensions(normalizeEndpoints(response.endpoints));
@@ -302,7 +300,7 @@ class DefaultModelClient implements ModelClient {
         } catch (error) {
           logger.warn("embedding dimension probe failed", {
             model: endpoint.name,
-            error: errorUtils.toError(error),
+            error: toError(error),
           });
           return endpoint;
         }
@@ -312,9 +310,9 @@ class DefaultModelClient implements ModelClient {
 }
 
 function embeddingDimension(value: unknown): number | undefined {
-  if (!object.isRecord(value) || !Array.isArray(value.data)) return undefined;
+  if (!isRecord(value) || !Array.isArray(value.data)) return undefined;
   const first = value.data[0];
-  if (!object.isRecord(first) || !Array.isArray(first.embedding)) return undefined;
+  if (!isRecord(first) || !Array.isArray(first.embedding)) return undefined;
   return first.embedding.length > 0 ? first.embedding.length : undefined;
 }
 

package/src/policy.ts

@@ -4,7 +4,7 @@ import {
   ModelClass,
   type ReasoningEffort,
   type ServingEndpointSummary,
-} from "@dbx-tools/shared-model/contracts";
+} from "@dbx-tools/shared-model";
 
 import { compareVersionTuples, supportsToolsByFamily, versionTuple } from "./classify.ts";
 

package/src/reasoning-translation.ts

@@ -21,9 +21,7 @@
  * @module
  */
 
-import { json } from "@dbx-tools/shared-core";
-import { isRecord } from "@dbx-tools/shared-core/object";
-import * as stringUtils from "@dbx-tools/shared-core/string-utils";
+import { parseRecord, parse, isRecord, trimToNull } from "@dbx-tools/shared-core";
 import Fuse from "fuse.js";
 
 import { modelFamily, modelSearchQuery } from "./policy.ts";
@@ -393,8 +391,7 @@ export function adaptRequestReasoning(
 /** Normalize labels for alias lookup (`Extra High` → `extra-high`). */
 export function normalizeReasoningToken(value: string): string {
   return (
-    stringUtils
-      .trimToNull(value)
+    trimToNull(value)
       ?.toLowerCase()
       .replace(/[_\s]+/g, "-")
       .replace(/[^a-z0-9-]/g, "")
@@ -438,7 +435,7 @@ function catalogueKeysFor(model: string): string[] {
 }
 
 function modelCatalogueKey(name: string): string | undefined {
-  const trimmed = stringUtils.trimToNull(name);
+  const trimmed = trimToNull(name);
   if (!trimmed) return undefined;
   return (
     modelSearchQuery(trimmed)?.replaceAll(" ", "-") ??
@@ -483,14 +480,14 @@ function collectTextLeaves(value: unknown, depth = 0): string[] {
 }
 
 function tryUnwrapJson(text: string): unknown {
-  const asRecord = json.parseRecord(text);
+  const asRecord = parseRecord(text);
   if (asRecord) return asRecord;
-  const parsed = json.parse(text);
+  const parsed = parse(text);
   if (parsed !== undefined) return parsed;
   if (text.includes('\\"') || text.includes("\\n")) {
     const unescaped = text.replace(/\\"/g, '"').replace(/\\n/g, "\n").replace(/\\\\/g, "\\");
     if (unescaped !== text) {
-      const nested = json.parse(unescaped);
+      const nested = parse(unescaped);
       if (nested !== undefined) return nested;
     }
   }

package/src/resolve.ts

@@ -13,20 +13,17 @@ import type {
   ServingEndpointSummary,
 } from "@dbx-tools/shared-model";
 
-import {
-  lookupModels,
-  rankModelId,
-  resolveModel,
-  type ModelSelectionPolicyOptions,
-} from "./_selection.ts";
 import {
   listServingEndpoints,
   type ListServingEndpointsOptions,
   type WorkspaceClientLike,
 } from "./model-catalog.ts";
-
-export { lookupModels, rankModelId, resolveModel } from "./_selection.ts";
-export type { ModelSelectionPolicyOptions } from "./_selection.ts";
+import {
+  lookupModels,
+  rankModelId,
+  resolveModel,
+  type ModelSelectionPolicyOptions,
+} from "./selection.ts";
 
 /** Intent plus catalogue cache controls passed to {@link selectModel}. */
 export interface SelectModelInput extends ResolveModelInput {

package/src/{_retirement.ts → retirement.ts}

@@ -1,8 +1,8 @@
 /** Lightweight model retirement state shared by discovery and metadata caches. */
-import type { ModelStatus, ServingEndpointSummary } from "@dbx-tools/shared-model/contracts";
+import type { ModelStatus, ServingEndpointSummary } from "@dbx-tools/shared-model";
 
-import type { RetiredModelsSnapshot } from "./_metadata-contract.ts";
 import retiredModelsSnapshotJson from "./generated/retired-models.json" with { type: "json" };
+import type { RetiredModelsSnapshot } from "./metadata-contract.ts";
 
 const snapshot = retiredModelsSnapshotJson as RetiredModelsSnapshot;
 const RETIRED_MODEL_PREFIXES = new Set([

package/src/{_selection.ts → selection.ts}

@@ -3,7 +3,7 @@
  *
  * @module
  */
-import * as object from "@dbx-tools/shared-core/object";
+import { sequence } from "@dbx-tools/shared-core";
 import type {
   ModelQuery,
   RankedModel,
@@ -12,7 +12,7 @@ import type {
   ResolveModelInput,
   ResolveModelOptions,
   ServingEndpointSummary,
-} from "@dbx-tools/shared-model/contracts";
+} from "@dbx-tools/shared-model";
 
 import { rankEndpoints } from "./_ranking.ts";
 import { FALLBACK_MODEL_IDS, modelsForClass } from "./fallback.ts";
@@ -92,7 +92,7 @@ export function resolveModel(
 
   const floorSource =
     input.modelClass !== undefined ? modelsForClass(input.modelClass) : (input.fallbacks ?? []);
-  const floor = object.sequence(floorSource).concat(FALLBACK_MODEL_IDS).distinct().toArray();
+  const floor = sequence(floorSource).concat(FALLBACK_MODEL_IDS).distinct().toArray();
   if (input.requiresTools) {
     const available = new Set(
       endpoints.filter(endpointSupportsTools).map((endpoint) => endpoint.name),