npm - @dbx-tools/cli - Versions diffs - 0.6.163 → 0.6.168 - Mend

@dbx-tools/cli 0.6.163 → 0.6.168

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/README.md CHANGED Viewed

@@ -1,23 +1,19 @@
 # @dbx-tools/cli
-The single `dbx` CLI: workspace lifecycle, Model Serving proxy, AppKit env,
-local token brokering, and a gated public tunnel.
+The `dbx` CLI for workspace lifecycle, AppKit env, Databricks OAuth, and a
+gated public tunnel.
-This package installs one command, `dbx` (aliased `dbx-tools`), with five
-groups:
+Available commands:
-| Command           | What it does                                                             |
-| ----------------- | ------------------------------------------------------------------------ |
-| `dbx dev`         | Bootstrap or repair a dbx-tools workspace, then forward to projen.       |
-| `dbx model-proxy` | Local OpenAI-compatible proxy in front of Databricks Model Serving.      |
-| `dbx appkit env`  | Print the environment an AppKit app resolves, as eval-able shell output. |
-| `dbx tunnel`      | Front any command with a public portr tunnel and an email-OTP gate.      |
-| `dbx token`       | Broker short-lived provider tokens for host and container clients.       |
+| Command          | What it does                                                             |
+| ---------------- | ------------------------------------------------------------------------ |
+| `dbx dev`        | Bootstrap or repair a dbx-tools workspace, then forward to projen.       |
+| `dbx appkit env` | Print the environment an AppKit app resolves, as eval-able shell output. |
+| `dbx auth`       | Generate U2M or M2M OAuth tokens with secure credential storage.         |
+| `dbx tunnel`     | Front any command with a public portr tunnel and an email-OTP gate.      |
 Key features:
-- One installed command for every dbx-tools CLI surface, so there is a single
-  thing to install and a single `--help` to discover.
 - Bootstrap path that scaffolds bun/projen into an empty or partially-set-up
   folder, including the initial install and synth.
 - Toolchain repair for a cloned repo whose generated files and `node_modules`
@@ -27,12 +23,12 @@ Key features:
   when the effective registry is not npmjs.
 - Importable CLI/root/bun helpers for tests and thin wrapper commands.
-Every feature group lives in its own package -
-[`@dbx-tools/cli-model-proxy`](../model-proxy),
-[`@dbx-tools/cli-appkit-env`](../appkit-env), and
-[`@dbx-tools/cli-tunnel`](../tunnel), and [`@dbx-tools/cli-token`](../token) -
-and is imported LAZILY, only once its name is matched, so `dbx dev` never pays
-to load the Databricks SDK, AppKit, SMTP, keychain, or X.509 stack. Run
+Every feature group lives in its own package:
+[`@dbx-tools/cli-appkit-env`](../appkit-env),
+[`@dbx-tools/cli-auth`](../auth), and
+[`@dbx-tools/cli-tunnel`](../tunnel). Each package is imported LAZILY, only once
+its name is matched, so `dbx dev` never pays to load AppKit, native OAuth,
+SMTP, or X.509 code. Run
 `dbx <group> --help` for a group's own flags; each forwards `--help` to the child
 program rather than answering it at the root.
@@ -76,29 +72,27 @@ bun run clean            # remove generated (read-only) files; -y to skip the pi
 `dbx dev <task>` still works and forwards to the same projen task, but the
 `bun run` form is the documented one for an established workspace.
-## Proxy Model Serving And Resolve AppKit Env
+## Resolve AppKit Env
 ```sh
-dbx model-proxy --profile my-workspace --port 4000
 eval "$(dbx appkit env --quiet)"
 ```
-See [`@dbx-tools/cli-model-proxy`](../model-proxy) and
-[`@dbx-tools/cli-appkit-env`](../appkit-env) for the full flag surface, auth
-resolution, and output formats.
+See [`@dbx-tools/cli-appkit-env`](../appkit-env) for output formats and
+configuration behavior.
-## Broker Local Provider Tokens
+## Authenticate With Databricks User OAuth
 ```sh
-dbx token serve --secret "$TOKEN_BROKER_SECRET"
-CLIENT_AUTH="$(dbx token client-jwt container-client --secret "$TOKEN_BROKER_SECRET")"
-dbx token access-token --auth "$CLIENT_AUTH"
+dbx auth login --profile my-workspace
+dbx auth token --profile my-workspace
+dbx auth status --profile my-workspace
 ```
