@dbx-tools/cli 0.9.61 → 0.9.65

package/src/cli.ts

@@ -160,9 +160,7 @@ export function buildProgram(name: string = PROGRAM_NAMES[0]): Command {
 /** Build the complete command tree used for generated documentation. */
 export async function buildDocumentationProgram(name: string = PROGRAM_NAMES[0]): Promise<Command> {
   const program = buildProgram(name);
-  (program.commands as Command[]).splice(
-    1,
-    program.commands.length - 1,
+  const children = [
     (await import("./appkit/cli.ts")).buildProgram("appkit"),
     (await import("./auth/cli.ts")).buildProgram("auth"),
     (await import("./tunnel/cli.ts")).buildProgram("tunnel"),
@@ -170,7 +168,9 @@ export async function buildDocumentationProgram(name: string = PROGRAM_NAMES[0])
     (await import("./model-gateway/cli.ts")).buildProgram("model-gateway"),
     (await import("./genie-code/cli.ts")).buildProgram("genie"),
     (await import("./graphiti/cli.ts")).buildProgram("graphiti"),
-  );
+  ];
+  (program.commands as Command[]).splice(1, program.commands.length - 1);
+  for (const child of children) program.addCommand(child);
   return program;
 }
 

package/src/genie-code/config.ts

@@ -18,7 +18,7 @@ import {
   type GenieCodeConfig,
   type GenieCodeProviderOverlay,
 } from "@dbx-tools/shared-genie-code/config";
-import { genieCodePairingName } from "@dbx-tools/shared-genie-code/options";
+import { genieCodeHomeName } from "@dbx-tools/shared-genie-code/options";
 import { parse, stringify } from "smol-toml";
 
 /** Provider identifier written to the base and invocation overlay configurations. */
@@ -34,30 +34,26 @@ export interface WriteGenieCodeConfigOptions {
   projectDirectory: string;
 }
 
-/** Stable persistent home for one exact profile-model pairing. */
-export interface GenieCodePairingHome {
+/** Stable persistent home for one exact Databricks profile. */
+export interface GenieCodeProfileHome {
   configPath: string;
   home: string;
   name: string;
 }
 
-/** Persistent pairing home and invocation-specific provider overlay. */
-export interface GenieCodeHome extends GenieCodePairingHome {
+/** Persistent profile home and invocation-specific model-provider overlay. */
+export interface GenieCodeHome extends GenieCodeProfileHome {
   overlayName: string;
   overlayPath: string;
 }
 
-/** Derive the stable home for one exact profile-model pair. */
+/** Derive the stable home for one exact Databricks profile. */
 export function genieCodeHome(
   profile: string,
-  model: string,
   homeDirectory: string = homedir(),
-): GenieCodePairingHome {
-  const digest = createHash("sha256")
-    .update(JSON.stringify([profile, model]))
-    .digest("hex")
-    .slice(0, 12);
-  const name = genieCodePairingName({ profile, model, digest });
+): GenieCodeProfileHome {
+  const digest = createHash("sha256").update(profile).digest("hex").slice(0, 12);
+  const name = genieCodeHomeName({ profile, digest });
   const home = join(homeDirectory, ".dbx-tools", "genie", "profiles", name);
   return { name, home, configPath: join(home, "config.toml") };
 }
@@ -73,8 +69,6 @@ export function genieCodeBaseConfig(
     ),
   );
   return GenieCodeBaseConfigSchema.parse({
-    model_provider: GENIE_CODE_GATEWAY_PROVIDER,
-    model: options.model,
     databricks_profile: options.profile,
     projects: {
       ...projects,
@@ -82,11 +76,6 @@ export function genieCodeBaseConfig(
         trust_level: "trusted",
       },
     },
-    tui: {
-      model_availability_nux: {
-        [options.model]: 1,
-      },
-    },
   });
 }
 
@@ -95,6 +84,8 @@ export function genieCodeProviderOverlay(
   options: WriteGenieCodeConfigOptions,
 ): GenieCodeProviderOverlay {
   return GenieCodeProviderOverlaySchema.parse({
+    model_provider: GENIE_CODE_GATEWAY_PROVIDER,
+    model: options.model,
     model_providers: {
       [GENIE_CODE_GATEWAY_PROVIDER]: {
         name: "dbx-tools model gateway",
@@ -108,6 +99,11 @@ export function genieCodeProviderOverlay(
         },
       },
     },
+    tui: {
+      model_availability_nux: {
+        [options.model]: 1,
+      },
+    },
   });
 }
 
@@ -144,7 +140,7 @@ async function writePrivateToml(path: string, value: unknown): Promise<void> {
 export async function writeGenieCodeConfig(
   options: WriteGenieCodeConfigOptions,
 ): Promise<GenieCodeHome> {
-  const base = genieCodeHome(options.profile, options.model, options.homeDirectory);
+  const base = genieCodeHome(options.profile, options.homeDirectory);
   const overlayName = `dbx-${randomUUID().replaceAll("-", "")}`;
   const destination = {
     ...base,

package/src/genie-code/runtime.ts

@@ -18,6 +18,7 @@ import {
   type GenieCodeOptions,
   type GenieCodeRunnerOptions,
 } from "@dbx-tools/shared-genie-code/options";
+import type { ModelClass } from "@dbx-tools/shared-model/contracts";
 import concurrently from "concurrently";
 import getPort from "get-port";
 
@@ -33,7 +34,11 @@ export interface GenieCodeRuntimeDependencies {
   install: typeof installGenieCode;
   port(options: { host: string; port?: number }): Promise<number>;
   resolveBin(packageReference: string, binName: string): string;
-  resolveCodexModel(model: string, profile: string): Promise<string>;
+  resolveCodexModel(
+    model: string | undefined,
+    profile: string,
+    modelClass?: ModelClass,
+  ): Promise<string>;
   supervise: typeof concurrently;
   token(): string;
   writeConfig: typeof writeGenieCodeConfig;
@@ -51,12 +56,21 @@ const DEFAULT_DEPENDENCIES: GenieCodeRuntimeDependencies = {
 };
 
 /** Resolve a Genie `--model` value to the Codex catalogue slug the gateway publishes. */
-async function resolveCodexModel(model: string, profile: string): Promise<string> {
+async function resolveCodexModel(
+  model: string | undefined,
+  profile: string,
+  modelClass?: ModelClass,
+): Promise<string> {
   const client = await workspaceClient.createWorkspaceClient({ profile });
   const target = await new DatabricksModelRegistry({ client }).resolve(model, {
     requiresTools: true,
+    ...(modelClass ? { modelClass } : {}),
   });
-  if (!target) throw new Error(`Genie Code model not found: ${model}`);
+  if (!target) {
+    throw new Error(
+      model ? `Genie Code model not found: ${model}` : "No tool-capable chat model is available",
+    );
+  }
   return models.codexModelSlug(target);
 }
 
@@ -100,6 +114,7 @@ export async function prepareGenieCodeRuntime(
   logger.info("preparing Genie Code runtime", {
     profile,
     model: options.model,
+    modelClass: options.modelClass,
   });
   const installation = await dependencies.install();
   const host = options.gatewayListen.host;
@@ -111,8 +126,12 @@ export async function prepareGenieCodeRuntime(
   if (requestedPort > 0 && gatewayPort !== requestedPort) {
     throw new Error(`Genie Code gateway port ${requestedPort} is already in use`);
   }
-  const model = await dependencies.resolveCodexModel(options.model, profile);
-  logger.info("resolved Genie Code model", { requested: options.model, model });
+  const model = await dependencies.resolveCodexModel(options.model, profile, options.modelClass);
+  logger.info("resolved Genie Code model", {
+    requested: options.model,
+    modelClass: options.modelClass,
+    model,
+  });
   const urlHost = host.includes(":") ? `[${host}]` : host;
   const gatewayBaseUrl = `http://${urlHost}:${gatewayPort}/v1`;
   const gatewayHealthUrl = `http://${urlHost}:${gatewayPort}/api/healthz`;

package/src/graphiti/cli.ts

@@ -13,12 +13,12 @@ import { defineService, type CliServiceDefinition } from "@dbx-tools/cli-service
 import { runGraphiti, type GraphitiRuntimeOptions } from "@dbx-tools/graphiti/runtime";
 import { Command } from "commander";
 
-import { PACKAGE_VERSION } from "../../index.ts";
 import {
   GraphitiCliOptionsSchema,
   GraphitiOptionsSchema,
   type GraphitiOptions,
 } from "./options.ts";
+import { PACKAGE_VERSION } from "../../index.ts";
 
 /** Injectable runtime and service lifecycle boundaries for CLI callers. */
 export interface GraphitiCliDependencies {

package/src/lakebase-proxy/cli.ts

@@ -6,7 +6,6 @@ import { defineService, type CliServiceDefinition } from "@dbx-tools/cli-service
 import { connectionUrl } from "@dbx-tools/lakebase";
 import { Command } from "commander";
 
-import { PACKAGE_VERSION } from "../../index.ts";
 import {
   LakebaseProxyOptionsSchema,
   LakebaseProxyUrlOptionsSchema,
@@ -14,6 +13,7 @@ import {
   type LakebaseProxyOptions,
 } from "./options.ts";
 import { LakebaseProxy } from "./proxy.ts";
+import { PACKAGE_VERSION } from "../../index.ts";
 
 /** Injectable service boundary for Lakebase proxy CLI composition and tests. */
 export interface LakebaseProxyCliDependencies {

package/src/model-gateway/server.ts

@@ -60,7 +60,10 @@ export function gatewayBearerMiddleware(token: string): express.RequestHandler {
 /** Start the foreground model gateway and keep its AppKit server active. */
 export async function startModelGateway(options: ModelGatewayOptions = {}): Promise<void> {
   const resolved = resolveModelGatewayOptions(options);
-  const gateway = new ModelGateway();
+  const gateway = new ModelGateway({
+    ...(resolved.model ? { model: resolved.model } : {}),
+    ...(resolved.modelClass ? { modelClass: resolved.modelClass } : {}),
+  });
   const client = await workspaceClient.createWorkspaceClient({
     ...(resolved.profile ? { profile: resolved.profile } : {}),
   });