Refactor skills structure: rename objectstack-data to objectstack-schema, objectstack-kernel to objectstack-plugin, and introduce objectstack-query. Update documentation and references accordingly. Consolidate hooks into objectstack-schema and deprecate objectstack-hooks. Enhance pagination and filtering rules in objectstack-query with comprehensive guides and examples.

Author: hotlong

.github/copilot-instructions.md

@@ -88,11 +88,13 @@ objectstack-ai/spec/
 │   └── plugin-bi/         # Plugin example: BI dashboard
 │
 ├── skills/                # 🤖 AI skill definitions (for Copilot/Cursor)
-│   ├── objectstack-data/
+│   ├── objectstack-schema/
+│   ├── objectstack-query/
 │   ├── objectstack-api/
 │   ├── objectstack-ui/
 │   ├── objectstack-automation/
 │   ├── objectstack-ai/
+│   ├── objectstack-plugin/
 │   └── objectstack-i18n/
 │
 └── content/docs/          # 📝 Documentation content
@@ -227,8 +229,9 @@ The `skills/` directory contains domain-specific AI skill definitions. When work
 | Skill | Path | Use When |
 |:---|:---|:---|
 | **Quickstart** | `skills/objectstack-quickstart/SKILL.md` | Project creation, defineStack(), drivers, adapters, bootstrap |
-| **Kernel** | `skills/objectstack-kernel/SKILL.md` | Plugin lifecycle, DI, EventBus, Kernel config |
-| Data Design | `skills/objectstack-data/SKILL.md` | Designing Objects, Fields, Relations |
+| **Plugin** | `skills/objectstack-plugin/SKILL.md` | Plugin lifecycle, DI, EventBus, Kernel config |
+| Schema Design | `skills/objectstack-schema/SKILL.md` | Designing Objects, Fields, Relations, Validations |
+| Query Design | `skills/objectstack-query/SKILL.md` | Filters, sorting, pagination, aggregation, joins |
 | API Design | `skills/objectstack-api/SKILL.md` | Designing REST/GraphQL endpoints |
 | UI Design | `skills/objectstack-ui/SKILL.md` | Designing Views, Dashboards, Apps |
 | Automation Design | `skills/objectstack-automation/SKILL.md` | Designing Flows, Workflows, Triggers |

CHANGELOG.md

@@ -13,9 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - **`rules/` directory** — Detailed implementation rules with incorrect/correct code examples for better AI comprehension
   - **`evals/` directory** — Placeholder for future evaluation tests to validate AI assistant understanding
   - **Skills refactored:**
-    - `objectstack-data` — Extracted rules for naming, relationships, validation, indexing, field types, and hooks (moved from objectstack-hooks)
-    - `objectstack-kernel` — Extracted rules for plugin lifecycle, service registry, and hooks/events system
-    - `objectstack-hooks` — **DEPRECATED** and consolidated into `objectstack-data/rules/hooks.md` (hooks are core to data operations)
+    - `objectstack-schema` (formerly `objectstack-data`) — Extracted rules for naming, relationships, validation, indexing, field types, and hooks (moved from objectstack-hooks)
+    - `objectstack-plugin` (formerly `objectstack-kernel`) — Extracted rules for plugin lifecycle, service registry, and hooks/events system
+    - `objectstack-query` — NEW skill for filters, sorting, pagination, aggregation, joins, expand, full-text search, window functions
+    - `objectstack-hooks` — **DEPRECATED** and consolidated into `objectstack-schema/rules/hooks.md` (hooks are core to data operations)
     - `objectstack-ui`, `objectstack-api`, `objectstack-automation`, `objectstack-ai`, `objectstack-i18n`, `objectstack-quickstart` — Added `rules/` and `evals/` structure with initial pattern documentation
   - **Benefits:**
     - Improved maintainability — Detailed rules are separated from high-level overview

packages/spec/scripts/build-skill-references.ts