-The broker keeps Google ADC under gcloud, caches access tokens only in memory,
-and defaults to signed JWT client authentication. See
-[`@dbx-tools/cli-token`](../token) for service
-installation, client authorization, Docker, Podman, and configuration.
+The auth command uses the generated Databricks auth bindings for preferred U2M
+browser OAuth, M2M client credentials, refresh, locking, and file or memory
+storage. See [`@dbx-tools/cli-auth`](../auth) for the complete command and
+option surface.
 ## Put A Gated Public URL In Front Of A Command

package/lib/src/cli.js CHANGED Viewed

@@ -1,22 +1,13 @@
 /**
- * The single `dbx` (alias `dbx-tools`) commander entry.
+ * Commander entry for `dbx` and its `dbx-tools` alias.
  *
- * One bin, five command groups:
- *   - `dev` - workspace lifecycle: detect the root, bootstrap or repair, then
- *     forward whatever follows to projen. This is the passthrough, and it is an
- *     EXPLICIT subcommand rather than the bare root action so a projen task
- *     name can never shadow (or be shadowed by) a sibling command.
- *   - `model-proxy` - the local OpenAI-compatible Model Serving proxy.
- *   - `appkit` - AppKit environment helpers (`appkit env`).
- *   - `tunnel` - public portr tunnel with passwordless access gating.
- *   - `token` - local provider access-token broker.
+ * `dev` bootstraps or repairs a workspace and forwards to projen.
+ * `appkit` provides AppKit environment helpers.
+ * `auth` manages Databricks OAuth and access tokens.
+ * `tunnel` runs a public portr tunnel with passwordless access gating.
  *
- * The four feature groups stay in sibling packages and are `await import()`ed
- * only once their name is matched, so `dbx dev` never loads the Databricks SDK,
- * AppKit, tunnel, or token-broker dependencies. That lazy hop is also why they
- * are mounted as ARG-FORWARDING commands instead of
- * `addCommand()`: building a child program eagerly to register it would defeat
- * the point. Each forwards its own `--help`, so the child prints its real help.
+ * Feature commands load their sibling packages only when selected and forward
+ * their complete argument list, including `--help`.
  *
  * @module
  */
