@dbx-tools/appkit-mastra 0.1.92 → 0.1.94

package/dist/index.d.ts

@@ -17,6 +17,7 @@ import { Memory } from "@mastra/memory";
 import { PgVectorConfig, PostgresStore, PostgresStoreConfig } from "@mastra/pg";
 import { Pool } from "pg";
 import { MastraServer } from "@mastra/express";
+import { Workspace } from "@mastra/core/workspace";
 import * as _mastra_core_workflows0 from "@mastra/core/workflows";
 import * as _mastra_core_vector0 from "@mastra/core/vector";
 import * as _mastra_core_tts0 from "@mastra/core/tts";
@@ -576,7 +577,7 @@ declare class MemoryBuilder {
    * the `requireApproval` flow) will not be available.
    *
    * The store lives in a dedicated `mastra_instance` schema so it
-   * never collides with per-agent `mastra_<agentId>` namespaces.
+   * never collides with per-agent {@link agentStorageSchemaName} namespaces.
    * Workflow snapshots are not per-agent state; they belong to the
    * `Mastra` instance that owns the workflow execution.
    */
@@ -764,6 +765,8 @@ interface MastraPluginToolkitProvider {
 type MastraPlugins = Record<string, MastraPluginToolkitProvider>;
 /** Function form of {@link MastraAgentDefinition.tools}. */
 type MastraToolsFn = (plugins: MastraPlugins) => MastraTools | Promise<MastraTools>;
+/** Function form of {@link MastraAgentDefinition.workspace}. */
+type MastraAgentWorkspaceResolver = () => Workspace | undefined;
 /**
  * A code-defined Mastra agent. Mirrors the shape AppKit's `agents`
  * plugin uses for `AgentDefinition`. The registry key under
@@ -817,7 +820,7 @@ interface MastraAgentDefinition {
    *
    * - `undefined` (default): inherit `config.storage`. When that's
    *   enabled, the agent gets its **own per-agent `PostgresStore`**
-   *   keyed by `schemaName: "mastra_<agentId>"` so threads and
+   *   keyed by {@link agentStorageSchemaName} so threads and
    *   messages stay isolated between agents in the same database.
    * - `false`: disable storage for this agent only (purely in-memory).
    * - `true`: enable with the per-agent default schema.
@@ -825,6 +828,16 @@ interface MastraAgentDefinition {
    *   `PostgresStore` config (custom schema, connection, etc.).
    */
   storage?: boolean | MastraStorageConfigOverride;
+  /**
+   * Mastra {@link Workspace} for this agent. When it exposes skills,
+   * Mastra injects `<available_skills>` metadata each turn and mounts
+   * `skill` / `skill_search` / `skill_read` at runtime.
+   *
+   * Use a zero-arg function so resolution happens at agent registration
+   * (for example `skillWorkspace` from `@dbx-tools/appkit-skills`
+   * after `aiDevKit()` has primed the cache).
+   */
+  workspace?: Workspace | MastraAgentWorkspaceResolver;
 }
 /**
  * Distributive `Omit` so unions in `PostgresStoreConfig` /
@@ -1404,4 +1417,4 @@ declare function buildSummarizeTool(config: MastraPluginConfig): _mastra_core_to
   maxWords?: number | undefined;
 }, unknown, unknown, unknown, _mastra_core_tools0.ToolExecutionContext<unknown, unknown, unknown>, "summarize", unknown>;
 //#endregion
-export { AppKitToolOptions, BuiltAgents, ChartPlannerRequest, DEFAULT_AGENT_MAX_STEPS, DEFAULT_GENIE_ALIAS, DEFAULT_STYLE_INSTRUCTIONS, FALLBACK_AGENT_ID, FetchChartOptions, GENIE_INSTRUCTIONS, GenieSpaceConfig, GenieSpacesConfig, MASTRA_MODEL_OVERRIDE_KEY, MASTRA_REQUEST_ID_KEY, MASTRA_USER_EMAIL_KEY, MASTRA_USER_KEY, MASTRA_USER_NAME_KEY, MastraAgentDefinition, MastraMcpConfig, MastraMemoryConfig, MastraMemoryConfigOverride, MastraPlugin, MastraPluginConfig, MastraPluginToolkitProvider, MastraPlugins, MastraStorageConfigOverride, MastraTools, MastraToolsFn, type ModelOverrideRequest, PrepareChartOptions, ResolvedMcp, type SummarizeOptions, TRACE_REQUEST_CONTEXT_KEYS, ToolkitOptions, User, approvalGatedToolIds, buildAgents, buildGenieToolkitProvider, buildGenieTools, buildMcpServer, buildRenderDataTool, buildSummarizeTool, chartPlannerRequestSchema, collectSpaceSuggestions, createAgent, createTool, extractModelOverride, fetchChart, mastra, normalizeGenieSpaces, prepareChart, resolveGenieSpaces, summarizeText, tool };
+export { AppKitToolOptions, BuiltAgents, ChartPlannerRequest, DEFAULT_AGENT_MAX_STEPS, DEFAULT_GENIE_ALIAS, DEFAULT_STYLE_INSTRUCTIONS, FALLBACK_AGENT_ID, FetchChartOptions, GENIE_INSTRUCTIONS, GenieSpaceConfig, GenieSpacesConfig, MASTRA_MODEL_OVERRIDE_KEY, MASTRA_REQUEST_ID_KEY, MASTRA_USER_EMAIL_KEY, MASTRA_USER_KEY, MASTRA_USER_NAME_KEY, MastraAgentDefinition, MastraAgentWorkspaceResolver, MastraMcpConfig, MastraMemoryConfig, MastraMemoryConfigOverride, MastraPlugin, MastraPluginConfig, MastraPluginToolkitProvider, MastraPlugins, MastraStorageConfigOverride, MastraTools, MastraToolsFn, type ModelOverrideRequest, PrepareChartOptions, ResolvedMcp, type SummarizeOptions, TRACE_REQUEST_CONTEXT_KEYS, ToolkitOptions, User, approvalGatedToolIds, buildAgents, buildGenieToolkitProvider, buildGenieTools, buildMcpServer, buildRenderDataTool, buildSummarizeTool, chartPlannerRequestSchema, collectSpaceSuggestions, createAgent, createTool, extractModelOverride, fetchChart, mastra, normalizeGenieSpaces, prepareChart, resolveGenieSpaces, summarizeText, tool };

package/dist/index.js

@@ -76,6 +76,127 @@ const TRACE_REQUEST_CONTEXT_KEYS = [
 	"mastra__model_override"
 ];
 
+//#endregion
+//#region packages/appkit-mastra/src/serving-sanitize.ts
+/**
+* Repairs Mastra / AI SDK message replays sent to Databricks Model
+* Serving before they hit the OpenAI-compatible `/chat/completions`
+* route.
+*/
+const REASONING_PART_TYPES = new Set([
+	"reasoning",
+	"thinking",
+	"redacted_thinking"
+]);
+/**
+* Parse, sanitize, and re-serialize a `/serving-endpoints/...` POST
+* body. Returns the original string verbatim when the body is not
+* JSON, has no `messages`, or no rewrite was needed.
+*/
+function rewriteServingBody(body) {
+	let parsed;
+	try {
+		parsed = JSON.parse(body);
+	} catch {
+		return body;
+	}
+	if (!Array.isArray(parsed.messages)) return body;
+	const messages = parsed.messages;
+	return stripReasoningFromServingMessages(messages) || repairAssistantPrefill(messages) ? JSON.stringify(parsed) : body;
+}
+/**
+* Drop extended-thinking / reasoning blocks from a replayed transcript.
+*
+* Hybrid Claude endpoints (e.g. Sonnet 4.5+) may emit `reasoning` content
+* parts on the first turn. Mastra persists and replays them on the next
+* agent step, but Databricks-hosted Claude rejects those blocks on
+* multi-turn tool continuations. The UI already captured reasoning for
+* display; stripping here keeps provider replay compatible without
+* changing what users see in the chat bubble.
+*/
+function stripReasoningFromServingMessages(messages) {
+	let changed = false;
+	for (let i = messages.length - 1; i >= 0; i--) {
+		const msg = messages[i];
+		if (!msg) continue;
+		if (msg.role === "reasoning") {
+			messages.splice(i, 1);
+			changed = true;
+			continue;
+		}
+		if (msg.reasoning !== void 0) {
+			delete msg.reasoning;
+			changed = true;
+		}
+		if (msg.reasoning_content !== void 0) {
+			delete msg.reasoning_content;
+			changed = true;
+		}
+		if (!Array.isArray(msg.content)) continue;
+		const filtered = msg.content.filter((part) => {
+			const type = part?.type;
+			if (typeof type === "string" && REASONING_PART_TYPES.has(type)) {
+				changed = true;
+				return false;
+			}
+			return true;
+		});
+		if (filtered.length !== msg.content.length) msg.content = filtered;
+		const hasToolCalls = Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0;
+		if (msg.role === "assistant" && !hasToolCalls && isEmptyServingContent(msg.content)) {
+			messages.splice(i, 1);
+			changed = true;
+		}
+	}
+	return changed;
+}
+/**
+* Repair a Mastra/AI SDK message replay that Databricks-hosted Claude
+* rejects with `"This model does not support assistant message
+* prefill. The conversation must end with a user message."`.
+*
+* The bug pattern: when an assistant turn streams text *and* a
+* `tool_call`, the AI SDK persists them as two separate assistant
+* entries (text-only and tool-call-only). On the next agent step the
+* tool-call entry is replayed *before* the tool result and the
+* text entry is replayed *after* it, so the conversation ends with a
+* trailing assistant text message. Anthropic interprets that as a
+* prefill request and rejects it on Databricks (the upstream Bedrock
+* route disallows prefill).
+*
+* Fix: when the last message is an assistant text with no `tool_calls`
+* and the chain immediately before it is `assistant(tool_calls=...)`
+* followed only by `tool(...)` results, fold the trailing text back
+* into the `content` of that opening assistant and drop the duplicate.
+*/
+function repairAssistantPrefill(messages) {
+	if (messages.length < 2) return false;
+	const last = messages[messages.length - 1];
+	if (!last || last.role !== "assistant" || last.tool_calls && last.tool_calls.length > 0) return false;
+	let i = messages.length - 2;
+	while (i >= 0 && messages[i]?.role === "tool") i--;
+	if (i < 0) return false;
+	const opener = messages[i];
+	if (!opener || opener.role !== "assistant" || !opener.tool_calls || opener.tool_calls.length === 0) return false;
+	opener.content = [stringUtils.trimToNull(textFromServingContent(opener.content)), stringUtils.trimToNull(textFromServingContent(last.content))].filter((s) => s !== null).join("\n\n");
+	messages.pop();
+	return true;
+}
+function textFromServingContent(content) {
+	if (typeof content === "string") return content;
+	if (!Array.isArray(content)) return "";
+	return content.filter((part) => part?.type === "text" && typeof part.text === "string").map((part) => part.text).join("\n\n");
+}
+function isEmptyServingContent(content) {
+	if (content === void 0) return true;
+	if (typeof content === "string") return content.trim().length === 0;
+	if (!Array.isArray(content)) return true;
+	return content.every((part) => {
+		if (part?.type === "text") return typeof part.text !== "string" || part.text.trim().length === 0;
+		return false;
+	});
+}
+
 //#endregion
 //#region packages/appkit-mastra/src/serving.ts
 /**
@@ -219,7 +340,7 @@ const SERVING_ENDPOINTS_PATH_PREFIX = "/serving-endpoints/";
 *
 *   1. Rewrites the outgoing `messages` array to repair Mastra/AI SDK
 *      stream-replay quirks that Databricks-hosted Claude rejects (see
-*      {@link sanitizeServingMessages}).
+*      {@link rewriteServingBody} in `./serving-sanitize.js`).
 *   2. At `LOG_LEVEL=debug`, dumps the (post-sanitize) JSON body so
 *      4xx debugging doesn't have to fight AI SDK's `[Array]`
 *      formatter.
@@ -254,61 +375,6 @@ const setupFetchInterceptor = commonUtils.memoize(() => {
 		return original(input, init);
 	});
 });
-/**
-* Parse, sanitize, and re-serialize a `/serving-endpoints/...` POST
-* body. Returns the original string verbatim when the body is not
-* JSON, has no `messages`, or no rewrite was needed; this lets the
-* caller skip the allocation of a new `init` object in the common
-* pass-through case.
-*/
-function rewriteServingBody(body) {
-	let parsed;
-	try {
-		parsed = JSON.parse(body);
-	} catch {
-		return body;
-	}
-	if (!Array.isArray(parsed.messages)) return body;
-	return sanitizeServingMessages(parsed.messages) ? JSON.stringify(parsed) : body;
-}
-/**
-* Repair a Mastra/AI SDK message replay that Databricks-hosted Claude
-* rejects with `"This model does not support assistant message
-* prefill. The conversation must end with a user message."`.
-*
-* The bug pattern: when an assistant turn streams text *and* a
-* `tool_call`, the AI SDK persists them as two separate assistant
-* entries (text-only and tool-call-only). On the next agent step the
-* tool-call entry is replayed *before* the tool result and the
-* text entry is replayed *after* it, so the conversation ends with a
-* trailing assistant text message. Anthropic interprets that as a
-* prefill request and rejects it on Databricks (the upstream Bedrock
-* route disallows prefill).
-*
-* Fix: when the last message is an assistant text with no `tool_calls`
-* and the chain immediately before it is `assistant(tool_calls=...)`
-* followed only by `tool(...)` results, fold the trailing text back
-* into the `content` of that opening assistant and drop the duplicate.
-* The result is the canonical OpenAI shape
-* `[..., user, assistant(text + tool_calls), tool(...)]` which both
-* Databricks Claude and every other endpoint accept.
-*
-* Mutates `messages` in place; returns `true` when something changed
-* so the caller knows whether to re-serialize.
-*/
-function sanitizeServingMessages(messages) {
-	if (messages.length < 2) return false;
-	const last = messages[messages.length - 1];
-	if (!last || last.role !== "assistant" || last.tool_calls && last.tool_calls.length > 0) return false;
-	let i = messages.length - 2;
-	while (i >= 0 && messages[i]?.role === "tool") i--;
-	if (i < 0) return false;
-	const opener = messages[i];
-	if (!opener || opener.role !== "assistant" || !opener.tool_calls || opener.tool_calls.length === 0) return false;
-	opener.content = [stringUtils.trimToNull(opener.content), stringUtils.trimToNull(last.content)].filter((s) => s !== null).join("\n\n");
-	messages.pop();
-	return true;
-}
 
 //#endregion
 //#region packages/appkit-mastra/src/chart.ts
