@dbx-tools/appkit-mastra 0.1.12 → 0.1.18

package/package.json

@@ -9,30 +9,35 @@
     }
   },
   "name": "@dbx-tools/appkit-mastra",
-  "version": "0.1.12",
-  "type": "module",
-  "module": "index.ts",
+  "version": "0.1.18",
   "dependencies": {
-    "@dbx-tools/appkit-mastra-shared": "0.1.12",
-    "@dbx-tools/appkit-shared": "0.1.12",
-    "@mastra/ai-sdk": "^1.3",
-    "@mastra/core": "^1.32",
-    "@mastra/express": "^1.3",
-    "@mastra/fastembed": "^1.0",
-    "@mastra/memory": "^1.17",
-    "@mastra/pg": "^1.10",
+    "@databricks/sdk-experimental": "^0.17",
+    "@dbx-tools/appkit-mastra-shared": "0.1.18",
+    "@dbx-tools/genie": "0.1.18",
+    "@dbx-tools/genie-shared": "0.1.18",
+    "@dbx-tools/shared": "0.1.18",
+    "@mastra/ai-sdk": "^1",
+    "@mastra/core": "^1",
+    "@mastra/express": "^1",
+    "@mastra/fastembed": "^1",
+    "@mastra/memory": "^1",
+    "@mastra/observability": "^1",
+    "@mastra/otel-bridge": "^1",
+    "@mastra/pg": "^1",
     "fuse.js": "^7.0.0",
     "zod": "^4.3.6"
   },
-  "peerDependencies": {
-    "@databricks/appkit": "^0.35",
-    "express": "^5"
-  },
   "devDependencies": {
     "@types/express": "^5",
     "@types/pg": "^8",
     "express": "^5"
   },
+  "module": "index.ts",
+  "peerDependencies": {
+    "@databricks/appkit": "^0.35",
+    "express": "^5"
+  },
+  "type": "module",
   "files": [
     "dist",
     "index*.ts",
@@ -46,6 +51,6 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/reggie-db/dbx-tools-appkit.git",
-    "directory": "packages/mastra"
+    "directory": "packages/appkit-mastra"
   }
 }

package/src/agents.ts

@@ -13,8 +13,7 @@
  * `chatRoute` agent for demos.
  */
 
-import { genie } from "@databricks/appkit";
-import { logUtils, pluginUtils, stringUtils } from "@dbx-tools/appkit-shared";
+import { appkitUtils, logUtils, stringUtils } from "@dbx-tools/shared";
 import { Agent } from "@mastra/core/agent";
 import type { AgentConfig, ToolsInput } from "@mastra/core/agent";
 import { createTool } from "@mastra/core/tools";
@@ -23,9 +22,9 @@ import type { PgVectorConfig, PostgresStoreConfig } from "@mastra/pg";
 
 import { buildRenderDataTool } from "./chart.js";
 import type { MastraPluginConfig } from "./config.js";
-import { buildGenieProvider } from "./genie.js";
+import { buildGenieToolkitProvider, resolveGenieSpaces } from "./genie.js";
 import type { MemoryBuilder } from "./memory.js";
-import { buildModel } from "./model.js";
+import { buildModel, FALLBACK_MODEL_IDS } from "./model.js";
 import { stripStaleChartsProcessor } from "./processors/strip-stale-charts.js";
 
 /**
@@ -399,7 +398,7 @@ function composeInstructions(agentInstructions: string, style: string | null): s
  */
 export async function buildAgents(opts: {
   config: MastraPluginConfig;
-  context: pluginUtils.PluginContextLike | undefined;
+  context: appkitUtils.PluginContextLike | undefined;
   memoryBuilder?: MemoryBuilder;
   log: logUtils.Logger;
 }): Promise<BuiltAgents> {
@@ -440,6 +439,18 @@ export async function buildAgents(opts: {
       ...(memory ? { memory } : {}),
       ...(inputProcessors.length > 0 ? { inputProcessors } : {}),
     });
+    // Surface the effective default model per agent so operators can
+    // see at a glance which endpoint each agent points at without
+    // having to fire a request and inspect a trace. The value is the
+    // *static* default; per-request overrides (header / query /
+    // body) and the workspace-catalogue fuzzy match still apply at
+    // call time.
+    log.info("agent registered", {
+      id,
+      name: def.name ?? id,
+      defaultModel: describeAgentDefaultModel(config, def),
+      tools: Object.keys(tools),
+    });
   }
 
   if (!agents[defaultAgentId]) {
@@ -448,10 +459,41 @@ export async function buildAgents(opts: {
     );
   }
 
-  log.info("agents registered", { ids, defaultAgentId });
+  log.info("agents ready", { ids, defaultAgentId });
   return { agents, defaultAgentId };
 }
 