@@ -80,7 +71,7 @@ function addForwardedCommand(program, name, description, load) {
 export function buildProgram(name = PROGRAM_NAMES[0]) {
     const program = new Command()
         .name(name)
-        .description("Databricks developer tools: workspace lifecycle, model proxy, AppKit env, tunnel, and token broker")
+        .description("Databricks developer tools: workspace lifecycle, AppKit env, auth, and tunnel")
         .showHelpAfterError()
         .helpOption("-h, --help", `Show ${name} help`);
     program
@@ -93,10 +84,9 @@ export function buildProgram(name = PROGRAM_NAMES[0]) {
         .action(async (projenArgs) => {
         await prepareAndRunProjen(projenArgs);
     });
-    addForwardedCommand(program, "model-proxy", "Serve a local OpenAI-compatible proxy in front of Databricks Model Serving", async () => (await import("@dbx-tools/cli-model-proxy/cli")).buildProgram);
     addForwardedCommand(program, "appkit", "AppKit helpers (env: print the environment an AppKit app resolves)", async () => (await import("@dbx-tools/cli-appkit-env/cli")).buildProgram);
+    addForwardedCommand(program, "auth", "Authenticate to Databricks and manage OAuth tokens", async () => (await import("@dbx-tools/cli-auth/cli")).buildProgram);
     addForwardedCommand(program, "tunnel", "Run a public portr tunnel with an email-OTP gate", async () => (await import("@dbx-tools/cli-tunnel/cli")).buildProgram);
-    addForwardedCommand(program, "token", "Broker short-lived provider access tokens for local development", async () => (await import("@dbx-tools/cli-token/cli")).buildProgram);
     return program;
 }
 /**
@@ -111,4 +101,4 @@ function programName(argv) {
 export async function runCli(argv) {
     await buildProgram(programName(argv)).parseAsync(argv);
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The single `dbx` (alias `dbx-tools`) commander entry.\n *\n * One bin, five command groups:\n *   - `dev` - workspace lifecycle: detect the root, bootstrap or repair, then\n *     forward whatever follows to projen. This is the passthrough, and it is an\n *     EXPLICIT subcommand rather than the bare root action so a projen task\n *     name can never shadow (or be shadowed by) a sibling command.\n *   - `model-proxy` - the local OpenAI-compatible Model Serving proxy.\n *   - `appkit` - AppKit environment helpers (`appkit env`).\n *   - `tunnel` - public portr tunnel with passwordless access gating.\n *   - `token` - local provider access-token broker.\n *\n * The four feature groups stay in sibling packages and are `await import()`ed\n * only once their name is matched, so `dbx dev` never loads the Databricks SDK,\n * AppKit, tunnel, or token-broker dependencies. That lazy hop is also why they\n * are mounted as ARG-FORWARDING commands instead of\n * `addCommand()`: building a child program eagerly to register it would defeat\n * the point. Each forwards its own `--help`, so the child prints its real help.\n *\n * @module\n */\nimport { basename } from \"node:path\";\nimport { Command } from \"commander\";\nimport {\n  bootstrapWorkspace,\n  ensureEngineCurrent,\n  runInitialSynth,\n  seedToolchain,\n} from \"./bootstrap.ts\";\nimport { ensureWorkspaceReady, runBun, runProjen } from \"./bun.ts\";\nimport { findWorkspaceRoot, needsBootstrap, needsToolchain } from \"./root.ts\";\n\n/** Commands the bin exposes, and the names help is rendered under. */\nconst PROGRAM_NAMES = [\"dbx\", \"dbx-tools\"] as const;\n\n/**\n * Prepare the workspace at `root`, then run projen (via bun) with `projenArgs`.\n *\n * Three cases, in order:\n *   - no `.projenrc.ts` at all -> full bootstrap (scaffold + install + synth),\n *     which already runs the initial synth; nothing more to forward.\n *   - a `.projenrc.ts` but the engine/toolchain isn't installed (e.g. a freshly\n *     copied project whose generated files + manifests are gitignored) -> seed\n *     the toolchain, then run the INITIAL synth directly (the projen tasks the\n *     args would name, like `sync`, don't exist until `.projenrc.ts` has run\n *     once), and install. Don't forward `projenArgs` - the synth is the work.\n *   - otherwise (established workspace) -> ensure deps, bring the engine up to\n *     this CLI's version, then forward to projen.\n */\nexport async function prepareAndRunProjen(projenArgs: string[], startDir?: string): Promise<void> {\n  const root = await findWorkspaceRoot(startDir);\n  if (needsBootstrap(root)) {\n    bootstrapWorkspace(root);\n    return;\n  }\n  if (needsToolchain(root)) {\n    seedToolchain(root);\n    runInitialSynth(root);\n    runBun([\"install\"], root);\n    return;\n  }\n  ensureWorkspaceReady(root);\n  ensureEngineCurrent(root);\n  runProjen(projenArgs, root);\n}\n\n/**\n * Mount `name` as a command that captures every following token verbatim and\n * hands it to the program `load()` resolves. `helpOption(false)` is what lets\n * `--help` through to the child instead of being answered here, and the child\n * program owns its own flags, so this wrapper never has to restate them.\n */\nfunction addForwardedCommand(\n  program: Command,\n  name: string,\n  description: string,\n  load: () => Promise<(name: string) => Command>,\n): void {\n  program\n    .command(name)\n    .description(description)\n    .argument(\"[args...]\", `arguments forwarded to ${name}`)\n    .allowUnknownOption()\n    .allowExcessArguments()\n    .helpOption(false)\n    .action(async (args: string[]) => {\n      const buildProgram = await load();\n      await buildProgram(`${program.name()} ${name}`).parseAsync(args, { from: \"user\" });\n    });\n}\n\n/** Build the `dbx` commander program (no side effects until parsed). */\nexport function buildProgram(name: string = PROGRAM_NAMES[0]): Command {\n  const program = new Command()\n    .name(name)\n    .description(\n      \"Databricks developer tools: workspace lifecycle, model proxy, AppKit env, tunnel, and token broker\",\n    )\n    .showHelpAfterError()\n    .helpOption(\"-h, --help\", `Show ${name} help`);\n\n  program\n    .command(\"dev\")\n    .description(\"Bootstrap or repair a dbx-tools workspace, then forward to projen\")\n    .argument(\"[projenArgs...]\", \"projen task and arguments (e.g. sync --watch)\")\n    .allowUnknownOption()\n    .allowExcessArguments()\n    .helpOption(false)\n    .action(async (projenArgs: string[]) => {\n      await prepareAndRunProjen(projenArgs);\n    });\n\n  addForwardedCommand(\n    program,\n    \"model-proxy\",\n    \"Serve a local OpenAI-compatible proxy in front of Databricks Model Serving\",\n    async () => (await import(\"@dbx-tools/cli-model-proxy/cli\")).buildProgram,\n  );\n\n  addForwardedCommand(\n    program,\n    \"appkit\",\n    \"AppKit helpers (env: print the environment an AppKit app resolves)\",\n    async () => (await import(\"@dbx-tools/cli-appkit-env/cli\")).buildProgram,\n  );\n\n  addForwardedCommand(\n    program,\n    \"tunnel\",\n    \"Run a public portr tunnel with an email-OTP gate\",\n    async () => (await import(\"@dbx-tools/cli-tunnel/cli\")).buildProgram,\n  );\n\n  addForwardedCommand(\n    program,\n    \"token\",\n    \"Broker short-lived provider access tokens for local development\",\n    async () => (await import(\"@dbx-tools/cli-token/cli\")).buildProgram,\n  );\n\n  return program;\n}\n\n/**\n * Program name for help output: whichever bin the user actually typed, so\n * `dbx-tools --help` doesn't document itself as `dbx`. Falls back to `dbx`.\n */\nfunction programName(argv: string[]): string {\n  const invoked = argv[1] ? basename(argv[1]).replace(/\\.(?:[cm]?[jt]s)$/, \"\") : undefined;\n  return PROGRAM_NAMES.find((candidate) => candidate === invoked) ?? PROGRAM_NAMES[0];\n}\n\n/** Parse `argv` (a `process.argv`) and run the matching command. */\nexport async function runCli(argv: string[]): Promise<void> {\n  await buildProgram(programName(argv)).parseAsync(argv);\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/cli.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Commander entry for `dbx` and its `dbx-tools` alias.\n *\n * `dev` bootstraps or repairs a workspace and forwards to projen.\n * `appkit` provides AppKit environment helpers.\n * `auth` manages Databricks OAuth and access tokens.\n * `tunnel` runs a public portr tunnel with passwordless access gating.\n *\n * Feature commands load their sibling packages only when selected and forward\n * their complete argument list, including `--help`.\n *\n * @module\n */\nimport { basename } from \"node:path\";\nimport { Command } from \"commander\";\nimport {\n  bootstrapWorkspace,\n  ensureEngineCurrent,\n  runInitialSynth,\n  seedToolchain,\n} from \"./bootstrap.ts\";\nimport { ensureWorkspaceReady, runBun, runProjen } from \"./bun.ts\";\nimport { findWorkspaceRoot, needsBootstrap, needsToolchain } from \"./root.ts\";\n\n/** Commands the bin exposes, and the names help is rendered under. */\nconst PROGRAM_NAMES = [\"dbx\", \"dbx-tools\"] as const;\n\n/**\n * Prepare the workspace at `root`, then run projen (via bun) with `projenArgs`.\n *\n * Three cases, in order:\n *   - no `.projenrc.ts` at all -> full bootstrap (scaffold + install + synth),\n *     which already runs the initial synth; nothing more to forward.\n *   - a `.projenrc.ts` but the engine/toolchain isn't installed (e.g. a freshly\n *     copied project whose generated files + manifests are gitignored) -> seed\n *     the toolchain, then run the INITIAL synth directly (the projen tasks the\n *     args would name, like `sync`, don't exist until `.projenrc.ts` has run\n *     once), and install. Don't forward `projenArgs` - the synth is the work.\n *   - otherwise (established workspace) -> ensure deps, bring the engine up to\n *     this CLI's version, then forward to projen.\n */\nexport async function prepareAndRunProjen(projenArgs: string[], startDir?: string): Promise<void> {\n  const root = await findWorkspaceRoot(startDir);\n  if (needsBootstrap(root)) {\n    bootstrapWorkspace(root);\n    return;\n  }\n  if (needsToolchain(root)) {\n    seedToolchain(root);\n    runInitialSynth(root);\n    runBun([\"install\"], root);\n    return;\n  }\n  ensureWorkspaceReady(root);\n  ensureEngineCurrent(root);\n  runProjen(projenArgs, root);\n}\n\n/**\n * Mount `name` as a command that captures every following token verbatim and\n * hands it to the program `load()` resolves. `helpOption(false)` is what lets\n * `--help` through to the child instead of being answered here, and the child\n * program owns its own flags, so this wrapper never has to restate them.\n */\nfunction addForwardedCommand(\n  program: Command,\n  name: string,\n  description: string,\n  load: () => Promise<(name: string) => Command>,\n): void {\n  program\n    .command(name)\n    .description(description)\n    .argument(\"[args...]\", `arguments forwarded to ${name}`)\n    .allowUnknownOption()\n    .allowExcessArguments()\n    .helpOption(false)\n    .action(async (args: string[]) => {\n      const buildProgram = await load();\n      await buildProgram(`${program.name()} ${name}`).parseAsync(args, { from: \"user\" });\n    });\n}\n\n/** Build the `dbx` commander program (no side effects until parsed). */\nexport function buildProgram(name: string = PROGRAM_NAMES[0]): Command {\n  const program = new Command()\n    .name(name)\n    .description(\"Databricks developer tools: workspace lifecycle, AppKit env, auth, and tunnel\")\n    .showHelpAfterError()\n    .helpOption(\"-h, --help\", `Show ${name} help`);\n\n  program\n    .command(\"dev\")\n    .description(\"Bootstrap or repair a dbx-tools workspace, then forward to projen\")\n    .argument(\"[projenArgs...]\", \"projen task and arguments (e.g. sync --watch)\")\n    .allowUnknownOption()\n    .allowExcessArguments()\n    .helpOption(false)\n    .action(async (projenArgs: string[]) => {\n      await prepareAndRunProjen(projenArgs);\n    });\n\n  addForwardedCommand(\n    program,\n    \"appkit\",\n    \"AppKit helpers (env: print the environment an AppKit app resolves)\",\n    async () => (await import(\"@dbx-tools/cli-appkit-env/cli\")).buildProgram,\n  );\n\n  addForwardedCommand(\n    program,\n    \"auth\",\n    \"Authenticate to Databricks and manage OAuth tokens\",\n    async () => (await import(\"@dbx-tools/cli-auth/cli\")).buildProgram,\n  );\n\n  addForwardedCommand(\n    program,\n    \"tunnel\",\n    \"Run a public portr tunnel with an email-OTP gate\",\n    async () => (await import(\"@dbx-tools/cli-tunnel/cli\")).buildProgram,\n  );\n\n  return program;\n}\n\n/**\n * Program name for help output: whichever bin the user actually typed, so\n * `dbx-tools --help` doesn't document itself as `dbx`. Falls back to `dbx`.\n */\nfunction programName(argv: string[]): string {\n  const invoked = argv[1] ? basename(argv[1]).replace(/\\.(?:[cm]?[jt]s)$/, \"\") : undefined;\n  return PROGRAM_NAMES.find((candidate) => candidate === invoked) ?? PROGRAM_NAMES[0];\n}\n\n/** Parse `argv` (a `process.argv`) and run the matching command. */\nexport async function runCli(argv: string[]): Promise<void> {\n  await buildProgram(programName(argv)).parseAsync(argv);\n}\n"]}

