contentbase 0.1.5 → 0.1.8

package/docs/models.ts

@@ -9,6 +9,7 @@ import {
 
 export const Idea = defineModel("Idea", {
 	prefix: "ideas",
+	description: 'Ideas are used to capture thoughts for new features, apis, etc',
 	meta: z.object({
 		goal: z.string().optional().describe("Slug of the goal this idea is aligned to"),
 		tags: z.array(z.string()).default([]).describe("Arbitrary tags for categorizing the idea"),
@@ -18,8 +19,10 @@ export const Idea = defineModel("Idea", {
 
 export const Tutorial = defineModel("Tutorial", {
 	prefix: "tutorials",
+	pattern: ['tutorials/:slug', 'tutorials/:category/:slug'],
 	meta: z.object({
 		tags: z.array(z.string()).default([]).describe("Arbitrary tags for categorizing the tutorial"),
+		category: z.string().default('contentbase')
 	}),
 })
 
@@ -35,4 +38,4 @@ export const Example = defineModel("Example", {
 	meta: z.object({
 		tags: z.array(z.string()).default([]).describe("Arbitrary tags for categorizing the example"),
 	}),
-})
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentbase",
-  "version": "0.1.5",
+  "version": "0.1.8",
   "repository": "https://github.com/soederpop/contentbase",
   "website": "https://contentbase.soederpop.com",
   "type": "module",
@@ -20,7 +20,7 @@
     "release": "./scripts/release.sh"
   },
   "dependencies": {
-    "@soederpop/luca": "latest",
+    "@soederpop/luca": ">=0.0.16",
     "gray-matter": "^4.0.3",
     "js-yaml": "^4.1.0",
     "mdast-util-mdxjs-esm": "^2.0.1",
@@ -50,6 +50,11 @@
     "vitest": "^1.6.0"
   },
   "luca": {
-    "aliases": ["contentbase", "content base", "content", "the orm"]
+    "aliases": [
+      "contentbase",
+      "content base",
+      "content",
+      "the orm"
+    ]
   }
 }

package/src/cli/commands/action.ts

@@ -38,6 +38,7 @@ async function handler(options: z.infer<typeof argsSchema>, context: { container
 
 commands.register('action', {
   description: 'Run a named action on the collection',
+  usage: '<name>',
   help: `# cnotes action
 
 Run a named action registered on the collection. Actions are custom functions defined in your collection's entry point.

package/src/cli/commands/api/endpoints/index.ts

@@ -0,0 +1,38 @@
+/**
+ * Static imports of all built-in endpoint modules.
+ * This allows endpoints to be bundled into a compiled bun binary
+ * instead of relying on runtime filesystem scanning.
+ */
+import * as actions from './actions.js'
+import * as doc from './doc.js'
+import * as docsIndex from './docs-index.js'
+import * as document from './document.js'
+import * as documents from './documents.js'
+import * as inspect from './inspect.js'
+import * as models from './models.js'
+import * as query from './query.js'
+import * as root from './root.js'
+import * as searchReindex from './search-reindex.js'
+import * as searchStatus from './search-status.js'
+import * as search from './search.js'
+import * as semanticSearch from './semantic-search.js'
+import * as textSearch from './text-search.js'
+import * as validate from './validate.js'
+
+export const builtinEndpoints = [
+  actions,
+  doc,
+  docsIndex,
+  document,
+  documents,
+  inspect,
+  models,
+  query,
+  root,
+  searchReindex,
+  searchStatus,
+  search,
+  semanticSearch,
+  textSearch,
+  validate,
+]

package/src/{api → cli/commands/api}/endpoints/query.ts

@@ -1,6 +1,6 @@
 import { z } from 'zod'
 import { resolveModelDef } from '../helpers.js'
-import { queryDSLSchema, executeQueryDSL } from '../../query/query-dsl.js'
+import { queryDSLSchema, executeQueryDSL } from '../../../../query/query-dsl.js'
 
 export const path = '/api/query'
 export const description = 'Query model instances with filtering'

package/src/{api → cli/commands/api}/endpoints/validate.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { validateDocument } from '../../index.js'
+import { validateDocument } from '../../../../index.js'
 import { resolveModelDef } from '../helpers.js'
 
 export const path = '/api/validate'

package/src/{api → cli/commands/api}/helpers.ts

@@ -3,8 +3,8 @@ import remarkParse from 'remark-parse'
 import remarkGfm from 'remark-gfm'
 import remarkRehype from 'remark-rehype'
 import rehypeStringify from 'rehype-stringify'
-import type { Collection } from '../collection.js'
-import { introspectMetaSchema } from '../collection.js'
+import type { Collection } from '../../../collection.js'
+import { introspectMetaSchema } from '../../../collection.js'
 
 export async function renderMarkdownToHtml(markdown: string): Promise<string> {
   const result = await unified()

package/src/cli/commands/create.ts

@@ -2,6 +2,7 @@ import { z } from 'zod'
 import fs from 'fs/promises'
 import path from 'path'
 import matter from 'gray-matter'
+import { execSync } from 'child_process'
 import { commands } from '../registry.js'
 import { loadCollection } from '../load-collection.js'
 import { kebabCase } from '../../utils/inflect.js'
@@ -10,6 +11,7 @@ import { introspectMetaSchema } from '../../collection.js'
 const argsSchema = z.object({
   title: z.string().optional(),
   contentFolder: z.string().optional(),
+  openEditor: z.boolean().optional(),
 })
 
 async function handler(options: z.infer<typeof argsSchema>, context: { container: any }) {
@@ -125,10 +127,37 @@ async function handler(options: z.infer<typeof argsSchema>, context: { container
   await fs.writeFile(filePath, content, 'utf8')
 
   console.log(`Created ${filePath}`)
+
+  if (options.openEditor) {
+    const editor = process.env.EDITOR
+    if (editor) {
+      execSync(`${editor} ${filePath}`, { stdio: 'inherit' })
+    } else {
+      const candidates = ['cursor', 'code', 'vim']
+      let found = false
+      for (const cmd of candidates) {
+        try {
+          execSync(`which ${cmd}`, { stdio: 'ignore' })
+          execSync(`${cmd} ${filePath}`, { stdio: 'inherit' })
+          found = true
+          break
+        } catch {
+          // not available, try next
+        }
+      }
+      if (!found) {
+        console.error(
+          'No editor found. Tried: cursor, code, vim. Set $EDITOR to your preferred editor.'
+        )
+        process.exit(1)
+      }
+    }
+  }
 }
 
 commands.register('create', {
   description: 'Create a new document for a model type',
+  usage: '<model>',
   help: `# cnotes create
 
 Create a new document for a registered model, with proper frontmatter defaults and section scaffolding.
@@ -151,6 +180,7 @@ cnotes create <model> --title "Document Title" [options]
 |--------|-------------|
 | \`--title\` | **Required.** Title for the new document (used as H1 and slug) |
 | \`--meta.*\` | Set frontmatter fields (e.g. \`--meta.status active\`) |
+| \`--open-editor\` | Open the new file in your editor ($EDITOR, or tries cursor/code/vim) |
 | \`--contentFolder\` | Path to content folder |
 
 ## Template Lookup

package/src/cli/commands/extract.ts

@@ -123,6 +123,7 @@ async function handler(options: z.infer<typeof argsSchema>, context: { container
 
 commands.register('extract', {
   description: 'Extract specific sections from documents',
+  usage: '<glob>',
   help: `# cnotes extract
 
 Extract specific sections from one or more documents. Supports glob patterns for matching multiple documents and outputs clean markdown with normalized headings.

package/src/cli/commands/help.ts

@@ -22,7 +22,8 @@ async function handler(_options: any, context: { container: any }) {
 
   for (const name of commands.available) {
     const def = commands.get(name)!
-    lines.push(`| \`${name}\` | ${def.description} |`)
+    const label = def.usage ? `${name} ${def.usage}` : name
+    lines.push(`| \`${label}\` | ${def.description} |`)
   }
 
   lines.push(

package/src/cli/commands/init.ts

@@ -60,6 +60,7 @@ collection.register(Post);
 
 commands.register('init', {
   description: 'Initialize a new contentbase project',
+  usage: '[name]',
   help: `# cnotes init
 
 Scaffold a new contentbase project with a sample model and document.

package/src/cli/commands/mcp.ts

@@ -6,7 +6,7 @@ import matter from 'gray-matter'
 import { commands } from '../registry.js'
 import { loadCollection } from '../load-collection.js'
 import { introspectMetaSchema, validateDocument } from '../../index.js'
-import { resolveModelDef, buildSchemaJSON } from '../../api/helpers.js'
+import { resolveModelDef, buildSchemaJSON } from './api/helpers.js'
 import { queryDSLSchema, executeQueryDSL } from '../../query/query-dsl.js'
 // MCPServer type comes from container.server('mcp', ...) at runtime
 

package/src/cli/commands/search.ts

@@ -223,6 +223,7 @@ async function handler(options: z.infer<typeof argsSchema>, { container }: { con
 
 commands.register('search', {
   description: 'Semantic search across collection documents',
+  usage: '<query>',
   help: `# cnotes search
 
 Search documents in the collection using keyword, semantic, or hybrid search modes. Requires a search index — run \`cnotes embed\` first.

package/src/cli/commands/serve.ts

@@ -3,7 +3,8 @@ import path from 'node:path'
 import fs from 'node:fs'
 import { commands } from '../registry.js'
 import { loadCollection } from '../load-collection.js'
-import { buildSchemaJSON } from '../../api/helpers.js'
+import { buildSchemaJSON } from './api/helpers.js'
+import { builtinEndpoints } from './api/endpoints/index.js'
 
 const argsSchema = z.object({
   port: z.number().default(8000),
@@ -118,9 +119,8 @@ async function handler(options: z.infer<typeof argsSchema>, context: { container
     historyFallback: false,
   }) as any
 
-  // Load built-in contentbase endpoints
-  const builtinEndpointsDir = path.resolve(import.meta.dir, '../../api/endpoints')
-  await expressServer.useEndpoints(builtinEndpointsDir)
+  // Load built-in contentbase endpoints (statically imported so they survive bun compile)
+  await expressServer.useEndpointModules(builtinEndpoints)
 
   // Load user endpoints if present
   if (userEndpointsDir) {

package/src/cli/commands/summary.ts

@@ -6,6 +6,7 @@ import { loadCollection } from '../load-collection.js'
 
 const argsSchema = z.object({
   contentFolder: z.string().optional(),
+  includeIds: z.boolean().optional().default(false),
 })
 
 async function handler(options: z.infer<typeof argsSchema>) {
@@ -13,7 +14,7 @@ async function handler(options: z.infer<typeof argsSchema>) {
     contentFolder: options.contentFolder,
   })
 
-  await collection.saveModelSummary()
+  await collection.saveModelSummary({ includeIds: options.includeIds })
   console.log(`README.md written to ${collection.rootPath}/README.md`)
 
   const toc = collection.tableOfContents({ title: 'Table of Contents' })
@@ -39,6 +40,7 @@ cnotes summary [options]
 | Option | Description |
 |--------|-------------|
 | \`--contentFolder\` | Path to content folder |
+| \`--include-ids\` | Include document IDs in the summary (default: false) |
 
 ## Generated Files
 

package/src/cli/commands/text-search.ts

@@ -86,6 +86,7 @@ async function handler(options: z.infer<typeof argsSchema>, { container }: { con
 
 commands.register('text-search', {
   description: 'Search file contents with pattern matching',
+  usage: '<pattern>',
   help: `# cnotes text-search
 
 Search file contents within the collection using ripgrep. Returns matching files by default, or line-level detail with \`--expanded\`.

package/src/cli/commands/validate.ts

@@ -85,6 +85,7 @@ async function handler(options: z.infer<typeof argsSchema>, context: { container
 
 commands.register('validate', {
   description: 'Validate documents against their model schemas',
+  usage: '[model]',
   help: `# cnotes validate
 
 Validate documents against their model schemas. Check frontmatter types, required fields, and optionally fill in missing defaults.

package/src/cli/registry.ts

@@ -2,6 +2,7 @@ import type { z } from 'zod'
 
 export interface CommandDefinition {
   description: string
+  usage?: string
   help?: string
   argsSchema?: z.ZodType<any>
   handler: (options: any, context: { container: any }) => Promise<void>

package/src/collection.ts

@@ -715,7 +715,7 @@ export class Collection {
    * Generate a plain-text summary of the collection and its models.
    * Returns the same output as `cnotes inspect`.
    */
-  generateModelSummary(): string {
+  generateModelSummary(options: { includeIds?: boolean } = {}): string {
     if (!this.#loaded) {
       throw new Error("Collection has not been loaded. Call load() first.");
     }
@@ -728,11 +728,17 @@ export class Collection {
     lines.push("");
 
     for (const def of this.modelDefinitions) {
-      const matchingItems = this.available.filter(
-        (id) => this.findModelDefinition(id)?.name === def.name
-      );
       lines.push(`  Model: ${def.name}`);
-      lines.push(`    Prefix: ${def.prefix}`);
+      if (def.description) {
+        lines.push(`    Description: ${def.description}`);
+      }
+      if (def.pattern) {
+        const patterns = Array.isArray(def.pattern) ? def.pattern : [def.pattern];
+        lines.push(`    Path prefix: ${patterns.join(", ")}`);
+      } else {
+        const rel = path.relative(process.cwd(), path.join(this.rootPath, def.prefix));
+        lines.push(`    Path prefix: ${rel}/*.md`);
+      }
       const fields = introspectMetaSchema(def.meta);
       lines.push(
         `    Meta: ${fields.length > 0 ? fields.map((f) => `${f.name}(${f.type})`).join(", ") : "(none)"}`
@@ -743,9 +749,13 @@ export class Collection {
       lines.push(
         `    Relationships: ${Object.keys(def.relationships).join(", ") || "(none)"}`
       );
-      lines.push(`    Documents: ${matchingItems.length}`);
-      if (matchingItems.length > 0) {
-        lines.push(`    IDs: ${matchingItems.join(", ")}`);
+      if (options.includeIds) {
+        const matchingItems = this.available.filter(
+          (id) => this.findModelDefinition(id)?.name === def.name
+        );
+        if (matchingItems.length > 0) {
+          lines.push(`    IDs: ${[...matchingItems].sort().join(", ")}`);
+        }
       }
       lines.push("");
     }
@@ -762,8 +772,8 @@ export class Collection {
    * Preserves the `## Overview` section if it already exists.
    * The generated summary is placed in the `## Summary` section.
    */
-  async saveModelSummary(): Promise<string> {
-    const summary = this.generateModelSummary();
+  async saveModelSummary(options: { includeIds?: boolean } = {}): Promise<string> {
+    const summary = this.generateModelSummary(options);
     const modelsPath = path.join(this.rootPath, "README.md");
 
     // Preserve existing Overview section content

package/src/query/query-dsl.ts

@@ -2,7 +2,7 @@ import { z } from "zod";
 import type { Collection } from "../collection";
 import type { Condition } from "./query-builder";
 import type { Operator } from "./operators";
-import { resolveModelDef } from "../api/helpers.js";
+import { resolveModelDef } from "../cli/commands/api/helpers.js";
 
 // ---------------------------------------------------------------------------
 // Operator mapping: $dsl → internal