+/**
+ * Best-effort description of the *static* default model an agent will
+ * resolve to at call time. Walks the same precedence ladder as
+ * {@link resolveModel} / {@link buildModel}:
+ *
+ *   1. Per-agent `def.model` (string sugar -> the literal id;
+ *      function / `DynamicArgument` -> `"<dynamic>"` because the
+ *      resolver decides at call time).
+ *   2. Plugin-level `config.defaultModel` (same rules).
+ *   3. `DATABRICKS_SERVING_ENDPOINT_NAME` env var.
+ *   4. First entry of `config.defaultModelFallbacks ?? FALLBACK_MODEL_IDS`.
+ *
+ * Used for the startup `agent registered` log so operators can see
+ * which endpoint each agent points at by default. Per-request
+ * overrides (`X-Mastra-Model` etc.) and the workspace-catalogue
+ * fuzzy match are still applied at runtime.
+ */
+function describeAgentDefaultModel(
+  config: MastraPluginConfig,
+  def: MastraAgentDefinition,
+): string {
+  const effective = def.model ?? config.defaultModel;
+  if (typeof effective === "string") return effective;
+  if (effective !== undefined) return "<dynamic>";
+  return (
+    process.env.DATABRICKS_SERVING_ENDPOINT_NAME ??
+    config.defaultModelFallbacks?.[0] ??
+    FALLBACK_MODEL_IDS[0]!
+  );
+}
+
 /**
  * Normalize `config.agents` into a `Record<id, definition>`. Accepts
  * any of the three shapes documented on
@@ -590,7 +632,7 @@ async function resolveTools(
  */
 function buildPluginsMap(
   config: MastraPluginConfig,
-  context: pluginUtils.PluginContextLike | undefined,
+  context: appkitUtils.PluginContextLike | undefined,
 ): MastraPlugins {
   const cache = new Map<string, MastraPluginToolkitProvider | null>();
   return new Proxy({} as MastraPlugins, {
@@ -606,22 +648,36 @@ function buildPluginsMap(
 
 /**
  * Pick the right {@link MastraPluginToolkitProvider} for a sibling
- * plugin lookup. Returns the streaming-aware Genie adapter when the
- * caller asks for `genie`; falls back to the generic AppKit
- * `ToolProvider` adapter for every other plugin name. `config` is
- * threaded through so Genie's tool can run the chart planner
- * inline against the same model resolver / fallback ladder the
- * agents use.
+ * plugin lookup. Returns the Genie agent-backed adapter when
+ * the caller asks for `genie` AND at least one space is reachable
+ * via {@link resolveGenieSpaces} (the explicit
+ * `config.genieSpaces`, the registered AppKit `genie()` plugin's
+ * `spaces` config, or the `DATABRICKS_GENIE_SPACE_ID` env var).
+ * Falls back to the generic AppKit `ToolProvider` adapter for
+ * every other plugin name. `config` is threaded through so the
+ * Genie agent inherits the same model resolver / fallback
+ * ladder the calling agents use.
+ *
+ * The legacy AppKit `genie` plugin's tools are no longer consulted
+ * at runtime - the Genie agent talks to Genie directly via
+ * `@dbx-tools/genie` (`genieEventChat`) and the workspace
+ * `statementExecution.getStatement` API. But the plugin's
+ * resource manifest and `spaces` config are still honored so
+ * existing `app.yaml` configs and `genie({ spaces })` wiring
+ * keep working without change.
  */
 function resolveProvider(
   config: MastraPluginConfig,
-  context: pluginUtils.PluginContextLike | undefined,
+  context: appkitUtils.PluginContextLike | undefined,
   propName: string,
 ): MastraPluginToolkitProvider | null {
   if (propName === "genie") {
-    const geniePlugin = pluginUtils.instance(context, genie);
-    if (!geniePlugin) return null;
-    return buildGenieProvider(geniePlugin, { config }) as MastraPluginToolkitProvider;
+    const spaces = resolveGenieSpaces(config, context);
+    if (Object.keys(spaces).length === 0) return null;
+    return buildGenieToolkitProvider({
+      spaces,
+      config,
+    }) as MastraPluginToolkitProvider;
   }
   const plugin = context?.getPlugins().get(propName);
   return adaptPluginToolkit(plugin);