@@ -30,16 +30,18 @@ const SKILLS_DIR = path.resolve(REPO_ROOT, 'skills');
 // Paths are relative to packages/spec/src/ (category/file.zod.ts)
 
 const SKILL_MAP: Record<string, string[]> = {
-  'objectstack-data': [
+  'objectstack-schema': [
     'data/field.zod.ts',
     'data/object.zod.ts',
     'data/validation.zod.ts',
-    'data/query.zod.ts',
-    'data/filter.zod.ts',
-    'data/datasource.zod.ts',
     'data/hook.zod.ts',
+    'data/datasource.zod.ts',
     'security/permission.zod.ts',
   ],
+  'objectstack-query': [
+    'data/query.zod.ts',
+    'data/filter.zod.ts',
+  ],
   'objectstack-ai': [
     'ai/agent.zod.ts',
     'ai/tool.zod.ts',
@@ -89,7 +91,7 @@ const SKILL_MAP: Record<string, string[]> = {
     'data/datasource.zod.ts',
     'data/dataset.zod.ts',
   ],
-  'objectstack-kernel': [
+  'objectstack-plugin': [
     'kernel/plugin.zod.ts',
     'kernel/context.zod.ts',
     'kernel/service-registry.zod.ts',

skills/objectstack-hooks/SKILL.md

@@ -1,8 +1,8 @@
 ---
 name: objectstack-hooks
 description: >
-  ⚠️ DEPRECATED: This skill has been integrated into objectstack-data.
-  Please use the objectstack-data skill and refer to rules/hooks.md for
+  ⚠️ DEPRECATED: This skill has been integrated into objectstack-schema.
+  Please use the objectstack-schema skill and refer to rules/hooks.md for
   data lifecycle hook documentation.
 license: Apache-2.0
 compatibility: Requires @objectstack/spec v4+, @objectstack/objectql v4+
@@ -12,22 +12,22 @@ metadata:
   domain: hooks
   tags: hooks, lifecycle, validation, business-logic, side-effects, data-enrichment
   deprecated: true
-  replacement: objectstack-data
+  replacement: objectstack-schema
 ---
 
 # ⚠️ DEPRECATED: Hooks Skill Migrated
 
-This skill has been **deprecated** and integrated into the **objectstack-data** skill.
+This skill has been **deprecated** and integrated into the **objectstack-schema** skill.
 
 ## Migration
 
 For data lifecycle hook documentation, please use:
 
-**New location:** [`objectstack-data/rules/hooks.md`](../objectstack-data/rules/hooks.md)
+**New location:** [`objectstack-schema/rules/hooks.md`](../objectstack-schema/rules/hooks.md)
 
 ## Rationale
 
-Hooks are a core part of data operations and are best documented alongside object definitions, field types, and validations. The objectstack-data skill now provides comprehensive coverage of:
+Hooks are a core part of data operations and are best documented alongside object definitions, field types, and validations. The objectstack-schema skill now provides comprehensive coverage of:
 
 - Object and field schema design
 - Validation rules
@@ -40,10 +40,10 @@ This consolidation reduces skill overlap and makes it easier for AI assistants t
 
 All content from this skill is now available at:
 
-- **Full documentation:** [`../objectstack-data/rules/hooks.md`](../objectstack-data/rules/hooks.md)
-- **Parent skill:** [`../objectstack-data/SKILL.md`](../objectstack-data/SKILL.md)
+- **Full documentation:** [`../objectstack-schema/rules/hooks.md`](../objectstack-schema/rules/hooks.md)
+- **Parent skill:** [`../objectstack-schema/SKILL.md`](../objectstack-schema/SKILL.md)
 
-The objectstack-data skill now includes:
+The objectstack-schema skill now includes:
 - Hook definition schema
 - Hook context API
 - 14 lifecycle events (before/after for find/insert/update/delete, etc.)
@@ -58,10 +58,10 @@ The objectstack-data skill now includes:
 
 For hook lifecycle documentation, see:
 
-- [objectstack-data/rules/hooks.md](../objectstack-data/rules/hooks.md) — Complete hook documentation
-- [objectstack-data/SKILL.md](../objectstack-data/SKILL.md) — Data skill overview
+- [objectstack-schema/rules/hooks.md](../objectstack-schema/rules/hooks.md) — Complete hook documentation
+- [objectstack-schema/SKILL.md](../objectstack-schema/SKILL.md) — Schema skill overview
 
 For kernel-level hooks (kernel:ready, kernel:shutdown, custom plugin events), see:
 
-- [objectstack-kernel/rules/hooks-events.md](../objectstack-kernel/rules/hooks-events.md) — Kernel hook system
-- [objectstack-kernel/SKILL.md](../objectstack-kernel/SKILL.md) — Kernel skill overview
+- [objectstack-plugin/rules/hooks-events.md](../objectstack-plugin/rules/hooks-events.md) — Plugin hook system
+- [objectstack-plugin/SKILL.md](../objectstack-plugin/SKILL.md) — Plugin skill overview

skills/objectstack-i18n/SKILL.md

@@ -691,6 +691,6 @@ export default {
 
 ## See Also
 
-- **objectstack-data** — For understanding object and field metadata structure
+- **objectstack-schema** — For understanding object and field metadata structure
 - **objectstack-ui** — For view, app, and action translations
 - **objectstack-automation** — For workflow and flow message translations

skills/objectstack-i18n/references/_index.md

@@ -14,6 +14,6 @@
 
 These schemas are included in the references for completeness but are primarily managed by other skills:
 
-- **objectstack-data** — Object, Field schemas (source for translation extraction)
+- **objectstack-schema** — Object, Field schemas (source for translation extraction)
 - **objectstack-ui** — View, App, Dashboard schemas (UI translation sources)
 - **objectstack-automation** — Flow, Workflow schemas (automation message translations)