@dbx-tools/appkit-generator 0.9.153 → 0.9.157

package/src/kpi.ts

@@ -4,13 +4,13 @@
  * @module
  */
 
-import { stringUtils } from "@dbx-tools/shared-core";
+import { toDescription } from "@dbx-tools/shared-core";
 import {
   KpiResearchRequestSchema,
   KpiResearchResultSchema,
   type KpiResearchRequest,
   type KpiResearchResult,
-} from "@dbx-tools/shared-generator/kpi";
+} from "@dbx-tools/shared-generator";
 import type { BrandResearchClient } from "./research.ts";
 import { generateStructured } from "./structured.ts";
 
@@ -28,7 +28,7 @@ export interface ResearchKpisOptions {
 
 /** Build the web query that grounds KPI selection in the requested questions. */
 export function kpiResearchQuery(request: KpiResearchRequest): string {
-  return stringUtils.toDescription(`
+  return toDescription(`
     Research current, standard business KPIs for ${request.company} and the
     purpose "${request.purpose}". The generated demo must answer these
     questions: ${request.queries.join(" | ")}. Prefer authoritative industry,

package/src/namespace.ts

@@ -10,13 +10,13 @@ import {
   getExecutionContext,
   type WorkspaceClient,
 } from "@databricks/appkit";
-import { databricks } from "@dbx-tools/appkit";
-import { errorUtils, hash, stringUtils } from "@dbx-tools/shared-core";
+import { toContext } from "@dbx-tools/appkit";
+import { errorContext, fnvHash, toIdentifierWithOptions, trimToNull } from "@dbx-tools/shared-core";
 import {
   GeneratedSchemaSchema,
   type GeneratedSchema,
   type GeneratorRequest,
-} from "@dbx-tools/shared-generator/workflow";
+} from "@dbx-tools/shared-generator";
 
 const OWNER_DIGEST_PROPERTY = "dbx_tools.generator.owner_digest";
 const REQUEST_DIGEST_PROPERTY = "dbx_tools.generator.request_digest";
@@ -43,7 +43,7 @@ export interface GeneratorIdentity {
 
 /** Derive a readable, bounded schema name with collision-resistant overflow. */
 export function generatorSchemaName(principal: string, company: string, purpose: string): string {
-  const base = stringUtils.toIdentifierWithOptions(
+  const base = toIdentifierWithOptions(
     {
       delimiter: "_",
       omitEmailDomain: true,
@@ -65,7 +65,7 @@ export async function resolveGeneratorIdentity(): Promise<GeneratorIdentity> {
     throw new ConfigurationError("Generator operations require an on-behalf-of user context");
   }
   const current = await context.client.currentUser.me();
-  const principal = stringUtils.trimToNull(current.userName);
+  const principal = trimToNull(current.userName);
   if (!principal) {
     throw new ConfigurationError("The current Databricks user has no userName");
   }
@@ -88,7 +88,7 @@ async function getSchema(
   try {
     return await client.toLegacyWorkspaceClient().schemas.get({ full_name: fullName });
   } catch (cause) {
-    const context = errorUtils.errorContext(cause);
+    const context = errorContext(cause);
     if (context.hasStatusCode(404) || context.hasMessage("does not exist")) return undefined;
     throw cause;
   }
@@ -129,7 +129,7 @@ export async function provisionGeneratorSchemaWithIdentity(
   identity: GeneratorIdentity,
   signal?: AbortSignal,
 ): Promise<GeneratedSchema> {
-  const catalog = stringUtils.trimToNull(input.catalog);
+  const catalog = trimToNull(input.catalog);
   if (!catalog) throw new ConfigurationError("GENERATOR_CATALOG is required");
 
   const schemaName = generatorSchemaName(
@@ -138,9 +138,9 @@ export async function provisionGeneratorSchemaWithIdentity(
     input.request.purpose,
   );
   const fullName = `${catalog}.${schemaName}`;
-  const ownerDigest = hash.fnvHash(identity.userId);
-  const requestDigest = hash.fnvHash(identity.userId, input.request.company, input.request.purpose);
-  const context = signal ? databricks.toContext(signal) : undefined;
+  const ownerDigest = fnvHash(identity.userId);
+  const requestDigest = fnvHash(identity.userId, input.request.company, input.request.purpose);
+  const context = signal ? toContext(signal) : undefined;
 
   await identity.userClient.toLegacyWorkspaceClient().catalogs.get({ name: catalog });
 
@@ -160,7 +160,7 @@ export async function provisionGeneratorSchemaWithIdentity(
         context,
       );
     } catch (cause) {
-      if (!errorUtils.errorContext(cause).hasMessage("already exists")) throw cause;
+      if (!errorContext(cause).hasMessage("already exists")) throw cause;
     }
     schema = await getSchema(identity.serviceClient, fullName);
   }

package/src/operations.ts

@@ -5,9 +5,11 @@
  */
 
 import { ConfigurationError } from "@databricks/appkit";
-import type { BrandGenerationRequest, BrandPackage } from "@dbx-tools/shared-generator/brand";
-import type { KpiResearchRequest, KpiResearchResult } from "@dbx-tools/shared-generator/kpi";
 import type {
+  BrandGenerationRequest,
+  BrandPackage,
+  KpiResearchRequest,
+  KpiResearchResult,
   CreateGeneratorPresentationRequest,
   GeneratedDashboard,
   GeneratedGenieSpace,
@@ -17,7 +19,7 @@ import type {
   MaterializedGeneratorData,
   PlanGeneratorDataRequest,
   ProvisionGeneratorSchemaRequest,
-} from "@dbx-tools/shared-generator/workflow";
+} from "@dbx-tools/shared-generator";
 import type { ResolvedGeneratorConfig } from "./config.ts";
 import { createGeneratorDashboard } from "./dashboard.ts";
 import { materializeGeneratorData } from "./data.ts";

package/src/plan.ts

@@ -4,13 +4,13 @@
  * @module
  */
 
-import type { BrandPackage } from "@dbx-tools/shared-generator/brand";
-import type { KpiResearchResult } from "@dbx-tools/shared-generator/kpi";
 import {
   GeneratorPlanSchema,
+  type BrandPackage,
+  type KpiResearchResult,
   type GeneratorPlan,
   type GeneratorRequest,
-} from "@dbx-tools/shared-generator/workflow";
+} from "@dbx-tools/shared-generator";
 import { generateStructured } from "./structured.ts";
 
 /** Inputs for deterministic demo-data planning. */

package/src/plugin.ts

@@ -6,10 +6,10 @@
 
 import { defineManifest, toPlugin, type IAppRouter } from "@databricks/appkit";
 import { defineTool, type ToolRegistry } from "@databricks/appkit/beta";
-import { pluginRegistry, ToolRegistryPlugin } from "@dbx-tools/appkit";
+import { ToolRegistryPlugin, require } from "@dbx-tools/appkit";
 import { mastra } from "@dbx-tools/appkit-mastra";
 import { webSearch } from "@dbx-tools/appkit-web-search";
-import { errorUtils, log } from "@dbx-tools/shared-core";
+import { log, toError } from "@dbx-tools/shared-core";
 import {
   GENERATOR_ROUTES,
   GeneratorClientConfigSchema,
@@ -17,9 +17,10 @@ import {
   BrandGenerationEventSchema,
   BrandGenerationRequestSchema,
   type BrandGenerationEvent,
-} from "@dbx-tools/shared-generator/brand";
-import { KpiResearchRequestSchema, KpiResearchResultSchema } from "@dbx-tools/shared-generator/kpi";
+} from "@dbx-tools/shared-generator";
 import {
+  KpiResearchRequestSchema,
+  KpiResearchResultSchema,
   CreateGeneratorPresentationRequestSchema,
   GeneratedAssetsSchema,
   GeneratedDashboardSchema,
@@ -30,7 +31,7 @@ import {
   MaterializedGeneratorDataSchema,
   PlanGeneratorDataRequestSchema,
   ProvisionGeneratorSchemaRequestSchema,
-} from "@dbx-tools/shared-generator/workflow";
+} from "@dbx-tools/shared-generator";
 import {
   resolveGeneratorConfig,
   type GeneratorPluginConfig,
@@ -129,10 +130,7 @@ export class GeneratorPlugin extends ToolRegistryPlugin<GeneratorPluginConfig> {
       researchClient: this.researchClient(),
     });
     this.workflow = createGeneratorWorkflow(this.operations);
-    pluginRegistry
-      .require(this.context, mastra, this)
-      .exports()
-      .registerWorkflow(WORKFLOW_KEY, this.workflow);
+    require(this.context, mastra, this).exports().registerWorkflow(WORKFLOW_KEY, this.workflow);
     logger.info("ready", {
       model: this.resolved.model ?? "automatic",
       catalog: this.resolved.catalog ?? "brand-only",
@@ -185,7 +183,7 @@ export class GeneratorPlugin extends ToolRegistryPlugin<GeneratorPluginConfig> {
             .generateBrand(parsed.data, controller.signal, send);
           send({ type: "result", package: generated });
         } catch (cause) {
-          logger.warn("brand-route-failed", { error: errorUtils.toError(cause) });
+          logger.warn("brand-route-failed", { error: toError(cause) });
           send({
             type: "error",
             message:
@@ -224,7 +222,7 @@ export class GeneratorPlugin extends ToolRegistryPlugin<GeneratorPluginConfig> {
 
   /** Resolve the sibling web-search plugin without recreating its policy. */
   private researchClient(): BrandResearchClient {
-    const sibling = pluginRegistry.require(this.context, webSearch, this).exports();
+    const sibling = require(this.context, webSearch, this).exports();
     return {
       search: sibling.search,
       fetch: sibling.fetch,

package/src/research.ts

@@ -9,23 +9,21 @@ import type {
   WebAssetPageFetchRequest,
   WebImageFetchRequest,
   WebImageFetchResult,
-} from "@dbx-tools/appkit-web-search/fetch";
-import type {
   WebFetchRequest,
   WebFetchResult,
   WebSearchCitation,
   WebSearchRequest,
   WebSearchResult,
-} from "@dbx-tools/appkit-web-search/schema";
-import { errorUtils, log, stringUtils } from "@dbx-tools/shared-core";
+} from "@dbx-tools/appkit-web-search";
+import { log, toError, toDescription } from "@dbx-tools/shared-core";
+import type {
+  BrandGenerationProgressEvent,
+  BrandGenerationRequest,
+  BrandPackageSource,
+  BrandVisualReference,
+} from "@dbx-tools/shared-generator";
 import { discoverMobileAppVisuals } from "./assets.ts";
-import {
-  brandRequestSubject,
-  type BrandGenerationProgressEvent,
-  type BrandGenerationRequest,
-  type BrandPackageSource,
-  type BrandVisualReference,
-} from "./schema.ts";
+import { brandRequestSubject } from "./schema.ts";
 
 const logger = log.logger("brand/research");
 
@@ -118,7 +116,7 @@ function fetchAssetPage(
 export function brandResearchQuery(request: BrandGenerationRequest): string {
   const subject = brandRequestSubject(request);
   const website = request.website ? ` The known official website is ${request.website}.` : "";
-  return stringUtils.toDescription(`
+  return toDescription(`
     Research the official brand identity and design direction for "${subject}".${website}
     The broader brief is: ${request.prompt ?? subject}.
     Prefer first-party sources and cite the official website first. Identify
@@ -193,7 +191,7 @@ async function researchMobileStore(
           logger.warn("mobile-image-fetch-failed", {
             platform,
             url,
-            error: errorUtils.toError(error),
+            error: toError(error),
           });
           return { url };
         } finally {
@@ -217,7 +215,7 @@ async function researchMobileStore(
   } catch (error) {
     logger.warn("mobile-store-research-failed", {
       platform,
-      error: errorUtils.toError(error),
+      error: toError(error),
     });
     await onProgress?.({
       type: "progress",
@@ -304,7 +302,7 @@ async function fetchSource(
   } catch (error) {
     logger.warn("source-fetch-failed", {
       url: citation.url,
-      error: errorUtils.toError(error),
+      error: toError(error),
     });
     return { ...citation, fetched: false };
   } finally {
@@ -403,7 +401,7 @@ export async function researchBrand(
     ).catch((error: unknown) => {
       logger.warn("official-page-html-fetch-failed", {
         url: official.url,
-        error: errorUtils.toError(error),
+        error: toError(error),
       });
       return undefined;
     }),

package/src/schema.ts

@@ -6,45 +6,20 @@
  * @module
  */
 
-import { stringUtils } from "@dbx-tools/shared-core";
-import type { BrandGenerationRequest as SharedBrandGenerationRequest } from "@dbx-tools/shared-generator/brand";
+import { toDescription } from "@dbx-tools/shared-core";
+import { type BrandGenerationRequest } from "@dbx-tools/shared-generator";
 import { z } from "zod";
 
-export {
-  BrandGenerationErrorEventSchema,
-  BrandGenerationEventSchema,
-  BrandGenerationProgressEventSchema,
-  BrandGenerationRequestSchema,
-  BrandGenerationResultEventSchema,
-  BrandGenerationStageSchema,
-  BrandPackageSchema,
-  BrandPackageSourceSchema,
-  BrandVisualImageSchema,
-  BrandVisualReferenceSchema,
-} from "@dbx-tools/shared-generator/brand";
-export type {
-  BrandGenerationErrorEvent,
-  BrandGenerationEvent,
-  BrandGenerationProgressEvent,
-  BrandGenerationRequest,
-  BrandGenerationResultEvent,
-  BrandGenerationStage,
-  BrandPackage,
-  BrandPackageSource,
-  BrandVisualImage,
-  BrandVisualReference,
-} from "@dbx-tools/shared-generator/brand";
-
 const nonBlankString = z.string().trim().min(1);
 const color = z.string().regex(/^#(?:[\da-f]{3}|[\da-f]{6}|[\da-f]{8})$/i, "Expected a hex color.");
 
 /** Resolve the human-readable subject from a validated brand request. */
-export function brandRequestSubject(request: SharedBrandGenerationRequest): string {
+export function brandRequestSubject(request: BrandGenerationRequest): string {
   return request.name ?? request.prompt!;
 }
 
 /** Description shared by the native AppKit brand-generation tool. */
-export const GENERATE_BRAND_TOOL_DESCRIPTION = stringUtils.toDescription(`
+export const GENERATE_BRAND_TOOL_DESCRIPTION = toDescription(`
   Research a named organization or product on the web and generate a portable
   branding package. The result includes a validated BrandContext for
   application and email presentation plus the sources used. Supply the

package/src/structured.ts

@@ -5,7 +5,7 @@
  */
 
 import type { WorkspaceClient } from "@databricks/appkit";
-import { buildModel, RESPONSES_PROVIDER_OPTIONS } from "@dbx-tools/appkit-mastra/model";
+import { buildModel, RESPONSES_PROVIDER_OPTIONS } from "@dbx-tools/appkit-mastra";
 import { Agent } from "@mastra/core/agent";
 import type { MessageListInput } from "@mastra/core/agent/message-list";
 import type { z } from "zod";

package/src/workflow.ts

@@ -4,15 +4,15 @@
  * @module
  */
 
-import { BrandPackageSchema, type BrandGenerationRequest } from "@dbx-tools/shared-generator/brand";
-import { KpiResearchResultSchema } from "@dbx-tools/shared-generator/kpi";
+import { BrandPackageSchema, type BrandGenerationRequest } from "@dbx-tools/shared-generator";
 import {
+  KpiResearchResultSchema,
   GeneratedAssetsSchema,
   GeneratedSchemaSchema,
   GeneratorPlanSchema,
   GeneratorRequestSchema,
   MaterializedGeneratorDataSchema,
-} from "@dbx-tools/shared-generator/workflow";
+} from "@dbx-tools/shared-generator";
 import { createStep, createWorkflow } from "@mastra/core/workflows";
 import { z } from "zod";
 import type { GeneratorOperations } from "./operations.ts";