package/package.json CHANGED Viewed

@@ -22,18 +22,17 @@
     "projen": "projen"
   },
   "devDependencies": {
-    "@types/bun": "^1.3.14",
+    "@types/bun": "1.3.14",
     "@types/node": "^24.6.0",
     "typescript": "^5.9.3"
   },
   "dependencies": {
     "@clack/prompts": "^1.7.0",
-    "@dbx-tools/cli-appkit-env": "0.6.163",
-    "@dbx-tools/cli-model-proxy": "0.6.163",
-    "@dbx-tools/cli-token": "0.6.163",
-    "@dbx-tools/cli-tunnel": "0.6.163",
-    "@dbx-tools/core": "0.6.163",
-    "@dbx-tools/shared-core": "0.6.163",
+    "@dbx-tools/cli-appkit-env": "0.6.168",
+    "@dbx-tools/cli-auth": "0.6.168",
+    "@dbx-tools/cli-tunnel": "0.6.168",
+    "@dbx-tools/core": "0.6.168",
+    "@dbx-tools/shared-core": "0.6.168",
     "commander": "^15.0.0"
   },
   "main": "./lib/index.js",
@@ -70,7 +69,7 @@
       "./package.json": "./package.json"
     }
   },
-  "version": "0.6.163",
+  "version": "0.6.168",
   "types": "./lib/index.d.ts",
   "type": "module",
   "exports": {

package/src/cli.ts CHANGED Viewed

@@ -1,22 +1,13 @@
 /**
- * The single `dbx` (alias `dbx-tools`) commander entry.
+ * Commander entry for `dbx` and its `dbx-tools` alias.
  *
- * One bin, five command groups:
- *   - `dev` - workspace lifecycle: detect the root, bootstrap or repair, then
- *     forward whatever follows to projen. This is the passthrough, and it is an
- *     EXPLICIT subcommand rather than the bare root action so a projen task
- *     name can never shadow (or be shadowed by) a sibling command.
- *   - `model-proxy` - the local OpenAI-compatible Model Serving proxy.
- *   - `appkit` - AppKit environment helpers (`appkit env`).
- *   - `tunnel` - public portr tunnel with passwordless access gating.
- *   - `token` - local provider access-token broker.
+ * `dev` bootstraps or repairs a workspace and forwards to projen.
+ * `appkit` provides AppKit environment helpers.
+ * `auth` manages Databricks OAuth and access tokens.
+ * `tunnel` runs a public portr tunnel with passwordless access gating.
  *
- * The four feature groups stay in sibling packages and are `await import()`ed
- * only once their name is matched, so `dbx dev` never loads the Databricks SDK,
- * AppKit, tunnel, or token-broker dependencies. That lazy hop is also why they
- * are mounted as ARG-FORWARDING commands instead of
- * `addCommand()`: building a child program eagerly to register it would defeat
- * the point. Each forwards its own `--help`, so the child prints its real help.
+ * Feature commands load their sibling packages only when selected and forward
+ * their complete argument list, including `--help`.
  *
  * @module
  */
@@ -94,9 +85,7 @@ function addForwardedCommand(
 export function buildProgram(name: string = PROGRAM_NAMES[0]): Command {
   const program = new Command()
     .name(name)
-    .description(
-      "Databricks developer tools: workspace lifecycle, model proxy, AppKit env, tunnel, and token broker",
-    )
+    .description("Databricks developer tools: workspace lifecycle, AppKit env, auth, and tunnel")
     .showHelpAfterError()
     .helpOption("-h, --help", `Show ${name} help`);
@@ -111,13 +100,6 @@ export function buildProgram(name: string = PROGRAM_NAMES[0]): Command {
       await prepareAndRunProjen(projenArgs);
     });
-  addForwardedCommand(
-    program,
-    "model-proxy",
-    "Serve a local OpenAI-compatible proxy in front of Databricks Model Serving",
-    async () => (await import("@dbx-tools/cli-model-proxy/cli")).buildProgram,
-  );
   addForwardedCommand(
     program,
     "appkit",
@@ -127,16 +109,16 @@ export function buildProgram(name: string = PROGRAM_NAMES[0]): Command {
   addForwardedCommand(
     program,
-    "tunnel",
-    "Run a public portr tunnel with an email-OTP gate",
-    async () => (await import("@dbx-tools/cli-tunnel/cli")).buildProgram,
+    "auth",
+    "Authenticate to Databricks and manage OAuth tokens",
+    async () => (await import("@dbx-tools/cli-auth/cli")).buildProgram,
   );
   addForwardedCommand(
     program,
-    "token",
-    "Broker short-lived provider access tokens for local development",
-    async () => (await import("@dbx-tools/cli-token/cli")).buildProgram,
+    "tunnel",
+    "Run a public portr tunnel with an email-OTP gate",
+    async () => (await import("@dbx-tools/cli-tunnel/cli")).buildProgram,
   );
   return program;