diff --git a/experimental/apps-mcp/lib/prompts/apps.tmpl b/experimental/apps-mcp/lib/prompts/apps.tmpl index 98c29d0c2a..a164db006a 100644 --- a/experimental/apps-mcp/lib/prompts/apps.tmpl +++ b/experimental/apps-mcp/lib/prompts/apps.tmpl @@ -13,7 +13,7 @@ DATABRICKS APPS DEVELOPMENT ⚠️ ALWAYS start by scaffolding a new Databricks app using command: -invoke_databricks_cli 'experimental apps-mcp tools init-template https://github.com/databricks/cli --template-dir experimental/apps-mcp/templates/appkit --branch mcp/appkit-bundle --config-json '{"project_name":"my-app-name","app_description":"my-app-description","sql_warehouse_id":"{{if .WarehouseID}}{{.WarehouseID}}{{end}}"}'' +invoke_databricks_cli 'experimental apps-mcp tools init-template https://github.com/databricks/cli --template-dir experimental/apps-mcp/templates/appkit --branch main --config-json '{"project_name":"my-app-name","app_description":"my-app-description","sql_warehouse_id":"{{if .WarehouseID}}{{.WarehouseID}}{{end}}"}'' # Validation diff --git a/experimental/apps-mcp/lib/templates/appkit/.env.tmpl b/experimental/apps-mcp/lib/templates/appkit/.env.tmpl deleted file mode 100644 index 3be358d0fb..0000000000 --- a/experimental/apps-mcp/lib/templates/appkit/.env.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -DATABRICKS_HOST={{.WorkspaceURL}} -DATABRICKS_WAREHOUSE_ID={{.WarehouseID}} -DATABRICKS_APP_PORT=8000 -DATABRICKS_APP_NAME=minimal -FLASK_RUN_HOST=0.0.0.0 diff --git a/experimental/apps-mcp/lib/templates/appkit/databricks.yml b/experimental/apps-mcp/lib/templates/appkit/databricks.yml deleted file mode 100644 index f5c24ec3e5..0000000000 --- a/experimental/apps-mcp/lib/templates/appkit/databricks.yml +++ /dev/null @@ -1,49 +0,0 @@ -bundle: - name: minimal - -variables: - warehouse_id: - description: The ID of the warehouse to use - lookup: - warehouse: Serverless Starter Warehouse - -resources: - apps: - minimal: - name: ${bundle.target}-minimal - description: A minimal Databricks App powered by Databricks AppKit - source_code_path: ./ - - # Uncomment to enable on behalf of user API scopes. Available scopes: sql, dashboards.genie, files.files - # user_api_scopes: - # - sql - - # The resources which this app has access to. - resources: - - name: 'warehouse' - sql_warehouse: - id: ${var.warehouse_id} - permission: 'CAN_USE' - -targets: - dev: - mode: development - default: true - # Uncomment to set a specific workspace host for development - # workspace: - # host: https://6177827686947384.4.gcp.databricks.com/ - - # Uncomment to set a specific warehouse - # variables: - # warehouse_id: e1234567890 - - prod: - mode: production - # workspace: - # host: https://... - # variables: - # warehouse_id: ... - resources: - apps: - minimal: - name: minimal diff --git a/experimental/apps-mcp/lib/templates/embed.go b/experimental/apps-mcp/lib/templates/embed.go deleted file mode 100644 index 42bc4a4502..0000000000 --- a/experimental/apps-mcp/lib/templates/embed.go +++ /dev/null @@ -1,18 +0,0 @@ -package templates - -import ( - "embed" -) - -//go:embed appkit/* -var appkitFS embed.FS - -// GetAppKitTemplate returns the embedded AppKit template -func GetAppKitTemplate() Template { - return NewEmbeddedTemplate( - "AppKit", - "Modern full-stack template with AppKit, TypeScript, and React", - appkitFS, - "appkit", - ) -} diff --git a/experimental/apps-mcp/lib/templates/template.go b/experimental/apps-mcp/lib/templates/template.go deleted file mode 100644 index 7eba20f7fc..0000000000 --- a/experimental/apps-mcp/lib/templates/template.go +++ /dev/null @@ -1,75 +0,0 @@ -package templates - -import ( - "embed" - "fmt" - "io/fs" - "strings" -) - -// Template represents a project template -type Template interface { - Name() string - Description() string - Files() (map[string]string, error) -} - -// EmbeddedTemplate is a template loaded from an embedded filesystem -type EmbeddedTemplate struct { - name string - description string - fsys embed.FS - root string -} - -// NewEmbeddedTemplate creates a new embedded template -func NewEmbeddedTemplate(name, desc string, fsys embed.FS, root string) *EmbeddedTemplate { - return &EmbeddedTemplate{ - name: name, - description: desc, - fsys: fsys, - root: root, - } -} - -// Name returns the template name -func (t *EmbeddedTemplate) Name() string { - return t.name -} - -// Description returns the template description -func (t *EmbeddedTemplate) Description() string { - return t.description -} - -// Files returns a map of file paths to their contents -func (t *EmbeddedTemplate) Files() (map[string]string, error) { - files := make(map[string]string) - - err := fs.WalkDir(t.fsys, t.root, func(path string, d fs.DirEntry, err error) error { - if err != nil { - return err - } - - if d.IsDir() { - return nil - } - - // Read file content - content, err := fs.ReadFile(t.fsys, path) - if err != nil { - return fmt.Errorf("failed to read %s: %w", path, err) - } - - // Remove root prefix from path - relativePath := strings.TrimPrefix(path, t.root+"/") - if relativePath == "" { - relativePath = path - } - files[relativePath] = string(content) - - return nil - }) - - return files, err -} diff --git a/experimental/apps-mcp/lib/templates/.gitignore b/experimental/apps-mcp/templates/.gitignore similarity index 100% rename from experimental/apps-mcp/lib/templates/.gitignore rename to experimental/apps-mcp/templates/.gitignore diff --git a/experimental/apps-mcp/templates/appkit/databricks_template_schema.json b/experimental/apps-mcp/templates/appkit/databricks_template_schema.json new file mode 100644 index 0000000000..dc9f86e7ce --- /dev/null +++ b/experimental/apps-mcp/templates/appkit/databricks_template_schema.json @@ -0,0 +1,24 @@ +{ + "properties": { + "project_name": { + "type": "string", + "description": "Project Name", + "order": 1, + "pattern": "^[A-Za-z0-9_-]+$", + "pattern_match_failure_message": "Name must consist of letters, numbers, underscores, or hyphens." + }, + "sql_warehouse_id": { + "type": "string", + "description": "SQL Warehouse ID", + "order": 2 + }, + "app_description": { + "type": "string", + "description": "App Description (Optional)", + "default": "A Databricks App powered by Databricks AppKit", + "order": 3 + } + + }, + "success_message": "\nYour new project has been created in the '{{.project_name}}' directory!" + } diff --git a/experimental/apps-mcp/lib/templates/appkit/.env.example b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/.env.example similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/.env.example rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/.env.example diff --git a/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/.env.tmpl b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/.env.tmpl new file mode 100644 index 0000000000..5d09570971 --- /dev/null +++ b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/.env.tmpl @@ -0,0 +1,5 @@ +DATABRICKS_HOST={{workspace_host}} +DATABRICKS_WAREHOUSE_ID={{.sql_warehouse_id}} +DATABRICKS_APP_PORT=8000 +DATABRICKS_APP_NAME=minimal +FLASK_RUN_HOST=0.0.0.0 diff --git a/experimental/apps-mcp/lib/templates/appkit/.gitignore.tmpl b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/.gitignore.tmpl similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/.gitignore.tmpl rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/.gitignore.tmpl diff --git a/experimental/apps-mcp/lib/templates/appkit/.prettierignore b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/.prettierignore similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/.prettierignore rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/.prettierignore diff --git a/experimental/apps-mcp/lib/templates/appkit/.prettierrc.json b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/.prettierrc.json similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/.prettierrc.json rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/.prettierrc.json diff --git a/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/AGENTS.md b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/AGENTS.md new file mode 120000 index 0000000000..681311eb9c --- /dev/null +++ b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/AGENTS.md @@ -0,0 +1 @@ +CLAUDE.md \ No newline at end of file diff --git a/experimental/apps-mcp/lib/templates/appkit/CLAUDE.md b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/CLAUDE.md similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/CLAUDE.md rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/CLAUDE.md diff --git a/experimental/apps-mcp/lib/templates/appkit/README.md b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/README.md similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/README.md rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/README.md diff --git a/experimental/apps-mcp/lib/templates/appkit/app.yaml b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/app.yaml similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/app.yaml rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/app.yaml diff --git a/experimental/apps-mcp/lib/templates/appkit/client/components.json b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/components.json similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/components.json rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/components.json diff --git a/experimental/apps-mcp/lib/templates/appkit/client/index.html b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/index.html similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/index.html rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/index.html diff --git a/experimental/apps-mcp/lib/templates/appkit/client/public/apple-touch-icon.png b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/apple-touch-icon.png similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/public/apple-touch-icon.png rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/apple-touch-icon.png diff --git a/experimental/apps-mcp/lib/templates/appkit/client/public/favicon-16x16.png b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/favicon-16x16.png similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/public/favicon-16x16.png rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/favicon-16x16.png diff --git a/experimental/apps-mcp/lib/templates/appkit/client/public/favicon-192x192.png b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/favicon-192x192.png similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/public/favicon-192x192.png rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/favicon-192x192.png diff --git a/experimental/apps-mcp/lib/templates/appkit/client/public/favicon-32x32.png b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/favicon-32x32.png similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/public/favicon-32x32.png rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/favicon-32x32.png diff --git a/experimental/apps-mcp/lib/templates/appkit/client/public/favicon-48x48.png b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/favicon-48x48.png similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/public/favicon-48x48.png rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/favicon-48x48.png diff --git a/experimental/apps-mcp/lib/templates/appkit/client/public/favicon-512x512.png b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/favicon-512x512.png similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/public/favicon-512x512.png rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/favicon-512x512.png diff --git a/experimental/apps-mcp/lib/templates/appkit/client/public/favicon.svg b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/favicon.svg similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/public/favicon.svg rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/favicon.svg diff --git a/experimental/apps-mcp/lib/templates/appkit/client/public/site.webmanifest b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/site.webmanifest similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/public/site.webmanifest rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/public/site.webmanifest diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/App.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/App.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/App.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/App.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/ErrorBoundary.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/ErrorBoundary.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/ErrorBoundary.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/ErrorBoundary.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/accordion.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/accordion.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/accordion.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/accordion.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/alert-dialog.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/alert-dialog.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/alert-dialog.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/alert-dialog.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/alert.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/alert.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/alert.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/alert.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/aspect-ratio.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/aspect-ratio.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/aspect-ratio.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/aspect-ratio.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/avatar.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/avatar.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/avatar.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/avatar.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/badge.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/badge.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/badge.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/badge.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/breadcrumb.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/breadcrumb.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/breadcrumb.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/breadcrumb.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/button.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/button.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/button.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/button.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/calendar.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/calendar.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/calendar.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/calendar.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/card.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/card.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/card.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/card.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/carousel.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/carousel.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/carousel.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/carousel.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/checkbox.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/checkbox.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/checkbox.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/checkbox.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/collapsible.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/collapsible.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/collapsible.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/collapsible.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/command.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/command.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/command.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/command.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/context-menu.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/context-menu.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/context-menu.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/context-menu.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/dialog.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/dialog.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/dialog.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/dialog.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/dropdown-menu.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/dropdown-menu.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/dropdown-menu.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/dropdown-menu.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/form.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/form.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/form.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/form.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/hover-card.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/hover-card.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/hover-card.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/hover-card.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/input.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/input.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/input.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/input.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/label.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/label.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/label.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/label.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/menubar.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/menubar.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/menubar.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/menubar.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/navigation-menu.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/navigation-menu.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/navigation-menu.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/navigation-menu.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/pagination.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/pagination.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/pagination.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/pagination.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/popover.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/popover.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/popover.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/popover.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/progress.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/progress.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/progress.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/progress.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/radio-group.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/radio-group.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/radio-group.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/radio-group.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/resizable.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/resizable.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/resizable.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/resizable.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/scroll-area.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/scroll-area.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/scroll-area.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/scroll-area.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/select.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/select.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/select.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/select.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/separator.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/separator.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/separator.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/separator.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/sheet.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/sheet.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/sheet.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/sheet.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/skeleton.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/skeleton.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/skeleton.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/skeleton.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/slider.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/slider.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/slider.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/slider.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/sonner.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/sonner.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/sonner.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/sonner.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/switch.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/switch.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/switch.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/switch.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/table.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/table.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/table.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/table.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/tabs.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/tabs.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/tabs.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/tabs.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/textarea.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/textarea.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/textarea.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/textarea.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/toggle-group.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/toggle-group.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/toggle-group.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/toggle-group.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/toggle.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/toggle.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/toggle.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/toggle.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/tooltip.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/tooltip.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/components/ui/tooltip.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/components/ui/tooltip.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/index.css b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/index.css similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/index.css rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/index.css diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/lib/trpc.ts b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/lib/trpc.ts similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/lib/trpc.ts rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/lib/trpc.ts diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/lib/utils.ts b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/lib/utils.ts similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/lib/utils.ts rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/lib/utils.ts diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/main.tsx b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/main.tsx similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/main.tsx rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/main.tsx diff --git a/experimental/apps-mcp/lib/templates/appkit/client/src/vite-env.d.ts b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/vite-env.d.ts similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/src/vite-env.d.ts rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/src/vite-env.d.ts diff --git a/experimental/apps-mcp/lib/templates/appkit/client/vite.config.ts b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/vite.config.ts similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/client/vite.config.ts rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/client/vite.config.ts diff --git a/experimental/apps-mcp/lib/templates/appkit/config/queries/hello_world.sql b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/config/queries/hello_world.sql similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/config/queries/hello_world.sql rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/config/queries/hello_world.sql diff --git a/experimental/apps-mcp/lib/templates/appkit/databricks.yml.tmpl b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/databricks.yml.tmpl similarity index 75% rename from experimental/apps-mcp/lib/templates/appkit/databricks.yml.tmpl rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/databricks.yml.tmpl index 707b94b3a5..c9c1f0630a 100644 --- a/experimental/apps-mcp/lib/templates/appkit/databricks.yml.tmpl +++ b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/databricks.yml.tmpl @@ -1,5 +1,5 @@ bundle: - name: {{.AppName}} + name: {{.project_name}} variables: warehouse_id: @@ -9,9 +9,9 @@ variables: resources: apps: - {{.AppName}}: - name: ${bundle.target}-{{.AppName}} - description: {{.AppDescription}} + app: + name: ${bundle.target}-{{.project_name}} + description: {{.app_description}} source_code_path: ./ # Uncomment to enable on behalf of user API scopes. Available scopes: sql, dashboards.genie, files.files @@ -30,10 +30,10 @@ targets: mode: development default: true workspace: - host: {{.WorkspaceURL}} + host: {{workspace_host}} variables: - warehouse_id: {{.WarehouseID}} + warehouse_id: {{.sql_warehouse_id}} prod: mode: production @@ -43,5 +43,5 @@ targets: # warehouse_id: ... resources: apps: - {{.AppName}}: - name: {{.AppName}} + app: + name: {{.project_name}} diff --git a/experimental/apps-mcp/lib/templates/appkit/eslint.config.js b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/eslint.config.js similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/eslint.config.js rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/eslint.config.js diff --git a/experimental/apps-mcp/lib/templates/appkit/package-lock.json b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/package-lock.json similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/package-lock.json rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/package-lock.json diff --git a/experimental/apps-mcp/lib/templates/appkit/package.json b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/package.json similarity index 96% rename from experimental/apps-mcp/lib/templates/appkit/package.json rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/package.json index 60a8aa7a91..a28b88167f 100644 --- a/experimental/apps-mcp/lib/templates/appkit/package.json +++ b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/package.json @@ -5,7 +5,7 @@ "type": "module", "scripts": { "start": "NODE_ENV=production node --env-file-if-exists=./.env ./dist/server/server.js", - "dev": "NODE_ENV=development tsx watch --include config/**/* --tsconfig ./tsconfig.server.json --env-file-if-exists=./.env ./server/server.ts", + "dev": "NODE_ENV=development tsx watch --tsconfig ./tsconfig.server.json --env-file-if-exists=./.env ./server/server.ts", "build:client": "tsc -b tsconfig.client.json && vite build --config client/vite.config.ts", "build:server": "tsc -b tsconfig.server.json", "build": "npm run build:server && npm run build:client", diff --git a/experimental/apps-mcp/lib/templates/appkit/playwright.config.ts b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/playwright.config.ts similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/playwright.config.ts rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/playwright.config.ts diff --git a/experimental/apps-mcp/lib/templates/appkit/postcss.config.js b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/postcss.config.js similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/postcss.config.js rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/postcss.config.js diff --git a/experimental/apps-mcp/lib/templates/appkit/server/server.ts b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/server/server.ts similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/server/server.ts rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/server/server.ts diff --git a/experimental/apps-mcp/lib/templates/appkit/server/trpc.test.ts b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/server/trpc.test.ts similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/server/trpc.test.ts rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/server/trpc.test.ts diff --git a/experimental/apps-mcp/lib/templates/appkit/server/trpc.ts b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/server/trpc.ts similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/server/trpc.ts rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/server/trpc.ts diff --git a/experimental/apps-mcp/lib/templates/appkit/shared/types.ts b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/shared/types.ts similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/shared/types.ts rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/shared/types.ts diff --git a/experimental/apps-mcp/lib/templates/appkit/tailwind.config.ts b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/tailwind.config.ts similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/tailwind.config.ts rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/tailwind.config.ts diff --git a/experimental/apps-mcp/lib/templates/appkit/tests/smoke.spec.ts b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/tests/smoke.spec.ts similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/tests/smoke.spec.ts rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/tests/smoke.spec.ts diff --git a/experimental/apps-mcp/lib/templates/appkit/tsconfig.client.json b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/tsconfig.client.json similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/tsconfig.client.json rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/tsconfig.client.json diff --git a/experimental/apps-mcp/lib/templates/appkit/tsconfig.json b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/tsconfig.json similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/tsconfig.json rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/tsconfig.json diff --git a/experimental/apps-mcp/lib/templates/appkit/tsconfig.server.json b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/tsconfig.server.json similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/tsconfig.server.json rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/tsconfig.server.json diff --git a/experimental/apps-mcp/lib/templates/appkit/tsconfig.shared.json b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/tsconfig.shared.json similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/tsconfig.shared.json rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/tsconfig.shared.json diff --git a/experimental/apps-mcp/lib/templates/appkit/vendor/databricks-app-kit-1.0.0-dev4.tgz b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/vendor/databricks-app-kit-1.0.0-dev4.tgz similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/vendor/databricks-app-kit-1.0.0-dev4.tgz rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/vendor/databricks-app-kit-1.0.0-dev4.tgz diff --git a/experimental/apps-mcp/lib/templates/appkit/vitest.config.ts b/experimental/apps-mcp/templates/appkit/template/{{.project_name}}/vitest.config.ts similarity index 100% rename from experimental/apps-mcp/lib/templates/appkit/vitest.config.ts rename to experimental/apps-mcp/templates/appkit/template/{{.project_name}}/vitest.config.ts