@bonnard/cli 0.1.6 → 0.1.8

package/dist/bin/bon.mjs

@@ -33,20 +33,20 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 //#endregion
 //#region src/lib/project.ts
 /**
-* The subdirectory name used for Bonnard model/view files.
+* The subdirectory name used for Bonnard cube/view files.
 * Keeps Bonnard files namespaced to avoid conflicts with existing
 * project directories (e.g. dbt's models/).
 */
 const BONNARD_DIR = "bonnard";
 /**
 * Resolve Bonnard project paths relative to the working directory.
-* All model/view operations should use these paths.
+* All cube/view operations should use these paths.
 */
 function getProjectPaths(cwd) {
 	const bonnardRoot = path.join(cwd, BONNARD_DIR);
 	return {
 		root: bonnardRoot,
-		models: path.join(bonnardRoot, "models"),
+		cubes: path.join(bonnardRoot, "cubes"),
 		views: path.join(bonnardRoot, "views"),
 		config: path.join(cwd, "bon.yaml"),
 		localState: path.join(cwd, ".bon")
@@ -475,8 +475,8 @@ function generateProjectContext(env) {
 	else roleLines.push("New project — no existing data tools detected. Help them connect a warehouse (`bon datasource add`), then create their first cube.");
 	roleLines.push("");
 	roleLines.push("**Important:**");
-	roleLines.push("- Bonnard models go in `bonnard/models/` and views in `bonnard/views/` — do NOT modify files outside these directories");
-	roleLines.push("- Use `bon docs` to look up Cube YAML syntax before writing model definitions");
+	roleLines.push("- Bonnard cubes go in `bonnard/cubes/` and views in `bonnard/views/` — do NOT modify files outside these directories");
+	roleLines.push("- Use `bon docs` to look up YAML syntax before writing cube/view definitions");
 	if (hasDbt && dbtTool) {
 		const dbtDir = dbtTool.configPath.includes("/") ? dbtTool.configPath.split("/").slice(0, -1).join("/") + "/" : "";
 		const modelsPath = dbtDir ? `${dbtDir}models/` : "models/";
@@ -591,7 +591,7 @@ async function initCommand() {
 		console.log(pc.red("A bon.yaml already exists in this directory."));
 		process.exit(1);
 	}
-	fs.mkdirSync(paths.models, { recursive: true });
+	fs.mkdirSync(paths.cubes, { recursive: true });
 	fs.mkdirSync(paths.views, { recursive: true });
 	fs.mkdirSync(paths.localState, { recursive: true });
 	fs.writeFileSync(paths.config, BON_YAML_TEMPLATE(projectName));
@@ -602,7 +602,7 @@ async function initCommand() {
 	console.log();
 	console.log(pc.bold("Core files:"));
 	console.log(`  ${pc.dim("bon.yaml")}                project config`);
-	console.log(`  ${pc.dim(`${BONNARD_DIR}/models/`)}      model definitions`);
+	console.log(`  ${pc.dim(`${BONNARD_DIR}/cubes/`)}       cube definitions`);
 	console.log(`  ${pc.dim(`${BONNARD_DIR}/views/`)}       view definitions`);
 	console.log(`  ${pc.dim(".bon/")}                   local state (gitignored)`);
 	console.log(`  ${pc.dim(".gitignore")}              git ignore rules`);
@@ -2246,10 +2246,10 @@ async function validateCommand(options = {}) {
 		console.log(pc.red("No bon.yaml found. Are you in a Bonnard project?"));
 		process.exit(1);
 	}
-	const { validate } = await import("./validate-BUHevw7F.mjs");
+	const { validate } = await import("./validate-DiN3DaTl.mjs");
 	const result = await validate(cwd);
 	if (result.cubes.length === 0 && result.views.length === 0 && result.valid) {
-		console.log(pc.yellow(`No model or view files found in ${BONNARD_DIR}/models/ or ${BONNARD_DIR}/views/.`));
+		console.log(pc.yellow(`No cube or view files found in ${BONNARD_DIR}/cubes/ or ${BONNARD_DIR}/views/.`));
 		return;
 	}
 	if (!result.valid) {
@@ -2280,16 +2280,16 @@ async function validateCommand(options = {}) {
 	}
 }
 /**
-* Test connections for datasources referenced by models
+* Test connections for datasources referenced by cubes and views
 * Lenient: warns but doesn't fail validation
 */
 async function testReferencedConnections(cwd) {
-	const { extractDatasourcesFromModels } = await import("./models-CzOWi3fU.mjs");
+	const { extractDatasourcesFromCubes } = await import("./cubes-De1_2_YJ.mjs");
 	const { loadLocalDatasources, resolveEnvVarsInCredentials } = await Promise.resolve().then(() => local_exports);
 	const { testConnection } = await Promise.resolve().then(() => connection_exports);
-	const references = extractDatasourcesFromModels(cwd);
+	const references = extractDatasourcesFromCubes(cwd);
 	if (references.length === 0) {
-		console.log(pc.dim("No datasource references found in models."));
+		console.log(pc.dim("No datasource references found in cubes."));
 		return;
 	}
 	console.log(pc.bold("Testing connections..."));
@@ -2357,8 +2357,8 @@ async function deployCommand(options = {}) {
 		console.log(pc.red("No bon.yaml found. Are you in a Bonnard project?"));
 		process.exit(1);
 	}
-	console.log(pc.dim("Validating models..."));
-	const { validate } = await import("./validate-BUHevw7F.mjs");
+	console.log(pc.dim("Validating cubes and views..."));
+	const { validate } = await import("./validate-DiN3DaTl.mjs");
 	const result = await validate(cwd);
 	if (!result.valid) {
 		console.log(pc.red("Validation failed:\n"));
@@ -2366,13 +2366,13 @@ async function deployCommand(options = {}) {
 		process.exit(1);
 	}
 	if (result.cubes.length === 0 && result.views.length === 0) {
-		console.log(pc.yellow(`No model or view files found in ${BONNARD_DIR}/models/ or ${BONNARD_DIR}/views/. Nothing to deploy.`));
+		console.log(pc.yellow(`No cube or view files found in ${BONNARD_DIR}/cubes/ or ${BONNARD_DIR}/views/. Nothing to deploy.`));
 		process.exit(1);
 	}
 	console.log(pc.dim(`  Found ${result.cubes.length} cube(s) and ${result.views.length} view(s)`));
 	if (await testAndSyncDatasources(cwd, options)) process.exit(1);
 	const files = {
-		...collectFiles(paths.models, cwd),
+		...collectFiles(paths.cubes, cwd),
 		...collectFiles(paths.views, cwd)
 	};
 	const fileCount = Object.keys(files).length;
@@ -2382,7 +2382,7 @@ async function deployCommand(options = {}) {
 		const response = await post("/api/deploy", { files });
 		console.log(pc.green("Deploy successful!"));
 		console.log(`Deployment ID: ${pc.cyan(response.deployment.id)}`);
-		console.log(`Cube API: ${pc.cyan(`${response.deployment.cubeApiUrl}/cubejs-api/v1`)}`);
+		console.log(`API: ${pc.cyan(response.deployment.cubeApiUrl)}`);
 		console.log();
 		console.log(pc.bold("Connect AI agents via MCP:"));
 		console.log(`  MCP URL: ${pc.cyan("https://mcp.bonnard.dev/mcp")}`);
@@ -2397,11 +2397,11 @@ async function deployCommand(options = {}) {
 * Returns true if any connection failed (strict mode)
 */
 async function testAndSyncDatasources(cwd, options = {}) {
-	const { extractDatasourcesFromModels } = await import("./models-CzOWi3fU.mjs");
+	const { extractDatasourcesFromCubes } = await import("./cubes-De1_2_YJ.mjs");
 	const { loadLocalDatasources, resolveEnvVarsInCredentials } = await Promise.resolve().then(() => local_exports);
 	const { testConnection } = await Promise.resolve().then(() => connection_exports);
 	const { pushDatasource } = await Promise.resolve().then(() => push_exports);
-	const references = extractDatasourcesFromModels(cwd);
+	const references = extractDatasourcesFromCubes(cwd);
 	if (references.length === 0) return false;
 	console.log();
 	console.log(pc.dim("Testing datasource connections..."));
@@ -2744,11 +2744,11 @@ async function docsSchemaCommand(schemaName) {
 //#endregion
 //#region src/commands/cube/query.ts
 /**
-* Query the deployed Cube semantic layer
+* Query the deployed semantic layer
 *
 * Supports two formats:
-* - JSON (default): bon cube query '{"measures": ["orders.count"]}'
-* - SQL: bon cube query --sql "SELECT MEASURE(count) FROM orders"
+* - JSON (default): bon query '{"measures": ["orders.count"]}'
+* - SQL: bon query --sql "SELECT MEASURE(count) FROM orders"
 */
 async function cubeQueryCommand(queryInput, options = {}) {
 	if (!loadCredentials()) {
@@ -2766,7 +2766,7 @@ async function cubeQueryCommand(queryInput, options = {}) {
 				query = JSON.parse(queryInput);
 			} catch {
 				console.error(pc.red("Invalid JSON query. Use --sql for SQL queries."));
-				console.log(pc.dim("Example: bon cube query '{\"measures\": [\"orders.count\"]}'"));
+				console.log(pc.dim("Example: bon query '{\"measures\": [\"orders.count\"]}'"));
 				process.exit(1);
 			}
 			if (limit && !query.limit) query.limit = limit;
@@ -2803,7 +2803,7 @@ async function cubeQueryCommand(queryInput, options = {}) {
 //#region src/bin/bon.ts
 const { version } = createRequire(import.meta.url)("../../package.json");
 program.name("bon").description("Bonnard semantic layer CLI").version(version);
-program.command("init").description("Create bon.yaml, bonnard/models/, bonnard/views/, .bon/, and agent templates (.claude/, .cursor/)").action(initCommand);
+program.command("init").description("Create bon.yaml, bonnard/cubes/, bonnard/views/, .bon/, and agent templates (.claude/, .cursor/)").action(initCommand);
 program.command("login").description("Authenticate with Bonnard via your browser").action(loginCommand);
 program.command("logout").description("Remove stored credentials").action(logoutCommand);
 program.command("whoami").description("Show current login status").option("--verify", "Verify session is still valid with the server").action(whoamiCommand);
@@ -2814,11 +2814,11 @@ datasource.command("test").description("Test data source connectivity by connect
 datasource.command("remove").description("Remove a data source from .bon/datasources.yaml (local by default)").argument("<name>", "Data source name").option("--remote", "Remove from Bonnard server instead of local (requires login)").action(datasourceRemoveCommand);
 datasource.command("push").description("Push a local data source to Bonnard server (requires login)").argument("<name>", "Data source name from .bon/datasources.yaml").option("--force", "Overwrite if already exists on remote").action(datasourcePushCommand);
 program.command("preview").description("Preview data from a local warehouse using raw SQL (for development/exploration)").argument("<datasource>", "Data source name from .bon/datasources.yaml").argument("<sql>", "SQL query to execute").option("--schema <schema>", "Override schema").option("--database <database>", "Override database").option("--limit <limit>", "Max rows to return", "1000").option("--format <format>", "Output format: toon or json", "toon").action(previewCommand);
-program.command("validate").description("Validate YAML syntax in bonnard/models/ and bonnard/views/").option("--test-connection", "Also test datasource connections (warns on failure, doesn't block)").action(validateCommand);
-program.command("deploy").description("Deploy models to Bonnard. Requires login, validates models, tests connections (fails on error)").option("--ci", "Non-interactive mode (fail if missing datasources)").option("--push-datasources", "Auto-push missing datasources without prompting").action(deployCommand);
+program.command("validate").description("Validate YAML syntax in bonnard/cubes/ and bonnard/views/").option("--test-connection", "Also test datasource connections (warns on failure, doesn't block)").action(validateCommand);
+program.command("deploy").description("Deploy cubes and views to Bonnard. Requires login, validates, tests connections (fails on error)").option("--ci", "Non-interactive mode (fail if missing datasources)").option("--push-datasources", "Auto-push missing datasources without prompting").action(deployCommand);
 program.command("mcp").description("MCP connection info and setup instructions").action(mcpCommand).command("test").description("Test MCP server connectivity").action(mcpTestCommand);
-program.command("cube").description("Query the deployed Cube semantic layer").command("query").description("Execute a query against the deployed semantic layer").argument("<query>", "JSON query or SQL (with --sql flag)").option("--sql", "Use Cube SQL API instead of JSON format").option("--limit <limit>", "Max rows to return").option("--format <format>", "Output format: toon or json", "toon").action(cubeQueryCommand);
-program.command("docs").description("Browse Cube documentation for building models and views").argument("[topic]", "Topic to display (e.g., cubes, cubes.measures)").option("-r, --recursive", "Show topic and all child topics").option("-s, --search <query>", "Search topics for a keyword").option("-f, --format <format>", "Output format: markdown or json", "markdown").action(docsCommand).command("schema").description("Show JSON schema for a type (cube, view, measure, etc.)").argument("<type>", "Schema type to display").action(docsSchemaCommand);
+program.command("query").description("Execute a query against the deployed semantic layer").argument("<query>", "JSON query or SQL (with --sql flag)").option("--sql", "Use SQL API instead of JSON format").option("--limit <limit>", "Max rows to return").option("--format <format>", "Output format: toon or json", "toon").action(cubeQueryCommand);
+program.command("docs").description("Browse documentation for building cubes and views").argument("[topic]", "Topic to display (e.g., cubes, cubes.measures)").option("-r, --recursive", "Show topic and all child topics").option("-s, --search <query>", "Search topics for a keyword").option("-f, --format <format>", "Output format: markdown or json", "markdown").action(docsCommand).command("schema").description("Show JSON schema for a type (cube, view, measure, etc.)").argument("<type>", "Schema type to display").action(docsSchemaCommand);
 program.parse();
 
 //#endregion

package/dist/bin/{models-CzOWi3fU.mjs → cubes-De1_2_YJ.mjs}

@@ -3,9 +3,9 @@ import fs from "node:fs";
 import path from "node:path";
 import YAML from "yaml";
 
-//#region src/lib/models/datasources.ts
+//#region src/lib/cubes/datasources.ts
 /**
-* Extract datasource references from Cube model files
+* Extract datasource references from cube and view files
 */
 /**
 * Collect all YAML files from a directory recursively
@@ -49,14 +49,14 @@ function extractFromFile(filePath) {
 	return datasourceToCubes;
 }
 /**
-* Extract all unique datasource references from bonnard/models/ and bonnard/views/ directories
+* Extract all unique datasource references from bonnard/cubes/ and bonnard/views/ directories
 * Returns datasource names mapped to the cubes that use them
 */
-function extractDatasourcesFromModels(projectPath) {
+function extractDatasourcesFromCubes(projectPath) {
 	const paths = getProjectPaths(projectPath);
-	const modelsDir = paths.models;
+	const cubesDir = paths.cubes;
 	const viewsDir = paths.views;
-	const allFiles = [...collectYamlFiles(modelsDir), ...collectYamlFiles(viewsDir)];
+	const allFiles = [...collectYamlFiles(cubesDir), ...collectYamlFiles(viewsDir)];
 	const aggregated = /* @__PURE__ */ new Map();
 	for (const file of allFiles) {
 		const fileRefs = extractFromFile(file);
@@ -75,4 +75,4 @@ function extractDatasourcesFromModels(projectPath) {
 }
 
 //#endregion
-export { extractDatasourcesFromModels };
+export { extractDatasourcesFromCubes };

package/dist/bin/{validate-BUHevw7F.mjs → validate-DiN3DaTl.mjs}

@@ -61,12 +61,12 @@ function checkMissingDescriptions(files) {
 }
 function createModelRepository(projectPath) {
 	const paths = getProjectPaths(projectPath);
-	const modelsDir = paths.models;
+	const cubesDir = paths.cubes;
 	const viewsDir = paths.views;
 	return {
 		localPath: () => projectPath,
 		dataSchemaFiles: () => {
-			const files = [...collectYamlFiles(modelsDir, projectPath), ...collectYamlFiles(viewsDir, projectPath)];
+			const files = [...collectYamlFiles(cubesDir, projectPath), ...collectYamlFiles(viewsDir, projectPath)];
 			return Promise.resolve(files);
 		}
 	};

package/dist/docs/_index.md

@@ -1,11 +1,11 @@
 # Bonnard Documentation
 
-> Build semantic layers with Cube models and views.
+> Build semantic layers with cubes and views.
 
 ## Cubes
 
 ### Core
-- [cubes](cubes) - Define data models with measures and dimensions
+- [cubes](cubes) - Define cubes with measures and dimensions
 - [cubes.sql](cubes.sql) - Base SQL table or query
 - [cubes.extends](cubes.extends) - Reuse members from other cubes
 - [cubes.public](cubes.public) - Control API visibility
@@ -55,7 +55,7 @@
 ## Workflow
 
 - [workflow](workflow) - End-to-end development workflow
-- [workflow.validate](workflow.validate) - Validate models locally
+- [workflow.validate](workflow.validate) - Validate cubes and views locally
 - [workflow.deploy](workflow.deploy) - Deploy to Bonnard
 - [workflow.query](workflow.query) - Query the deployed semantic layer
 - [workflow.mcp](workflow.mcp) - Connect AI agents via MCP

package/dist/docs/topics/cubes.dimensions.primary-key.md

@@ -39,7 +39,7 @@ measures:
 
 ### Required for Joins
 
-Cube uses primary keys to correctly join data:
+Primary keys are required to correctly join data:
 
 ```yaml
 cubes:

package/dist/docs/topics/cubes.dimensions.sub-query.md

@@ -86,7 +86,7 @@ When `propagate_filters_to_sub_query: true`, filters applied in the main query a
 
 ## How It Works
 
-Cube generates an optimized LEFT JOIN with an aggregation subquery:
+Bonnard generates an optimized LEFT JOIN with an aggregation subquery:
 
 ```sql
 SELECT

package/dist/docs/topics/cubes.joins.md

@@ -4,7 +4,7 @@
 
 ## Overview
 
-Joins define relationships between cubes, allowing queries to combine measures and dimensions from multiple cubes. Cube automatically generates the appropriate SQL JOINs.
+Joins define relationships between cubes, allowing queries to combine measures and dimensions from multiple cubes. Bonnard automatically generates the appropriate SQL JOINs.
 
 ## Example
 

package/dist/docs/topics/cubes.md

@@ -1,6 +1,6 @@
 # cubes
 
-> Define data models that map to your database tables.
+> Define cubes that map to your database tables.
 
 ## Overview
 
@@ -90,10 +90,10 @@ cubes:
 
 ## File Organization
 
-One cube per file in the `bonnard/models/` directory:
+One cube per file in the `bonnard/cubes/` directory:
 
 ```
-bonnard/models/
+bonnard/cubes/
 ├── orders.yaml
 ├── users.yaml
 ├── products.yaml

package/dist/docs/topics/cubes.measures.types.md

@@ -4,7 +4,7 @@
 
 ## Overview
 
-Cube supports 12 measure types that determine how values are aggregated. Choose the right type based on your analytical needs.
+There are 12 measure types that determine how values are aggregated. Choose the right type based on your analytical needs.
 
 ## Measure Types
 

package/dist/docs/topics/cubes.refresh-key.md

@@ -4,7 +4,7 @@
 
 ## Overview
 
-The `refresh_key` property determines when Cube's cache should be invalidated. Use it to ensure queries return fresh data while optimizing performance.
+The `refresh_key` property determines when the cache should be invalidated. Use it to ensure queries return fresh data while optimizing performance.
 
 ## Example
 

package/dist/docs/topics/syntax.md

@@ -1,10 +1,10 @@
 # syntax
 
-> YAML syntax and conventions for Cube data models.
+> YAML syntax and conventions for cubes and views.
 
 ## Overview
 
-Cube data models are defined in YAML files. Understanding the syntax conventions helps you write correct and maintainable models.
+Cubes and views are defined in YAML files. Understanding the syntax conventions helps you write correct and maintainable definitions.
 
 ## File Structure
 

package/dist/docs/topics/syntax.references.md

@@ -4,7 +4,7 @@
 
 ## Overview
 
-Cube provides special syntax for referencing columns, measures, dimensions, and other cubes within SQL expressions. This enables dynamic, maintainable data models.
+Bonnard provides special syntax for referencing columns, measures, dimensions, and other cubes within SQL expressions. This enables dynamic, maintainable cube definitions.
 
 ## Reference Types
 

package/dist/docs/topics/views.folders.md

@@ -4,7 +4,7 @@
 
 ## Overview
 
-Folders organize view members into logical categories, making large views easier to navigate. They appear as hierarchical groupings in BI tools and the Cube Playground.
+Folders organize view members into logical categories, making large views easier to navigate. They appear as hierarchical groupings in BI tools and dashboards.
 
 ## Example
 

package/dist/docs/topics/workflow.deploy.md

@@ -1,39 +1,38 @@
 # workflow.deploy
 
-> Push models to Bonnard for querying.
+> Push cubes and views to Bonnard for querying.
 
 ## Overview
 
-The `bon deploy` command uploads your cubes and views to Bonnard, making them available for querying via the API. It validates models and tests connections before deploying.
+The `bon deploy` command uploads your cubes and views to Bonnard, making them available for querying via the API. It validates and tests connections before deploying.
 
 ## Usage
 
 ```bash
-# Deploy all models
 bon deploy
 ```
 
 ## Prerequisites
 
 1. **Logged in** — run `bon login` first
-2. **Valid models** — must pass `bon validate`
+2. **Valid cubes and views** — must pass `bon validate`
 3. **Working connections** — data sources must be accessible
 
 ## What Happens
 
-1. **Validates models** — checks for errors
+1. **Validates** — checks cubes and views for errors
 2. **Tests connections** — verifies data source access
-3. **Uploads models** — sends cubes and views to Bonnard
-4. **Activates** — makes models available for queries
+3. **Uploads** — sends cubes and views to Bonnard
+4. **Activates** — makes cubes and views available for queries
 
 ## Example Output
 
 ```
 bon deploy
 
-✓ Validating models...
-  ✓ bonnard/models/orders.yaml
-  ✓ bonnard/models/users.yaml
+✓ Validating...
+  ✓ bonnard/cubes/orders.yaml
+  ✓ bonnard/cubes/users.yaml
   ✓ bonnard/views/orders_overview.yaml
 
 ✓ Testing connections...
@@ -44,8 +43,8 @@ bon deploy
 
 ✓ Deploy complete!
 
-Your models are now available at:
-  https://api.bonnard.dev/v1/your-org/cubejs-api
+Your semantic layer is now available at:
+  https://api.bonnard.dev/v1/your-org
 ```
 
 ## Deploy Flow
@@ -58,7 +57,7 @@ bon deploy
     ├── 2. Test all datasource connections (must succeed)
     │
     ├── 3. Upload to Bonnard API
-    │       - cubes from bonnard/models/
+    │       - cubes from bonnard/cubes/
     │       - views from bonnard/views/
     │       - datasource configs
     │
@@ -70,9 +69,9 @@ bon deploy
 ### Validation Errors
 
 ```
-✗ Validating models...
+✗ Validating...
 
-bonnard/models/orders.yaml:15:5
+bonnard/cubes/orders.yaml:15:5
   error: Unknown measure type "counts"
 
 Deploy aborted. Fix validation errors first.
@@ -102,7 +101,7 @@ Run: bon login
 
 | Source | Deployed |
 |--------|----------|
-| `bonnard/models/*.yaml` | All cube definitions |
+| `bonnard/cubes/*.yaml` | All cube definitions |
 | `bonnard/views/*.yaml` | All view definitions |
 | `.bon/datasources.yaml` | Connection configs (credentials encrypted) |
 | `bon.yaml` | Project settings |
@@ -117,7 +116,7 @@ Run: bon login
 
 1. **Validate first** — run `bon validate` before deploy
 2. **Test locally** — verify queries work before deploying
-3. **Use version control** — commit models before deploying
+3. **Use version control** — commit cubes and views before deploying
 4. **Monitor after deploy** — check for query errors
 
 ## See Also

package/dist/docs/topics/workflow.mcp.md

@@ -4,7 +4,9 @@
 
 ## Overview
 
-After deploying models with `bon deploy`, AI agents (Claude, Cursor, etc.) can query your semantic layer through the Model Context Protocol (MCP). Bonnard's MCP server provides tools for querying cubes and views using natural language.
+After deploying with `bon deploy`, AI agents can query your semantic layer through the Model Context Protocol (MCP). Bonnard's MCP server provides tools for exploring your data model and running queries.
+
+MCP is supported by Claude, ChatGPT, Cursor, Windsurf, VS Code, Gemini, and more.
 
 ## MCP URL
 
@@ -16,7 +18,45 @@ https://mcp.bonnard.dev/mcp
 
 ### Claude Desktop
 
-Add to `~/Library/Application Support/Claude/claude_desktop_config.json`:
+1. Open **Settings > Connectors**
+2. Click **Add custom connector**
+3. Enter a name (e.g. "Bonnard MCP") and the MCP URL: `https://mcp.bonnard.dev/mcp`
+4. Click **Add**
+
+![Claude Desktop — Settings > Connectors](/images/claude-connectors.png)
+
+![Claude Desktop — Add custom connector dialog](/images/claude-add-connector.png)
+
+Once added, enable the Bonnard connector in any chat via the **Connectors** menu:
+
+![Claude Desktop — Bonnard MCP enabled in chat](/images/claude-chat-connectors.png)
+
+Remote MCP servers in Claude Desktop must be added through the Connectors UI, not the JSON config file.
+
+### ChatGPT
+
+1. Open **Settings > Apps**
+2. Click **Advanced settings** and enable **Developer mode**
+
+![ChatGPT — Settings > Apps](/images/chatgpt-apps.png)
+
+![ChatGPT — Enable Developer mode](/images/chatgpt-developer-mode.png)
+
+3. Click **Create app**
+4. Enter a name (e.g. "Bonnard MCP"), the MCP URL `https://mcp.bonnard.dev/mcp`, and select **OAuth** for authentication
+5. Check the acknowledgement box and click **Create**
+
+![ChatGPT — Create new app with MCP URL](/images/chatgpt-new-app.png)
+
+Once created, the Bonnard connector appears in the **More** menu in any chat:
+
+![ChatGPT — Bonnard MCP available in chat](/images/chatgpt-chat-apps.png)
+
+Available on Pro and Plus plans.
+
+### Cursor
+
+Open **Settings > MCP** and add the server URL, or add to `.cursor/mcp.json` in your project:
 
 ```json
 {
@@ -28,14 +68,15 @@ Add to `~/Library/Application Support/Claude/claude_desktop_config.json`:
 }
 ```
 
-### Cursor
+### VS Code / GitHub Copilot
 
-Add to `.cursor/mcp.json` in your project:
+Open the Command Palette and run **MCP: Add Server**, or add to `.vscode/mcp.json` in your project:
 
 ```json
 {
-  "mcpServers": {
+  "servers": {
     "bonnard": {
+      "type": "http",
       "url": "https://mcp.bonnard.dev/mcp"
     }
   }
@@ -44,13 +85,47 @@ Add to `.cursor/mcp.json` in your project:
 
 ### Claude Code
 
-Add to `.mcp.json` in your project:
+Run in your terminal:
+
+```bash
+claude mcp add --transport http bonnard https://mcp.bonnard.dev/mcp
+```
+
+Or add to `.mcp.json` in your project:
+
+```json
+{
+  "mcpServers": {
+    "bonnard": {
+      "type": "http",
+      "url": "https://mcp.bonnard.dev/mcp"
+    }
+  }
+}
+```
+
+### Windsurf
+
+Open **Settings > Plugins > Manage plugins > View raw config**, or edit `~/.codeium/windsurf/mcp_config.json`:
+
+```json
+{
+  "mcpServers": {
+    "bonnard": {
+      "serverUrl": "https://mcp.bonnard.dev/mcp"
+    }
+  }
+}
+```
+
+### Gemini CLI
+
+Add to `.gemini/settings.json` in your project or `~/.gemini/settings.json` globally:
 
 ```json
 {
   "mcpServers": {
     "bonnard": {
-      "type": "url",
       "url": "https://mcp.bonnard.dev/mcp"
     }
   }
@@ -61,38 +136,36 @@ Add to `.mcp.json` in your project:
 
 MCP uses OAuth 2.0 with PKCE. When an agent first connects:
 
-1. Agent discovers OAuth endpoints via `/.well-known/oauth-authorization-server`
-2. Agent registers as an OAuth client
-3. User is redirected to Bonnard to sign in and authorize
-4. Agent receives an access token (valid for 7 days)
-5. Token persists across server restarts
+1. Agent discovers OAuth endpoints automatically
+2. You are redirected to Bonnard to sign in and authorize
+3. Agent receives an access token (valid for 30 days)
 
 No API keys or manual token management needed.
 
+## Available Tools
+
+Once connected, AI agents can use these MCP tools:
+
+| Tool | Description |
+|------|-------------|
+| `explore_schema` | Discover views and cubes, list their measures, dimensions, and segments. Supports browsing a specific source by name or searching across all fields by keyword. |
+| `query` | Query the semantic layer with measures, dimensions, time dimensions, filters, segments, and pagination. |
+| `sql_query` | Execute raw SQL against the semantic layer using Cube SQL syntax with `MEASURE()` for aggregations. Use for CTEs, UNIONs, and custom calculations. |
+| `describe_field` | Get detailed metadata for a field — SQL expression, type, format, origin cube, and referenced fields. |
+
 ## Testing
 
 ```bash
 # Verify the MCP server is reachable
 bon mcp test
 
-# View connection info and config snippets
+# View connection info
 bon mcp
 ```
 
-## Available Tools
-
-Once connected, AI agents can use these MCP tools:
-
-| Tool | Description |
-|------|-------------|
-| `query` | Execute a Cube query (measures, dimensions, filters) |
-| `sql_query` | Execute a SQL query via Cube SQL API |
-| `list_cubes` | List available cubes and their members |
-| `list_views` | List available views and their members |
-
 ## Managing Connections
 
-Active MCP connections can be viewed and revoked in the Bonnard dashboard at **Settings > Connections**.
+Active MCP connections can be viewed and revoked in the Bonnard dashboard under **MCP**.
 
 ## See Also
 

package/dist/docs/topics/workflow.md

@@ -1,10 +1,10 @@
 # workflow
 
-> Development workflow for building and deploying Bonnard models.
+> Development workflow for building and deploying cubes and views.
 
 ## Overview
 
-Building semantic models with Bonnard follows a development workflow: initialize a project, connect data sources, define models, validate, and deploy.
+Building a semantic layer with Bonnard follows a development workflow: initialize a project, connect data sources, define cubes and views, validate, and deploy.
 
 ## Quick Start
 
@@ -15,9 +15,9 @@ bon init
 # 2. Add a data source
 bon datasource add
 
-# 3. Create models in bonnard/models/ and views in bonnard/views/
+# 3. Create cubes in bonnard/cubes/ and views in bonnard/views/
 
-# 4. Validate your models
+# 4. Validate
 bon validate
 
 # 5. Deploy to Bonnard
@@ -32,7 +32,7 @@ After `bon init`, your project has:
 my-project/
 ├── bon.yaml              # Project configuration
 ├── bonnard/              # Semantic layer definitions
-│   ├── models/           # Cube definitions
+│   ├── cubes/            # Cube definitions
 │   │   └── orders.yaml
 │   └── views/            # View definitions
 │       └── orders_overview.yaml
@@ -42,12 +42,12 @@ my-project/
 
 ## Development Cycle
 
-### 1. Define Models
+### 1. Define Cubes
 
 Create cubes that map to your database tables:
 
 ```yaml
-# bonnard/models/orders.yaml
+# bonnard/cubes/orders.yaml
 cubes:
   - name: orders
     sql_table: public.orders
@@ -88,7 +88,7 @@ bon validate --test-connection
 
 ### 4. Deploy
 
-Push models to Bonnard:
+Push cubes and views to Bonnard:
 
 ```bash
 bon deploy
@@ -99,7 +99,7 @@ bon deploy
 ### One Cube Per File
 
 ```
-bonnard/models/
+bonnard/cubes/
 ├── orders.yaml
 ├── users.yaml
 ├── products.yaml
@@ -109,7 +109,7 @@ bonnard/models/
 ### Related Cubes Together
 
 ```
-bonnard/models/
+bonnard/cubes/
 ├── sales/
 │   ├── orders.yaml
 │   └── line_items.yaml
@@ -124,7 +124,7 @@ bonnard/models/
 
 1. **Start simple** — begin with one cube, add complexity gradually
 2. **Validate often** — run `bon validate` after each change
-3. **Use version control** — commit models to git
+3. **Use version control** — commit cubes and views to git
 4. **Document with descriptions** — add `description` to measures/dimensions
 5. **Test with queries** — verify models produce expected results
 
@@ -136,9 +136,9 @@ bonnard/models/
 | `bon datasource add` | Add a data source |
 | `bon datasource list` | List configured sources |
 | `bon datasource test <name>` | Test connection |
-| `bon validate` | Check model syntax |
+| `bon validate` | Check cube and view syntax |
 | `bon deploy` | Deploy to Bonnard |
-| `bon docs` | Browse Cube documentation |
+| `bon docs` | Browse documentation |
 
 ## See Also
 

package/dist/docs/topics/workflow.query.md

@@ -4,20 +4,20 @@
 
 ## Overview
 
-After deploying models with `bon deploy`, you can query the semantic layer using `bon cube query`. This tests that your models work correctly and returns data from your warehouse through Cube.
+After deploying with `bon deploy`, you can query the semantic layer using `bon query`. This tests that your cubes and views work correctly and returns data from your warehouse through Bonnard.
 
 ## Query Formats
 
-Cube supports two query formats:
+Bonnard supports two query formats:
 
 ### JSON Format (Default)
 
-The JSON format uses Cube's REST API structure:
+The JSON format uses the REST API structure:
 
 ```bash
-bon cube query '{"measures": ["orders.count"]}'
+bon query '{"measures": ["orders.count"]}'
 
-bon cube query '{
+bon query '{
   "measures": ["orders.total_revenue"],
   "dimensions": ["orders.status"],
   "filters": [{
@@ -36,7 +36,7 @@ bon cube query '{
 | `dimensions` | Array of dimensions to group by (e.g., `["orders.status"]`) |
 | `filters` | Array of filter objects |
 | `timeDimensions` | Time-based grouping with granularity |
-| `segments` | Named filters defined in models |
+| `segments` | Named filters defined in cubes |
 | `limit` | Max rows to return |
 | `offset` | Skip rows (pagination) |
 | `order` | Sort specification |
@@ -54,12 +54,12 @@ bon cube query '{
 
 ### SQL Format
 
-The SQL format uses Cube's SQL API, where cubes are tables:
+The SQL format uses the SQL API, where cubes are tables:
 
 ```bash
-bon cube query --sql "SELECT status, MEASURE(count) FROM orders GROUP BY 1"
+bon query --sql "SELECT status, MEASURE(count) FROM orders GROUP BY 1"
 
-bon cube query --sql "SELECT
+bon query --sql "SELECT
   city,
   MEASURE(total_revenue),
   MEASURE(avg_order_value)
@@ -97,16 +97,16 @@ ORDER BY 1
 
 ```bash
 # JSON format (default)
-bon cube query '{"measures": ["orders.count"]}'
+bon query '{"measures": ["orders.count"]}'
 
 # SQL format
-bon cube query --sql "SELECT MEASURE(count) FROM orders"
+bon query --sql "SELECT MEASURE(count) FROM orders"
 
 # Limit rows
-bon cube query '{"measures": ["orders.count"], "dimensions": ["orders.city"]}' --limit 10
+bon query '{"measures": ["orders.count"], "dimensions": ["orders.city"]}' --limit 10
 
 # JSON output (instead of table)
-bon cube query '{"measures": ["orders.count"]}' --format json
+bon query '{"measures": ["orders.count"]}' --format json
 ```
 
 ## Output Formats
@@ -126,7 +126,7 @@ bon cube query '{"measures": ["orders.count"]}' --format json
 ### JSON Format
 
 ```bash
-bon cube query '{"measures": ["orders.count"]}' --format json
+bon query '{"measures": ["orders.count"]}' --format json
 ```
 
 ```json
@@ -142,7 +142,7 @@ bon cube query '{"measures": ["orders.count"]}' --format json
 ### Time Series Analysis
 
 ```bash
-bon cube query '{
+bon query '{
   "measures": ["orders.total_revenue"],
   "timeDimensions": [{
     "dimension": "orders.created_at",
@@ -155,7 +155,7 @@ bon cube query '{
 ### Filtering by Dimension
 
 ```bash
-bon cube query '{
+bon query '{
   "measures": ["orders.count"],
   "dimensions": ["orders.city"],
   "filters": [{
@@ -169,7 +169,7 @@ bon cube query '{
 ### Multiple Measures
 
 ```bash
-bon cube query '{
+bon query '{
   "measures": ["orders.count", "orders.total_revenue", "orders.avg_order_value"],
   "dimensions": ["orders.category"]
 }'
@@ -184,15 +184,15 @@ bon cube query '{
 - All measures must use `MEASURE()` or matching aggregate
 
 **"Cube not found"**
-- Check cube name matches deployed model
-- Run `bon deploy` if models changed
+- Check cube name matches deployed cube
+- Run `bon deploy` if cubes changed
 
 **"Not logged in"**
 - Run `bon login` first
 
 ## See Also
 
-- [workflow.deploy](workflow.deploy) - Deploy models before querying
+- [workflow.deploy](workflow.deploy) - Deploy before querying
 - [cubes.measures](cubes.measures) - Define measures
 - [cubes.dimensions](cubes.dimensions) - Define dimensions
 - [views](views) - Create focused query interfaces

package/dist/docs/topics/workflow.validate.md

@@ -1,10 +1,10 @@
 # workflow.validate
 
-> Check models for errors before deploying.
+> Check cubes and views for errors before deploying.
 
 ## Overview
 
-The `bon validate` command checks your YAML models for syntax errors, schema violations, and optionally tests data source connections. Run this before deploying to catch issues early.
+The `bon validate` command checks your YAML cubes and views for syntax errors, schema violations, and optionally tests data source connections. Run this before deploying to catch issues early.
 
 ## Usage
 
@@ -48,11 +48,11 @@ bon validate --test-connection
 
 ```
 ✓ Validating YAML syntax...
-✓ Checking bonnard/models/orders.yaml
-✓ Checking bonnard/models/users.yaml
+✓ Checking bonnard/cubes/orders.yaml
+✓ Checking bonnard/cubes/users.yaml
 ✓ Checking bonnard/views/orders_overview.yaml
 
-All models valid.
+All cubes and views valid.
 ```
 
 ### Errors
@@ -60,7 +60,7 @@ All models valid.
 ```
 ✗ Validating YAML syntax...
 
-bonnard/models/orders.yaml:15:5
+bonnard/cubes/orders.yaml:15:5
   error: Unknown measure type "counts"
 
   Did you mean "count"?
@@ -77,7 +77,7 @@ bonnard/models/orders.yaml:15:5
 
 ```
 ✓ Validating YAML syntax...
-✓ All models valid.
+✓ All cubes and views valid.
 
 ⚠ Testing connections...
   ⚠ datasource "analytics": Connection timed out

package/dist/templates/claude/skills/bonnard-cli/SKILL.md

@@ -25,8 +25,8 @@ bon datasource remove <name>    # Remove data source
 
 ### Development
 ```bash
-bon validate          # Validate models and views
-bon deploy            # Deploy to Bonnard Cube
+bon validate          # Validate cubes and views
+bon deploy            # Deploy to Bonnard
 ```
 
 ### Data Exploration (Local)
@@ -39,12 +39,12 @@ bon preview <datasource> "<sql>" --limit 100    # Limit rows
 ### Semantic Layer Queries (Deployed)
 ```bash
 # JSON format (default)
-bon cube query '{"measures": ["orders.count"]}'
-bon cube query '{"measures": ["orders.total_revenue"], "dimensions": ["orders.status"]}'
+bon query '{"measures": ["orders.count"]}'
+bon query '{"measures": ["orders.total_revenue"], "dimensions": ["orders.status"]}'
 
 # SQL format
-bon cube query --sql "SELECT status, MEASURE(count) FROM orders GROUP BY 1"
-bon cube query --sql "SELECT city, SUM(amount) FROM orders GROUP BY 1" --limit 10
+bon query --sql "SELECT status, MEASURE(count) FROM orders GROUP BY 1"
+bon query --sql "SELECT city, SUM(amount) FROM orders GROUP BY 1" --limit 10
 ```
 
 ### Documentation

package/dist/templates/claude/skills/bonnard-queries/SKILL.md

@@ -1,11 +1,11 @@
 ---
 name: bonnard-queries
-description: How to write Cube queries and work with models. Use when user asks about metrics, dimensions, or data modeling.
+description: How to write queries and work with cubes and views. Use when user asks about metrics, dimensions, or data modeling.
 ---
 
 # Bonnard Query Patterns
 
-## Model Structure (YAML)
+## Cube Structure (YAML)
 
 ```yaml
 cubes:
@@ -49,7 +49,7 @@ views:
 
 ## Workflow
 
-1. Define models in `bonnard/models/*.yaml`
+1. Define cubes in `bonnard/cubes/*.yaml`
 2. Define views in `bonnard/views/*.yaml`
 3. Run `bon validate` to check syntax
 4. Run `bon deploy` to publish

package/dist/templates/cursor/rules/bonnard-cli.mdc

@@ -24,8 +24,8 @@ bon datasource remove <name>    # Remove data source
 
 ### Development
 ```bash
-bon validate          # Validate models and views
-bon deploy            # Deploy to Bonnard Cube
+bon validate          # Validate cubes and views
+bon deploy            # Deploy to Bonnard
 ```
 
 ### Data Exploration (Local)
@@ -38,10 +38,10 @@ bon preview <datasource> "<sql>" --limit 100    # Limit rows
 ### Semantic Layer Queries (Deployed)
 ```bash
 # JSON format (default)
-bon cube query '{"measures": ["orders.count"]}'
-bon cube query '{"measures": ["orders.total_revenue"], "dimensions": ["orders.status"]}'
+bon query '{"measures": ["orders.count"]}'
+bon query '{"measures": ["orders.total_revenue"], "dimensions": ["orders.status"]}'
 
 # SQL format
-bon cube query --sql "SELECT status, MEASURE(count) FROM orders GROUP BY 1"
-bon cube query --sql "SELECT city, SUM(amount) FROM orders GROUP BY 1" --limit 10
+bon query --sql "SELECT status, MEASURE(count) FROM orders GROUP BY 1"
+bon query --sql "SELECT city, SUM(amount) FROM orders GROUP BY 1" --limit 10
 ```

package/dist/templates/cursor/rules/bonnard-queries.mdc

@@ -1,11 +1,11 @@
 ---
-description: "How to write Cube queries and work with models. Use when user asks about metrics, dimensions, or data modeling."
+description: "How to write queries and work with cubes and views. Use when user asks about metrics, dimensions, or data modeling."
 alwaysApply: false
 ---
 
 # Bonnard Query Patterns
 
-## Model Structure (YAML)
+## Cube Structure (YAML)
 
 ```yaml
 cubes:
@@ -43,7 +43,7 @@ views:
 
 ## Workflow
 
-1. Define models in `bonnard/models/*.yaml`
+1. Define cubes in `bonnard/cubes/*.yaml`
 2. Define views in `bonnard/views/*.yaml`
 3. Run `bon validate` to check syntax
 4. Run `bon deploy` to publish

package/dist/templates/shared/bonnard.md

@@ -7,11 +7,11 @@ Bonnard is a semantic layer platform that sits between your data warehouse and e
 ```
 Data Warehouse (Snowflake, Postgres, BigQuery, Databricks)
         ↓
-   Cube Models (measures, dimensions, joins)
+   Cubes (measures, dimensions, joins)
         ↓
-      Views (curated subsets for specific use cases)
+   Views (curated subsets for specific use cases)
         ↓
-   Bonnard API (deployed Cube instance)
+   Bonnard API
         ↓
    Consumers (MCP tools, dashboards, analysts)
 ```
@@ -30,7 +30,7 @@ Data Warehouse (Snowflake, Postgres, BigQuery, Databricks)
 my-project/
 ├── bon.yaml              # Project config
 ├── bonnard/              # Semantic layer definitions
-│   ├── models/           # Cube definitions
+│   ├── cubes/            # Cube definitions
 │   │   ├── orders.yaml
 │   │   └── customers.yaml
 │   └── views/            # View definitions
@@ -50,11 +50,11 @@ my-project/
 | `bon validate` | Validate YAML syntax |
 | `bon validate --test-connection` | Validate + test connections |
 | `bon deploy` | Deploy to Bonnard (requires login) |
-| `bon docs` | Browse Cube documentation |
+| `bon docs` | Browse documentation |
 
-## Learning Cube Syntax
+## Learning YAML Syntax
 
-Use `bon docs` to explore Cube data modeling concepts:
+Use `bon docs` to explore data modeling concepts:
 
 ```bash
 bon docs                        # Show all topics
@@ -73,7 +73,7 @@ Topics follow dot notation (e.g., `cubes.dimensions.time`). Use `--recursive` to
 ## Workflow
 
 1. **Setup datasource** — `bon datasource add --from-dbt` or manual
-2. **Create cubes** — Define measures/dimensions in `bonnard/models/*.yaml`
+2. **Create cubes** — Define measures/dimensions in `bonnard/cubes/*.yaml`
 3. **Create views** — Compose cubes in `bonnard/views/*.yaml`
 4. **Validate** — `bon validate --test-connection`
 5. **Deploy** — `bon login` then `bon deploy`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bonnard/cli",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "type": "module",
   "bin": {
     "bon": "./dist/bin/bon.mjs"
@@ -14,7 +14,6 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@bonnard/content": "workspace:*",
     "@inquirer/prompts": "^7.0.0",
     "@toon-format/toon": "^2.1.0",
     "commander": "^12.0.0",