@dbx-tools/cli 0.9.154 → 0.9.158

package/lib/src/tunnel/proxy.js

@@ -17,8 +17,9 @@
  * @module
  */
 import { createServer } from "node:http";
-import { errorUtils, log } from "@dbx-tools/shared-core";
-import { gate as tunnelGate, headers as tunnelHeaders, loginPage as tunnelLoginPage, } from "@dbx-tools/tunnel";
+import { isAuthPath } from "@dbx-tools/shared-auth";
+import { log, toError } from "@dbx-tools/shared-core";
+import { wantsHostedLogin, loginReturnTo, webRequest, sendWebResponse, gateRequest, wantsLoginPage, requestReturnTo, unauthorizedBody, toHeaderPolicy, loginPageHtml, } from "@dbx-tools/tunnel";
 import ProxyModule from "http-proxy-3";
 const logger = log.logger("tunnel:proxy");
 function sendJson(response, status, body, setCookie) {
@@ -32,19 +33,19 @@ function sendJson(response, status, body, setCookie) {
  * Hand every Better Auth and compatibility route to the shared gate runtime.
  */
 async function handleAuthRoute(request, response, path, gate, brandName, passkeyNamePrefix) {
-    if (!tunnelGate.isAuthPath(path))
+    if (!isAuthPath(path))
         return false;
-    if (tunnelGate.wantsHostedLogin(request)) {
+    if (wantsHostedLogin(request)) {
         response.writeHead(200, { "content-type": "text/html; charset=utf-8" });
-        response.end(tunnelLoginPage.loginPageHtml({
+        response.end(loginPageHtml({
             brandName,
             passkeyNamePrefix,
-            returnTo: tunnelGate.loginReturnTo(request),
+            returnTo: loginReturnTo(request),
         }));
         return true;
     }
-    const result = await gate.handler(tunnelGate.webRequest(request));
-    await tunnelGate.sendWebResponse(response, result);
+    const result = await gate.handler(webRequest(request));
+    await sendWebResponse(response, result);
     return true;
 }
 /**
@@ -62,10 +63,10 @@ export async function startProxy(options) {
         ws: true,
         xfwd: true,
     });
-    const headerPolicy = tunnelHeaders.toHeaderPolicy(options.forwardHeaders);
+    const headerPolicy = toHeaderPolicy(options.forwardHeaders);
     const gate = options.gate;
     const decide = (request) => gate
-        ? tunnelGate.gateRequest(request, {
+        ? gateRequest(request, {
             gate,
             publicDomain: (request.headers.host ?? "").split(":")[0] || "localhost",
             headerPolicy,
@@ -84,23 +85,23 @@ export async function startProxy(options) {
             if ((await decide(request)) === "deny") {
                 // A denied browser navigation gets the hosted login page; anything else
                 // (an XHR, a /ws upgrade probe, a non-HTML fetch) gets the 401 JSON.
-                if (gate && tunnelGate.wantsLoginPage(request)) {
-                    const html = tunnelLoginPage.loginPageHtml({
+                if (gate && wantsLoginPage(request)) {
+                    const html = loginPageHtml({
                         brandName,
                         passkeyNamePrefix,
-                        returnTo: tunnelGate.requestReturnTo(request),
+                        returnTo: requestReturnTo(request),
                     });
                     response.writeHead(401, { "content-type": "text/html; charset=utf-8" });
                     response.end(html);
                 }
                 else {
-                    sendJson(response, 401, tunnelGate.unauthorizedBody(request));
+                    sendJson(response, 401, unauthorizedBody(request));
                 }
                 return;
             }
             proxy.web(request, response);
         })().catch((error) => {
-            logger.error("proxy request failed", { error: errorUtils.toError(error) });
+            logger.error("proxy request failed", { error: toError(error) });
             if (!response.headersSent)
                 sendJson(response, 502, { error: "bad gateway" });
             else
@@ -114,7 +115,7 @@ export async function startProxy(options) {
         const upgradeSocket = socket;
         upgradeSocket.destroySoon ??= () => upgradeSocket.end();
         const path = (request.url ?? "/").split("?", 1)[0] ?? "/";
-        if (tunnelGate.isAuthPath(path)) {
+        if (isAuthPath(path)) {
             upgradeSocket.destroy();
             return;
         }
@@ -145,4 +146,4 @@ export async function startProxy(options) {
         });
     })));
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/tunnel/proxy.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The reverse proxy that makes the wrapper path possible.\n *\n * The wrapper claims the PUBLIC port and the wrapped app runs as a child process\n * on a private loopback port, so - unlike the in-process plugin - there is no\n * middleware chain to insert the gate into. This proxy is that insertion point: it\n * answers the login routes itself, applies the gate to everything else, and\n * forwards what survives to the child.\n *\n * The gating DECISION is not reimplemented here. `@dbx-tools/tunnel`'s\n * `gate.gateRequest` makes it - the same function the Express middleware calls -\n * and this module only differs in how the outcome is written: a proxied request\n * instead of `next()`, a `writeHead` instead of `res.json`. That is deliberate:\n * two independent implementations of \"which requests are gated and which headers\n * are stripped\" is the one way this package could become a security bug.\n *\n * @module\n */\n\nimport { createServer, type IncomingMessage, type ServerResponse } from \"node:http\";\nimport type { Socket } from \"node:net\";\nimport { errorUtils, log } from \"@dbx-tools/shared-core\";\nimport {\n  gate as tunnelGate,\n  headers as tunnelHeaders,\n  loginPage as tunnelLoginPage,\n  type AuthGateApi,\n} from \"@dbx-tools/tunnel\";\nimport ProxyModule from \"http-proxy-3\";\n\nconst logger = log.logger(\"tunnel:proxy\");\n\ntype UpgradeSocket = Socket & { destroySoon?: () => void };\n\n/** Listener, upstream application, and optional authentication settings for the wrapper proxy. */\nexport interface ProxyOptions {\n  /** The port this proxy listens on - the port portr and the platform route to. */\n  publicPort: number;\n  /** The private loopback port the wrapped app listens on. */\n  appPort: number;\n  /** The gate handlers. Omitted (an `--insecure` run) forwards everything. */\n  gate?: AuthGateApi;\n  /** Extra `x-` headers tunnel traffic may forward. */\n  forwardHeaders?: readonly string[];\n  /** Path prefixes to gate beyond `/api/` (e.g. `/ws` for a WebSocket app). */\n  gatePaths?: readonly string[];\n  /** Brand name for the hosted login page shown on a denied browser navigation. */\n  brandName?: string;\n  /** Prefix added before the humanized tunnel subdomain in new passkey names. */\n  passkeyNamePrefix?: string;\n  /**\n   * Addresses to listen on. Defaults to a single `0.0.0.0` (every interface),\n   * the portr/platform case. Pass specific interface IPs to expose the gate on\n   * only those - e.g. an overlay/LAN address while loopback reaches the upstream\n   * directly and ungated.\n   */\n  bindHosts?: readonly string[];\n}\n\nfunction sendJson(\n  response: ServerResponse,\n  status: number,\n  body: unknown,\n  setCookie?: string,\n): void {\n  response.writeHead(status, {\n    \"content-type\": \"application/json\",\n    ...(setCookie ? { \"set-cookie\": setCookie } : {}),\n  });\n  response.end(JSON.stringify(body));\n}\n\n/**\n * Hand every Better Auth and compatibility route to the shared gate runtime.\n */\nasync function handleAuthRoute(\n  request: IncomingMessage,\n  response: ServerResponse,\n  path: string,\n  gate: AuthGateApi,\n  brandName: string,\n  passkeyNamePrefix?: string,\n): Promise<boolean> {\n  if (!tunnelGate.isAuthPath(path)) return false;\n  if (tunnelGate.wantsHostedLogin(request)) {\n    response.writeHead(200, { \"content-type\": \"text/html; charset=utf-8\" });\n    response.end(\n      tunnelLoginPage.loginPageHtml({\n        brandName,\n        passkeyNamePrefix,\n        returnTo: tunnelGate.loginReturnTo(request),\n      }),\n    );\n    return true;\n  }\n  const result = await gate.handler(tunnelGate.webRequest(request));\n  await tunnelGate.sendWebResponse(response, result);\n  return true;\n}\n\n/**\n * Start the proxy and resolve once it is listening.\n *\n * `publicDomain` is intentionally NOT passed to `gateRequest`: on this path every\n * request arrived on the public port, so it IS tunnel traffic by construction -\n * whereas the in-process gate shares a port with the platform front door and has\n * to tell them apart by `Host`. Passing the request's own host keeps the shared\n * decision function's contract satisfied without weakening it.\n */\nexport async function startProxy(options: ProxyOptions): Promise<void> {\n  const proxy = ProxyModule.createProxyServer({\n    target: `http://127.0.0.1:${options.appPort}`,\n    ws: true,\n    xfwd: true,\n  });\n  const headerPolicy = tunnelHeaders.toHeaderPolicy(options.forwardHeaders);\n  const gate = options.gate;\n\n  const decide = (request: IncomingMessage): Promise<tunnelGate.GateAction> =>\n    gate\n      ? tunnelGate.gateRequest(request, {\n          gate,\n          publicDomain: (request.headers.host ?? \"\").split(\":\")[0] || \"localhost\",\n          headerPolicy,\n          gatePaths: options.gatePaths,\n        })\n      : Promise.resolve<tunnelGate.GateAction>(\"pass\");\n\n  const onRequest = (request: IncomingMessage, response: ServerResponse): void => {\n    void (async () => {\n      const path = (request.url ?? \"/\").split(\"?\")[0] ?? \"/\";\n      const brandName = options.brandName ?? \"this app\";\n      const passkeyNamePrefix = options.passkeyNamePrefix;\n      if (\n        gate &&\n        (await handleAuthRoute(request, response, path, gate, brandName, passkeyNamePrefix))\n      ) {\n        return;\n      }\n      if ((await decide(request)) === \"deny\") {\n        // A denied browser navigation gets the hosted login page; anything else\n        // (an XHR, a /ws upgrade probe, a non-HTML fetch) gets the 401 JSON.\n        if (gate && tunnelGate.wantsLoginPage(request)) {\n          const html = tunnelLoginPage.loginPageHtml({\n            brandName,\n            passkeyNamePrefix,\n            returnTo: tunnelGate.requestReturnTo(request),\n          });\n          response.writeHead(401, { \"content-type\": \"text/html; charset=utf-8\" });\n          response.end(html);\n        } else {\n          sendJson(response, 401, tunnelGate.unauthorizedBody(request));\n        }\n        return;\n      }\n      proxy.web(request, response);\n    })().catch((error: unknown) => {\n      logger.error(\"proxy request failed\", { error: errorUtils.toError(error) });\n      if (!response.headersSent) sendJson(response, 502, { error: \"bad gateway\" });\n      else response.end();\n    });\n  };\n\n  // A websocket upgrade cannot be answered with a 401 body, so a denied one is\n  // destroyed - the client sees the handshake fail, which is what a browser's\n  // WebSocket error handler expects.\n  const onUpgrade = (request: IncomingMessage, socket: Socket, head: Buffer): void => {\n    const upgradeSocket = socket as UpgradeSocket;\n    upgradeSocket.destroySoon ??= () => upgradeSocket.end();\n    const path = (request.url ?? \"/\").split(\"?\", 1)[0] ?? \"/\";\n    if (tunnelGate.isAuthPath(path)) {\n      upgradeSocket.destroy();\n      return;\n    }\n    void decide(request)\n      .then((action) => {\n        if (action === \"deny\") upgradeSocket.destroy();\n        else proxy.ws(request, upgradeSocket, head);\n      })\n      .catch(() => upgradeSocket.destroy());\n  };\n\n  // One net.Server binds one address, so listen each host on its own server that\n  // shares the same handlers. Binding specific interface IPs (rather than the\n  // default 0.0.0.0) is what lets the gate front an overlay/LAN address while\n  // loopback reaches the upstream ungated.\n  const hosts = options.bindHosts?.length ? options.bindHosts : [\"0.0.0.0\"];\n  await Promise.all(\n    hosts.map(\n      (host) =>\n        new Promise<void>((resolve) => {\n          const server = createServer(onRequest);\n          server.on(\"upgrade\", onUpgrade);\n          server.listen(options.publicPort, host, () => {\n            logger.info(\"proxy listening\", {\n              host,\n              publicPort: options.publicPort,\n              appPort: options.appPort,\n            });\n            resolve();\n          });\n        }),\n    ),\n  );\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/tunnel/proxy.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The reverse proxy that makes the wrapper path possible.\n *\n * The wrapper claims the PUBLIC port and the wrapped app runs as a child process\n * on a private loopback port, so - unlike the in-process plugin - there is no\n * middleware chain to insert the gate into. This proxy is that insertion point: it\n * answers the login routes itself, applies the gate to everything else, and\n * forwards what survives to the child.\n *\n * The gating DECISION is not reimplemented here. `@dbx-tools/tunnel`'s\n * `gate.gateRequest` makes it - the same function the Express middleware calls -\n * and this module only differs in how the outcome is written: a proxied request\n * instead of `next()`, a `writeHead` instead of `res.json`. That is deliberate:\n * two independent implementations of \"which requests are gated and which headers\n * are stripped\" is the one way this package could become a security bug.\n *\n * @module\n */\n\nimport { createServer, type IncomingMessage, type ServerResponse } from \"node:http\";\nimport type { Socket } from \"node:net\";\nimport { isAuthPath } from \"@dbx-tools/shared-auth\";\nimport { log, toError } from \"@dbx-tools/shared-core\";\nimport {\n  type AuthGateApi,\n  wantsHostedLogin,\n  loginReturnTo,\n  webRequest,\n  sendWebResponse,\n  type GateAction,\n  gateRequest,\n  wantsLoginPage,\n  requestReturnTo,\n  unauthorizedBody,\n  toHeaderPolicy,\n  loginPageHtml,\n} from \"@dbx-tools/tunnel\";\nimport ProxyModule from \"http-proxy-3\";\n\nconst logger = log.logger(\"tunnel:proxy\");\n\ntype UpgradeSocket = Socket & { destroySoon?: () => void };\n\n/** Listener, upstream application, and optional authentication settings for the wrapper proxy. */\nexport interface ProxyOptions {\n  /** The port this proxy listens on - the port portr and the platform route to. */\n  publicPort: number;\n  /** The private loopback port the wrapped app listens on. */\n  appPort: number;\n  /** The gate handlers. Omitted (an `--insecure` run) forwards everything. */\n  gate?: AuthGateApi;\n  /** Extra `x-` headers tunnel traffic may forward. */\n  forwardHeaders?: readonly string[];\n  /** Path prefixes to gate beyond `/api/` (e.g. `/ws` for a WebSocket app). */\n  gatePaths?: readonly string[];\n  /** Brand name for the hosted login page shown on a denied browser navigation. */\n  brandName?: string;\n  /** Prefix added before the humanized tunnel subdomain in new passkey names. */\n  passkeyNamePrefix?: string;\n  /**\n   * Addresses to listen on. Defaults to a single `0.0.0.0` (every interface),\n   * the portr/platform case. Pass specific interface IPs to expose the gate on\n   * only those - e.g. an overlay/LAN address while loopback reaches the upstream\n   * directly and ungated.\n   */\n  bindHosts?: readonly string[];\n}\n\nfunction sendJson(\n  response: ServerResponse,\n  status: number,\n  body: unknown,\n  setCookie?: string,\n): void {\n  response.writeHead(status, {\n    \"content-type\": \"application/json\",\n    ...(setCookie ? { \"set-cookie\": setCookie } : {}),\n  });\n  response.end(JSON.stringify(body));\n}\n\n/**\n * Hand every Better Auth and compatibility route to the shared gate runtime.\n */\nasync function handleAuthRoute(\n  request: IncomingMessage,\n  response: ServerResponse,\n  path: string,\n  gate: AuthGateApi,\n  brandName: string,\n  passkeyNamePrefix?: string,\n): Promise<boolean> {\n  if (!isAuthPath(path)) return false;\n  if (wantsHostedLogin(request)) {\n    response.writeHead(200, { \"content-type\": \"text/html; charset=utf-8\" });\n    response.end(\n      loginPageHtml({\n        brandName,\n        passkeyNamePrefix,\n        returnTo: loginReturnTo(request),\n      }),\n    );\n    return true;\n  }\n  const result = await gate.handler(webRequest(request));\n  await sendWebResponse(response, result);\n  return true;\n}\n\n/**\n * Start the proxy and resolve once it is listening.\n *\n * `publicDomain` is intentionally NOT passed to `gateRequest`: on this path every\n * request arrived on the public port, so it IS tunnel traffic by construction -\n * whereas the in-process gate shares a port with the platform front door and has\n * to tell them apart by `Host`. Passing the request's own host keeps the shared\n * decision function's contract satisfied without weakening it.\n */\nexport async function startProxy(options: ProxyOptions): Promise<void> {\n  const proxy = ProxyModule.createProxyServer({\n    target: `http://127.0.0.1:${options.appPort}`,\n    ws: true,\n    xfwd: true,\n  });\n  const headerPolicy = toHeaderPolicy(options.forwardHeaders);\n  const gate = options.gate;\n\n  const decide = (request: IncomingMessage): Promise<GateAction> =>\n    gate\n      ? gateRequest(request, {\n          gate,\n          publicDomain: (request.headers.host ?? \"\").split(\":\")[0] || \"localhost\",\n          headerPolicy,\n          gatePaths: options.gatePaths,\n        })\n      : Promise.resolve<GateAction>(\"pass\");\n\n  const onRequest = (request: IncomingMessage, response: ServerResponse): void => {\n    void (async () => {\n      const path = (request.url ?? \"/\").split(\"?\")[0] ?? \"/\";\n      const brandName = options.brandName ?? \"this app\";\n      const passkeyNamePrefix = options.passkeyNamePrefix;\n      if (\n        gate &&\n        (await handleAuthRoute(request, response, path, gate, brandName, passkeyNamePrefix))\n      ) {\n        return;\n      }\n      if ((await decide(request)) === \"deny\") {\n        // A denied browser navigation gets the hosted login page; anything else\n        // (an XHR, a /ws upgrade probe, a non-HTML fetch) gets the 401 JSON.\n        if (gate && wantsLoginPage(request)) {\n          const html = loginPageHtml({\n            brandName,\n            passkeyNamePrefix,\n            returnTo: requestReturnTo(request),\n          });\n          response.writeHead(401, { \"content-type\": \"text/html; charset=utf-8\" });\n          response.end(html);\n        } else {\n          sendJson(response, 401, unauthorizedBody(request));\n        }\n        return;\n      }\n      proxy.web(request, response);\n    })().catch((error: unknown) => {\n      logger.error(\"proxy request failed\", { error: toError(error) });\n      if (!response.headersSent) sendJson(response, 502, { error: \"bad gateway\" });\n      else response.end();\n    });\n  };\n\n  // A websocket upgrade cannot be answered with a 401 body, so a denied one is\n  // destroyed - the client sees the handshake fail, which is what a browser's\n  // WebSocket error handler expects.\n  const onUpgrade = (request: IncomingMessage, socket: Socket, head: Buffer): void => {\n    const upgradeSocket = socket as UpgradeSocket;\n    upgradeSocket.destroySoon ??= () => upgradeSocket.end();\n    const path = (request.url ?? \"/\").split(\"?\", 1)[0] ?? \"/\";\n    if (isAuthPath(path)) {\n      upgradeSocket.destroy();\n      return;\n    }\n    void decide(request)\n      .then((action) => {\n        if (action === \"deny\") upgradeSocket.destroy();\n        else proxy.ws(request, upgradeSocket, head);\n      })\n      .catch(() => upgradeSocket.destroy());\n  };\n\n  // One net.Server binds one address, so listen each host on its own server that\n  // shares the same handlers. Binding specific interface IPs (rather than the\n  // default 0.0.0.0) is what lets the gate front an overlay/LAN address while\n  // loopback reaches the upstream ungated.\n  const hosts = options.bindHosts?.length ? options.bindHosts : [\"0.0.0.0\"];\n  await Promise.all(\n    hosts.map(\n      (host) =>\n        new Promise<void>((resolve) => {\n          const server = createServer(onRequest);\n          server.on(\"upgrade\", onUpgrade);\n          server.listen(options.publicPort, host, () => {\n            logger.info(\"proxy listening\", {\n              host,\n              publicPort: options.publicPort,\n              appPort: options.appPort,\n            });\n            resolve();\n          });\n        }),\n    ),\n  );\n}\n"]}

package/lib/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/bootstrap.ts","../src/bun.ts","../src/cli.ts","../src/root.ts","../src/appkit/cli.ts","../src/appkit/env-export.ts","../src/appkit/index.ts","../src/auth/cli.ts","../src/auth/index.ts","../src/auth/options.ts","../src/brand/cli.ts","../src/brand/export.ts","../src/brand/index.ts","../src/brand/options.ts","../src/brand/run.ts","../src/brand/showcase.ts","../src/genie-code/cli.ts","../src/genie-code/config.ts","../src/genie-code/index.ts","../src/genie-code/install.ts","../src/genie-code/options.ts","../src/genie-code/runner.ts","../src/genie-code/runtime.ts","../src/graphiti/cli.ts","../src/graphiti/index.ts","../src/graphiti/options.ts","../src/lakebase-proxy/cancellation.ts","../src/lakebase-proxy/cli.ts","../src/lakebase-proxy/index.ts","../src/lakebase-proxy/options.ts","../src/lakebase-proxy/protocol.ts","../src/lakebase-proxy/proxy.ts","../src/model-gateway/cli.ts","../src/model-gateway/index.ts","../src/model-gateway/server.ts","../src/tunnel/app.ts","../src/tunnel/cli.ts","../src/tunnel/index.ts","../src/tunnel/options.ts","../src/tunnel/proxy.ts","../index.ts","../bin/dbx-genie.ts","../bin/dbx-graphiti.ts","../bin/dbx-lakebase-proxy.ts","../bin/dbx-model-gateway.ts","../bin/dbx-tools.ts"],"version":"5.9.3"}
+{"root":["../src/bootstrap.ts","../src/bun.ts","../src/cli.ts","../src/root.ts","../src/appkit/cli.ts","../src/appkit/env-export.ts","../src/auth/cli.ts","../src/auth/options.ts","../src/brand/cli.ts","../src/brand/export.ts","../src/brand/options.ts","../src/brand/run.ts","../src/brand/showcase.ts","../src/genie-code/cli.ts","../src/genie-code/config.ts","../src/genie-code/install.ts","../src/genie-code/runner.ts","../src/genie-code/runtime.ts","../src/graphiti/cli.ts","../src/lakebase-proxy/cancellation.ts","../src/lakebase-proxy/cli.ts","../src/lakebase-proxy/options.ts","../src/lakebase-proxy/protocol.ts","../src/lakebase-proxy/proxy.ts","../src/model-gateway/cli.ts","../src/model-gateway/server.ts","../src/tunnel/app.ts","../src/tunnel/cli.ts","../src/tunnel/options.ts","../src/tunnel/proxy.ts","../index.appkit.ts","../index.auth.ts","../index.brand.ts","../index.genie-code.ts","../index.graphiti.ts","../index.lakebase-proxy.ts","../index.model-gateway.ts","../index.tunnel.ts","../index.ts","../bin/dbx-genie.ts","../bin/dbx-graphiti.ts","../bin/dbx-lakebase-proxy.ts","../bin/dbx-model-gateway.ts","../bin/dbx-tools.ts"],"version":"5.9.3"}

package/package.json

@@ -34,27 +34,28 @@
   "dependencies": {
     "@clack/prompts": "^1.7.0",
     "@databricks/appkit": "0.81.0",
-    "@dbx-tools/appkit": "^0.9.154",
-    "@dbx-tools/appkit-generator": "^0.9.154",
-    "@dbx-tools/appkit-memory": "^0.9.154",
-    "@dbx-tools/appkit-model-gateway": "^0.9.154",
-    "@dbx-tools/appkit-web-search": "^0.9.154",
-    "@dbx-tools/auth": "^0.9.154",
-    "@dbx-tools/auth-gate": "^0.9.154",
-    "@dbx-tools/cli-args": "^0.9.154",
-    "@dbx-tools/cli-service": "^0.9.154",
-    "@dbx-tools/core": "^0.9.154",
-    "@dbx-tools/databricks": "^0.9.154",
-    "@dbx-tools/email": "^0.9.154",
-    "@dbx-tools/lakebase": "^0.9.154",
-    "@dbx-tools/postgres": "^0.9.154",
-    "@dbx-tools/shared-auth": "^0.9.154",
-    "@dbx-tools/shared-core": "^0.9.154",
-    "@dbx-tools/shared-email": "^0.9.154",
-    "@dbx-tools/shared-generator": "^0.9.154",
-    "@dbx-tools/shared-genie-code": "^0.9.154",
-    "@dbx-tools/shared-model-gateway": "^0.9.154",
-    "@dbx-tools/tunnel": "^0.9.154",
+    "@dbx-tools/appkit": "^0.9.158",
+    "@dbx-tools/appkit-generator": "^0.9.158",
+    "@dbx-tools/appkit-memory": "^0.9.158",
+    "@dbx-tools/appkit-model-gateway": "^0.9.158",
+    "@dbx-tools/appkit-web-search": "^0.9.158",
+    "@dbx-tools/auth": "^0.9.158",
+    "@dbx-tools/auth-gate": "^0.9.158",
+    "@dbx-tools/cli-args": "^0.9.158",
+    "@dbx-tools/cli-service": "^0.9.158",
+    "@dbx-tools/core": "^0.9.158",
+    "@dbx-tools/databricks": "^0.9.158",
+    "@dbx-tools/email": "^0.9.158",
+    "@dbx-tools/lakebase": "^0.9.158",
+    "@dbx-tools/postgres": "^0.9.158",
+    "@dbx-tools/shared-auth": "^0.9.158",
+    "@dbx-tools/shared-core": "^0.9.158",
+    "@dbx-tools/shared-email": "^0.9.158",
+    "@dbx-tools/shared-generator": "^0.9.158",
+    "@dbx-tools/shared-genie-code": "^0.9.158",
+    "@dbx-tools/shared-graphiti": "^0.9.158",
+    "@dbx-tools/shared-model-gateway": "^0.9.158",
+    "@dbx-tools/tunnel": "^0.9.158",
     "commander": "^15.0.0",
     "concurrently": "^10.0.3",
     "get-port": "^7.1.0",
@@ -83,102 +84,42 @@
         "types": "./lib/index.d.ts",
         "default": "./lib/index.js"
       },
-      "./bootstrap": {
-        "types": "./lib/src/bootstrap.d.ts",
-        "default": "./lib/src/bootstrap.js"
-      },
-      "./bun": {
-        "types": "./lib/src/bun.d.ts",
-        "default": "./lib/src/bun.js"
-      },
-      "./cli": {
-        "types": "./lib/src/cli.d.ts",
-        "default": "./lib/src/cli.js"
-      },
-      "./root": {
-        "types": "./lib/src/root.d.ts",
-        "default": "./lib/src/root.js"
-      },
-      "./*": {
-        "types": "./lib/src/*/index.d.ts",
-        "default": "./lib/src/*/index.js"
-      },
       "./appkit": {
-        "types": "./lib/src/appkit/cli.d.ts",
-        "default": "./lib/src/appkit/cli.js"
-      },
-      "./appkit/env-export": {
-        "types": "./lib/src/appkit/env-export.d.ts",
-        "default": "./lib/src/appkit/env-export.js"
+        "types": "./lib/index.appkit.d.ts",
+        "default": "./lib/index.appkit.js"
       },
       "./auth": {
-        "types": "./lib/src/auth/cli.d.ts",
-        "default": "./lib/src/auth/cli.js"
-      },
-      "./auth/options": {
-        "types": "./lib/src/auth/options.d.ts",
-        "default": "./lib/src/auth/options.js"
+        "types": "./lib/index.auth.d.ts",
+        "default": "./lib/index.auth.js"
       },
       "./brand": {
-        "types": "./lib/src/brand/cli.d.ts",
-        "default": "./lib/src/brand/cli.js"
-      },
-      "./brand/export": {
-        "types": "./lib/src/brand/export.d.ts",
-        "default": "./lib/src/brand/export.js"
+        "types": "./lib/index.brand.d.ts",
+        "default": "./lib/index.brand.js"
       },
-      "./brand/options": {
-        "types": "./lib/src/brand/options.d.ts",
-        "default": "./lib/src/brand/options.js"
-      },
-      "./brand/run": {
-        "types": "./lib/src/brand/run.d.ts",
-        "default": "./lib/src/brand/run.js"
+      "./genie-code": {
+        "types": "./lib/index.genie-code.d.ts",
+        "default": "./lib/index.genie-code.js"
       },
       "./graphiti": {
-        "types": "./lib/src/graphiti/cli.d.ts",
-        "default": "./lib/src/graphiti/cli.js"
-      },
-      "./graphiti/options": {
-        "types": "./lib/src/graphiti/options.d.ts",
-        "default": "./lib/src/graphiti/options.js"
-      },
-      "./genie": {
-        "types": "./lib/src/genie-code/cli.d.ts",
-        "default": "./lib/src/genie-code/cli.js"
-      },
-      "./genie/options": {
-        "types": "./lib/src/genie-code/options.d.ts",
-        "default": "./lib/src/genie-code/options.js"
+        "types": "./lib/index.graphiti.d.ts",
+        "default": "./lib/index.graphiti.js"
       },
       "./lakebase-proxy": {
-        "types": "./lib/src/lakebase-proxy/cli.d.ts",
-        "default": "./lib/src/lakebase-proxy/cli.js"
-      },
-      "./lakebase-proxy/options": {
-        "types": "./lib/src/lakebase-proxy/options.d.ts",
-        "default": "./lib/src/lakebase-proxy/options.js"
+        "types": "./lib/index.lakebase-proxy.d.ts",
+        "default": "./lib/index.lakebase-proxy.js"
       },
       "./model-gateway": {
-        "types": "./lib/src/model-gateway/cli.d.ts",
-        "default": "./lib/src/model-gateway/cli.js"
-      },
-      "./model-gateway/server": {
-        "types": "./lib/src/model-gateway/server.d.ts",
-        "default": "./lib/src/model-gateway/server.js"
+        "types": "./lib/index.model-gateway.d.ts",
+        "default": "./lib/index.model-gateway.js"
       },
       "./tunnel": {
-        "types": "./lib/src/tunnel/cli.d.ts",
-        "default": "./lib/src/tunnel/cli.js"
-      },
-      "./tunnel/options": {
-        "types": "./lib/src/tunnel/options.d.ts",
-        "default": "./lib/src/tunnel/options.js"
+        "types": "./lib/index.tunnel.d.ts",
+        "default": "./lib/index.tunnel.js"
       },
       "./package.json": "./package.json"
     }
   },
-  "version": "0.9.154",
+  "version": "0.9.158",
   "types": "./lib/index.d.ts",
   "dbxToolsConfig": {
     "tags": [
@@ -191,102 +132,42 @@
       "types": "./lib/index.d.ts",
       "default": "./lib/index.js"
     },
-    "./bootstrap": {
-      "types": "./lib/src/bootstrap.d.ts",
-      "default": "./lib/src/bootstrap.js"
-    },
-    "./bun": {
-      "types": "./lib/src/bun.d.ts",
-      "default": "./lib/src/bun.js"
-    },
-    "./cli": {
-      "types": "./lib/src/cli.d.ts",
-      "default": "./lib/src/cli.js"
-    },
-    "./root": {
-      "types": "./lib/src/root.d.ts",
-      "default": "./lib/src/root.js"
-    },
-    "./*": {
-      "types": "./lib/src/*/index.d.ts",
-      "default": "./lib/src/*/index.js"
-    },
     "./appkit": {
-      "types": "./lib/src/appkit/cli.d.ts",
-      "default": "./lib/src/appkit/cli.js"
-    },
-    "./appkit/env-export": {
-      "types": "./lib/src/appkit/env-export.d.ts",
-      "default": "./lib/src/appkit/env-export.js"
+      "types": "./lib/index.appkit.d.ts",
+      "default": "./lib/index.appkit.js"
     },
     "./auth": {
-      "types": "./lib/src/auth/cli.d.ts",
-      "default": "./lib/src/auth/cli.js"
-    },
-    "./auth/options": {
-      "types": "./lib/src/auth/options.d.ts",
-      "default": "./lib/src/auth/options.js"
+      "types": "./lib/index.auth.d.ts",
+      "default": "./lib/index.auth.js"
     },
     "./brand": {
-      "types": "./lib/src/brand/cli.d.ts",
-      "default": "./lib/src/brand/cli.js"
-    },
-    "./brand/export": {
-      "types": "./lib/src/brand/export.d.ts",
-      "default": "./lib/src/brand/export.js"
+      "types": "./lib/index.brand.d.ts",
+      "default": "./lib/index.brand.js"
     },
-    "./brand/options": {
-      "types": "./lib/src/brand/options.d.ts",
-      "default": "./lib/src/brand/options.js"
-    },
-    "./brand/run": {
-      "types": "./lib/src/brand/run.d.ts",
-      "default": "./lib/src/brand/run.js"
+    "./genie-code": {
+      "types": "./lib/index.genie-code.d.ts",
+      "default": "./lib/index.genie-code.js"
     },
     "./graphiti": {
-      "types": "./lib/src/graphiti/cli.d.ts",
-      "default": "./lib/src/graphiti/cli.js"
-    },
-    "./graphiti/options": {
-      "types": "./lib/src/graphiti/options.d.ts",
-      "default": "./lib/src/graphiti/options.js"
-    },
-    "./genie": {
-      "types": "./lib/src/genie-code/cli.d.ts",
-      "default": "./lib/src/genie-code/cli.js"
-    },
-    "./genie/options": {
-      "types": "./lib/src/genie-code/options.d.ts",
-      "default": "./lib/src/genie-code/options.js"
+      "types": "./lib/index.graphiti.d.ts",
+      "default": "./lib/index.graphiti.js"
     },
     "./lakebase-proxy": {
-      "types": "./lib/src/lakebase-proxy/cli.d.ts",
-      "default": "./lib/src/lakebase-proxy/cli.js"
-    },
-    "./lakebase-proxy/options": {
-      "types": "./lib/src/lakebase-proxy/options.d.ts",
-      "default": "./lib/src/lakebase-proxy/options.js"
+      "types": "./lib/index.lakebase-proxy.d.ts",
+      "default": "./lib/index.lakebase-proxy.js"
     },
     "./model-gateway": {
-      "types": "./lib/src/model-gateway/cli.d.ts",
-      "default": "./lib/src/model-gateway/cli.js"
-    },
-    "./model-gateway/server": {
-      "types": "./lib/src/model-gateway/server.d.ts",
-      "default": "./lib/src/model-gateway/server.js"
+      "types": "./lib/index.model-gateway.d.ts",
+      "default": "./lib/index.model-gateway.js"
     },
     "./tunnel": {
-      "types": "./lib/src/tunnel/cli.d.ts",
-      "default": "./lib/src/tunnel/cli.js"
-    },
-    "./tunnel/options": {
-      "types": "./lib/src/tunnel/options.d.ts",
-      "default": "./lib/src/tunnel/options.js"
+      "types": "./lib/index.tunnel.d.ts",
+      "default": "./lib/index.tunnel.js"
     },
     "./package.json": "./package.json"
   },
   "files": [
-    "index.ts",
+    "index*.ts",
     "src",
     "bin",
     "lib"

package/src/appkit/cli.ts

@@ -12,7 +12,7 @@
  * @module
  */
 
-import { appkit } from "@dbx-tools/appkit";
+import { autoConfigure } from "@dbx-tools/appkit";
 import { addArgs, parseArgs } from "@dbx-tools/cli-args";
 import { log } from "@dbx-tools/shared-core";
 import { Command, CommanderError } from "commander";
@@ -35,7 +35,7 @@ async function writeEnvExport(opts: EnvCommandOptions): Promise<void> {
 
   logger.debug("Snapshotting env vars");
   const before = snapshotEnv();
-  await appkit.autoConfigure({ autoConfigure: "env" });
+  await autoConfigure({ autoConfigure: "env" });
   const changes = diffEnv(before, snapshotEnv());
 
   process.stdout.write(formatEnvExport(changes, opts.format));
@@ -68,5 +68,3 @@ export function buildProgram(name = "dbx appkit"): Command {
 export async function runCli(argv: string[]): Promise<void> {
   await buildProgram().parseAsync(argv);
 }
-
-export { CommanderError };

package/src/auth/cli.ts

@@ -9,8 +9,8 @@
 
 import * as databricks from "@dbx-tools/auth";
 import { addArgs, parseArgs } from "@dbx-tools/cli-args";
-import type { DatabricksAuthClientInfo } from "@dbx-tools/shared-auth/client";
-import { Command, CommanderError } from "commander";
+import type { DatabricksAuthClientInfo } from "@dbx-tools/shared-auth";
+import { Command } from "commander";
 
 import {
   AuthCliOptionsSchema,
@@ -171,5 +171,3 @@ export function buildProgram(
 export async function runCli(argv: string[]): Promise<void> {
   await buildProgram().parseAsync(argv);
 }
-
-export { CommanderError };

package/src/auth/options.ts

@@ -8,8 +8,8 @@ import {
   AuthOptionsSchema,
   DatabricksAuthOptionsSchema,
   type DatabricksAuthOptions,
-} from "@dbx-tools/auth/config";
-import { stringUtils } from "@dbx-tools/shared-core";
+} from "@dbx-tools/auth";
+import { parseList } from "@dbx-tools/shared-core";
 import { z } from "zod";
 
 export const AuthCliOptionsSchema = z
@@ -25,9 +25,7 @@ export const AuthCliOptionsSchema = z
     scopes: z
       .preprocess(
         (value) =>
-          Array.isArray(value)
-            ? value.flatMap((entry) => stringUtils.parseList(String(entry)))
-            : value,
+          Array.isArray(value) ? value.flatMap((entry) => parseList(String(entry))) : value,
         z.array(z.string().trim().min(1)),
       )
       .default([])

package/src/bootstrap.ts

@@ -7,8 +7,8 @@ import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { join } from "node:path";
 import { intro, outro } from "@clack/prompts";
-import { exec } from "@dbx-tools/core";
-import { json, log } from "@dbx-tools/shared-core";
+import { spawnSync } from "@dbx-tools/core";
+import { log, parseRecord } from "@dbx-tools/shared-core";
 import { childEnv, resolveBunArgv, runBun } from "./bun.ts";
 import { rootLabel } from "./root.ts";
 
@@ -44,7 +44,7 @@ function ownVersion(): string | undefined {
     // in source but two levels away after compilation and silently fell back to
     // `@latest` in every installed CLI.
     const manifestPath = createRequire(import.meta.url).resolve(`${CLI_PACKAGE}/package.json`);
-    const version = json.parseRecord(readFileSync(manifestPath, "utf8"))?.version;
+    const version = parseRecord(readFileSync(manifestPath, "utf8"))?.version;
     return typeof version === "string" && version !== "0.0.0" ? version : undefined;
   } catch {
     return undefined;
@@ -62,7 +62,7 @@ function compareVersions(a: string, b: string): number {
 function installedEngineVersion(root: string): string | undefined {
   try {
     const manifest = join(root, "node_modules", "@dbx-tools", "projen", "package.json");
-    const version = json.parseRecord(readFileSync(manifest, "utf8"))?.version;
+    const version = parseRecord(readFileSync(manifest, "utf8"))?.version;
     return typeof version === "string" ? version : undefined;
   } catch {
     return undefined;
@@ -89,13 +89,9 @@ export function ensureEngineCurrent(root: string): void {
   runBun(["add", "-D", defaultProjenSpecifier()], root);
 }
 
-// Reach the class through its module NAMESPACE. Current engines also hoist it
-// flat, but every engine ever published exports the namespace, and this template
-// is resolved against `@latest` - a flat import dies on an older one with
-// "does not provide an export named 'DBXToolsNodeProject'".
-const PROJENRC_TEMPLATE = `import { project } from "@dbx-tools/projen";
+const PROJENRC_TEMPLATE = `import { projectJs } from "@dbx-tools/projen";
 
-const rootProject = new project.DBXToolsNodeProject();
+const rootProject = new projectJs.DBXToolsNodeProject();
 rootProject.synth();
 `;
 
@@ -153,7 +149,7 @@ export function seedToolchain(
     normalizeSeedManifest(manifestPath);
   }
 
-  const kernelArch = exec.spawnSync("uname", ["-m"], {
+  const kernelArch = spawnSync("uname", ["-m"], {
     stdin: "ignore",
     stdout: "capture",
     stderr: "ignore",
@@ -178,7 +174,7 @@ export function seedToolchain(
  */
 function normalizeSeedManifest(manifestPath: string): void {
   try {
-    const manifest = json.parseRecord(readFileSync(manifestPath, "utf8"));
+    const manifest = parseRecord(readFileSync(manifestPath, "utf8"));
     if (!manifest) return;
     delete manifest.devEngines;
     delete manifest.packageManager;
@@ -199,7 +195,7 @@ export function runInitialSynth(root: string): void {
   const [command, ...prefix] = resolveBunArgv();
   // bun runs the `.ts` directly. Registry environment aliases reach nested
   // commands through `childEnv` without writing project-level npm configuration.
-  exec.spawnSync(command, [...prefix, ".projenrc.ts"], {
+  spawnSync(command, [...prefix, ".projenrc.ts"], {
     cwd: root,
     env: childEnv({ PROJEN_DISABLE_POST: "true" }),
     check: true,

package/src/brand/options.ts

@@ -4,7 +4,7 @@
  * @module
  */
 
-import { DatabricksAuthOptionsSchema } from "@dbx-tools/auth/config";
+import { DatabricksAuthOptionsSchema } from "@dbx-tools/auth";
 import { z } from "zod";
 
 /** Options for exporting one researched brand package. */