@@ -2191,6 +2257,7 @@ async function buildAgents(opts) {
 	const approvalGatedByAgent = [];
 	for (const [id, def] of Object.entries(definitions)) {
 		const tools = await resolveTools(def.tools, plugins, ambientTools);
+		const workspace = resolveAgentWorkspace(def.workspace);
 		const gated = approvalGatedToolIds(tools);
 		if (gated.length > 0) approvalGatedByAgent.push({
 			agentId: id,
@@ -2206,6 +2273,7 @@ async function buildAgents(opts) {
 			defaultOptions: { maxSteps: config.agentMaxSteps ?? DEFAULT_AGENT_MAX_STEPS },
 			tools,
 			...memory ? { memory } : {},
+			...workspace ? { workspace } : {},
 			inputProcessors,
 			outputProcessors
 		});
@@ -2375,6 +2443,10 @@ async function resolveTools(defTools, plugins, ambientTools) {
 		...resolved
 	};
 }
+function resolveAgentWorkspace(workspace) {
+	if (!workspace) return void 0;
+	return typeof workspace === "function" ? workspace() : workspace;
+}
 /**
 * Build the {@link MastraPlugins} runtime proxy handed to
 * `tools(plugins)` callbacks.
@@ -2758,6 +2830,36 @@ function toEpoch(value) {
 	return 0;
 }
 
+//#endregion
+//#region packages/appkit-mastra/src/storage-schema.ts
+/**
+* Derive a Postgres-safe schema name for per-agent Mastra storage.
+*
+* Agent ids are often kebab-case route segments (`data-mesh-book-assistant`)
+* but {@link PostgresStore} validates `schemaName` with Mastra's
+* `parseSqlIdentifier` (letter/underscore start, `[A-Za-z0-9_]` only, max 63).
+*/
+const SCHEMA_PREFIX = "mastra_";
+const MAX_PG_IDENTIFIER_LEN = 63;
+/**
+* Default Lakebase schema for one agent's thread/message store:
+* `mastra_<sanitized-agent-id>`.
+*/
+function agentStorageSchemaName(agentId) {
+	const maxSlugLen = MAX_PG_IDENTIFIER_LEN - 7;
+	return `${SCHEMA_PREFIX}${stringUtils.toIdentifierWithOptions({
+		delimiter: "_",
+		maxLength: maxSlugLen,
+		truncateStrategy: "hash",
+		truncateHashLength: 6
+	}, agentId) || stringUtils.toIdentifierWithOptions({
+		delimiter: "_",
+		maxLength: maxSlugLen,
+		truncateStrategy: "hash",
+		truncateHashLength: 6
+	}, "agent", agentId)}`;
+}
+
 //#endregion
 //#region packages/appkit-mastra/src/memory.ts
 /**
@@ -2767,7 +2869,7 @@ function toEpoch(value) {
 * with two independent knobs:
 *
 * - **Storage** (threads / messages via `PostgresStore`): defaults to
-*   **per-agent** namespacing via `schemaName: "mastra_<agentId>"` so
+*   **per-agent** namespacing via {@link agentStorageSchemaName} so
 *   conversation history stays isolated between agents in the same
 *   database. `PostgresStore` auto-creates the schema with
 *   `CREATE SCHEMA IF NOT EXISTS` on init.
@@ -2853,7 +2955,7 @@ var MemoryBuilder = class {
 	* the `requireApproval` flow) will not be available.
 	*
 	* The store lives in a dedicated `mastra_instance` schema so it
-	* never collides with per-agent `mastra_<agentId>` namespaces.
+	* never collides with per-agent {@link agentStorageSchemaName} namespaces.
 	* Workflow snapshots are not per-agent state; they belong to the
 	* `Mastra` instance that owns the workflow execution.
 	*/
@@ -2911,7 +3013,7 @@ var MemoryBuilder = class {
 		if (!setting) return void 0;
 		if (typeof setting === "boolean") return new PostgresStore({
 			id: `mastra-store__${agentId}`,
-			schemaName: `mastra_${agentId}`,
+			schemaName: agentStorageSchemaName(agentId),
 			pool: this.servicePrincipalPool
 		});
 		return new PostgresStore(withId(setting, `mastra-store__${agentId}`));
@@ -3744,7 +3846,7 @@ function toIso(value) {
 *   from `./memory.js`. Both auto-default to `true` when the
 *   `lakebase` plugin is registered (unless the caller passed
 *   `false` or a custom config). Storage namespaces per agent via
-*   `schemaName: "mastra_<agentId>"`; the vector store is a single
+*   {@link agentStorageSchemaName} per agent; the vector store is a single
 *   shared singleton across every agent.
 * - Server: the Express subapp wiring lives in `./server.js`.
 * - HTTP: AppKit mounts this plugin under `/api/mastra`. Alongside the

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@dbx-tools/appkit-mastra",
-  "version": "0.1.92",
+  "version": "0.1.94",
   "dependencies": {
     "@databricks/sdk-experimental": "^0.17",
-    "@dbx-tools/appkit-mastra-shared": "0.1.92",
-    "@dbx-tools/genie": "0.1.92",
-    "@dbx-tools/genie-shared": "0.1.92",
-    "@dbx-tools/model": "0.1.92",
-    "@dbx-tools/shared": "0.1.92",
+    "@dbx-tools/appkit-mastra-shared": "0.1.94",
+    "@dbx-tools/genie": "0.1.94",
+    "@dbx-tools/genie-shared": "0.1.94",
+    "@dbx-tools/model": "0.1.94",
+    "@dbx-tools/shared": "0.1.94",
     "@mastra/ai-sdk": "^1",
     "@mastra/core": "^1",
     "@mastra/express": "^1",