@cxtms/cx-schema 1.8.0 → 1.8.1

package/.claude/skills/cx-core/SKILL.md

@@ -1,21 +1,11 @@
 ---
 name: cx-core
-description: >
-  Provides shared CXTMS entity field reference — domain entities, field names, enums, and customValues patterns.
-  Use when the user asks about CX entity fields, enums, customValues, entity relationships, or needs domain reference for Orders, Contacts, Commodities, Jobs, etc.
+description: Shared CargoXplorer entity field reference — domain entities, field names, enums, and customValues patterns
 argument-hint: <entity name or question about fields>
 ---
 
 Shared domain reference for CargoXplorer entities. Used by `cx-workflow` and `cx-module` skills for entity field names, types, navigation properties, enums, and customValues extension patterns.
 
-## CX Server Authentication & Management
-
-For CLI authentication, PAT tokens, org management, and releasing: see [ref-cli-auth.md](ref-cli-auth.md)
-
-## GraphQL Querying & Audit History
-
-For running GraphQL queries via CLI, filter syntax (Lucene), pagination, audit change history, and field discovery: see [ref-graphql-query.md](ref-graphql-query.md)
-
 ## Feature File Layout
 
 All modules and workflows are organized under feature directories:
@@ -31,21 +21,49 @@ When creating new modules or workflows, always place them under the correct feat
 - `features/<feature_name>/modules/<name>-module.yaml`
 - `features/<feature_name>/workflows/<name>.yaml`
 
-Use `--feature <feature_name>` with `cxtms create` to automatically place files in the correct location.
+Use `--feature <feature_name>` with `cx-cli create` to automatically place files in the correct location.
 
 ## Entity Field Reference
 
-Read the relevant entity reference file when needed for the current task. Do not load all files upfront.
+### Primary Entities
+
+!cat .claude/skills/cx-core/ref-entity-order.md
+!cat .claude/skills/cx-core/ref-entity-contact.md
+!cat .claude/skills/cx-core/ref-entity-commodity.md
+!cat .claude/skills/cx-core/ref-entity-accounting.md
+
+### Order Sub-Entities & Related
+
+!cat .claude/skills/cx-core/ref-entity-order-sub.md
+!cat .claude/skills/cx-core/ref-entity-job.md
+
+### Pricing & Accounting Lookups
+
+!cat .claude/skills/cx-core/ref-entity-rate.md
+
+### Shared & Lookup Entities
+
+!cat .claude/skills/cx-core/ref-entity-shared.md
+!cat .claude/skills/cx-core/ref-entity-geography.md
+
+### Warehouse & Inventory
+
+!cat .claude/skills/cx-core/ref-entity-warehouse.md
+
+### Notifications
+
+!cat .claude/skills/cx-core/ref-entity-notification.md
 
 | Category | Entities | Reference |
 |----------|----------|-----------|
-| **Primary** | Order, Contact, Commodity, AccountingTransaction | [ref-entity-order.md](ref-entity-order.md), [ref-entity-contact.md](ref-entity-contact.md), [ref-entity-commodity.md](ref-entity-commodity.md), [ref-entity-accounting.md](ref-entity-accounting.md) |
-| **Order sub** | OrderEntity, TrackingEvent, EventDefinition, LinkedOrder, OrderDocument | [ref-entity-order-sub.md](ref-entity-order-sub.md) |
-| **Job** | Job, JobOrder, JobStatus | [ref-entity-job.md](ref-entity-job.md) |
-| **Pricing** | Rate, Lane, Discount, AccountingItem, AccountingAccount, PaymentTerm | [ref-entity-rate.md](ref-entity-rate.md) |
-| **Shared** | Tag, Attachment, Division, EquipmentType, PackageType, Note/NoteThread | [ref-entity-shared.md](ref-entity-shared.md) |
-| **Geography** | Country, State, City, Port, Vessel, CustomCode, ModeOfTransportation | [ref-entity-geography.md](ref-entity-geography.md) |
-| **Warehouse** | InventoryItem, WarehouseLocation, CargoMovement (Order variant) | [ref-entity-warehouse.md](ref-entity-warehouse.md) |
+| **Primary** | Order, Contact, Commodity, AccountingTransaction | ref-entity-order/contact/commodity/accounting.md |
+| **Order sub** | OrderEntity, TrackingEvent, EventDefinition, LinkedOrder, OrderDocument | ref-entity-order-sub.md |
+| **Job** | Job, JobOrder, JobStatus | ref-entity-job.md |
+| **Pricing** | Rate, Lane, Discount, AccountingItem, AccountingAccount, PaymentTerm | ref-entity-rate.md |
+| **Shared** | Tag, Attachment, Division, EquipmentType, PackageType, Note/NoteThread | ref-entity-shared.md |
+| **Geography** | Country, State, City, Port, Vessel, CustomCode, ModeOfTransportation | ref-entity-geography.md |
+| **Warehouse** | InventoryItem, WarehouseLocation, CargoMovement (Order variant) | ref-entity-warehouse.md |
+| **Notification** | Notification, UserNotification | ref-entity-notification.md |
 
 ## CustomValues Pattern
 

package/.claude/skills/cx-core/ref-entity-accounting.md

@@ -1,12 +1,5 @@
 # Accounting Transaction Entity Field Reference
 
-## Contents
-- AccountingTransaction Fields
-- Charge Entity
-- Payment Entity
-- Accounting Enums
-- Accounting CustomValues
-
 Field names as used in workflow expressions: `{{ entity.transactionNumber }}`, `{{ entity.customValues.myField }}`.
 
 ## AccountingTransaction Fields

package/.claude/skills/cx-core/ref-entity-commodity.md

@@ -1,17 +1,5 @@
 # Commodity Entity Field Reference
 
-## Contents
-- Commodity Scalar Fields
-- Commodity Navigation Properties
-- Commodity Collection Properties
-- Commodity Computed/Resolved GraphQL Fields
-- Commodity Container/Child Pattern (Self-Referencing)
-- CommodityTrackingNumber Sub-Entity
-- OrderCommodity Join Entity
-- Commodity Enums
-- Commodity CustomValues
-- CommodityEvent (Bridge Entity)
-
 Field names as used in workflow expressions: `{{ entity.description }}`, `{{ entity.customValues.myField }}`.
 
 ## Scalar Fields

package/.claude/skills/cx-core/ref-entity-contact.md

@@ -1,15 +1,5 @@
 # Contact Entity Field Reference
 
-## Contents
-- Contact Scalar Fields
-- Contact Navigation Properties
-- Contact Collection Properties
-- Contact Computed/Resolved GraphQL Fields
-- ContactType Enum
-- ContactAddress Sub-Entity
-- Contact Other Related Enums
-- Contact CustomValues
-
 Field names as used in workflow expressions: `{{ entity.name }}`, `{{ entity.customValues.myField }}`.
 
 ## Scalar Fields

package/.claude/skills/cx-core/ref-entity-geography.md

@@ -1,16 +1,6 @@
 # Geography & Lookup Entity Reference
 
-## Contents
-- Country
-- State
-- City
-- PostalCode
-- Port
-- Vessel
-- CustomCode
-- ModeOfTransportation
-
-Country, State, City, PostalCode, Port, Vessel, CustomCode, ModeOfTransportation.
+Country, State, City, Port, Vessel, CustomCode, ModeOfTransportation.
 
 ## Country
 
@@ -60,29 +50,6 @@ Composite key: `organizationId` + `countryCode` + `stateCode`.
 
 ---
 
-## PostalCode
-
-PK: `id` (int, auto). Scoped per organization.
-
-| Field | Type | Notes |
-|-------|------|-------|
-| `id` | `int` | PK |
-| `organizationId` | `int` | |
-| `code` | `string` | Postal/zip code value |
-| `countryCode` | `string` | FK to Country |
-| `placeName` | `string` | Place/city name |
-| `stateCode` | `string?` | FK to State |
-| `accuracy` | `AccuracyTypes?` | 1=Region, 2=Municipality, 3=Neighborhood, 4=Place, 5=Street, 6=Centroid |
-| `timeZone` | `string?` | IANA timezone ID (e.g., `America/Chicago`) |
-| `customValues` | `Dictionary` | jsonb |
-| `location` | `Point?` | WGS 84 (SRID 4326). X=longitude, Y=latitude |
-
-**Navigation:** `country`, `state`
-
-**Mutations:** `ChangeCode`, `ChangePlaceName`, `ChangeCoordinates(lat, lng, accuracy)`, `ChangeCountry`/`ChangeCountryCode`, `ChangeState`/`ChangeStateCode`, `ChangeTimeZone`, `ChangeCustomValues`, `ChangeLatitude`, `ChangeLongitude`
-
----
-
 ## Port
 
 String-based PK (e.g., UN/LOCODE).

package/.claude/skills/cx-core/ref-entity-notification.md

@@ -0,0 +1,85 @@
+# Notification Entity Reference
+
+Real-time notification system. Notifications are org-scoped with per-user read tracking via `UserNotification`.
+
+## Notification
+
+| Field | Type | Notes |
+|-------|------|-------|
+| `notificationId` | `int` | PK |
+| `organizationId` | `int` | FK to Organization |
+| `title` | `string` | Required |
+| `message` | `string?` | Body text, supports Markdown |
+| `type` | `NotificationType` | System=0, OrderUpdate=1, TaskAssignment=2, Alert=3, Info=4 |
+| `priority` | `NotificationPriority` | Low=0, Normal=1, High=2, Urgent=3 |
+| `targetUserId` | `string?` | If set, targets one user; if null, broadcasts to all active org users |
+| `entityType` | `string?` | Linked entity type (e.g. "Order", "Job") |
+| `entityId` | `int?` | Linked entity PK |
+| `expiresAt` | `DateTime?` | Optional expiration |
+| `created` / `lastModified` | `DateTime` | Audit fields (from `AuditableEntity`) |
+| `createdBy` / `lastModifiedBy` | `string` | Audit fields |
+
+### Domain Methods
+
+- `ChangeTitle(string)`, `ChangeMessage(string?)`, `ChangeType(NotificationType)`, `ChangePriority(NotificationPriority)`, `ChangeExpiresAt(DateTime?)`
+
+---
+
+## UserNotification
+
+Per-user read state join entity.
+
+| Field | Type | Notes |
+|-------|------|-------|
+| `userNotificationId` | `int` | PK |
+| `notificationId` | `int` | FK to Notification |
+| `userId` | `string` | FK to ApplicationUser |
+| `isRead` | `bool` | Default false |
+| `readAt` | `DateTime?` | Set when marked read |
+
+### Domain Methods
+
+- `MarkAsRead()` — sets `IsRead = true`, `ReadAt = UtcNow`
+- `MarkAsUnread()` — resets both
+
+---
+
+## GraphQL
+
+### Queries
+
+- `getNotification(organizationId, notificationId)` → single notification for current user (projected from UserNotification)
+- `getNotifications(organizationId, filter?, search?, orderBy?)` → offset-paged list for current user; default sort: `-notification.created`
+- `getUnreadNotificationCount(organizationId)` → int
+
+### Mutations
+
+- `createNotification(organizationId, values)` → creates Notification + UserNotification rows; publishes to subscription topic per user
+- `markNotificationRead(organizationId, notificationId)` → bool
+- `markAllNotificationsRead(organizationId)` → int (count marked)
+- `deleteNotification(organizationId, notificationId)` → DeleteResult
+
+### Subscriptions
+
+- `onNotificationReceived(organizationId, userId)` → real-time via PostgreSQL NOTIFY/LISTEN
+  - Topic: `{organizationId}_{userId}_notifications`
+
+### GraphQL DTO (projected from UserNotification)
+
+Flattens `Notification` + `UserNotification` into single DTO: `notificationId`, `organizationId`, `title`, `message`, `type`, `priority`, `targetUserId`, `entityType`, `entityId`, `expiresAt`, `isRead`, `readAt`, `created`, `createdBy`, `lastModified`, `lastModifiedBy`, plus resolved `createdUser` / `updatedUser`.
+
+---
+
+## Targeting Logic
+
+On `CreateNotification`:
+1. If `targetUserId` is provided → single `UserNotification` row
+2. If null → queries all active `UserEmployee` records in org → one `UserNotification` per user
+3. After save, publishes `NotificationDto` to each user's subscription topic via `INotificationEventSender`
+
+## Infrastructure
+
+- `NotificationConfiguration` — EF Core config: title max length, indexes on `OrganizationId`, composite index on `(OrganizationId, Created DESC)` for paging
+- `UserNotificationConfiguration` — indexes on `UserId`, `NotificationId`, composite on `(UserId, IsRead)`
+- `NotificationEventSender` — uses HotChocolate `ITopicEventSender` to publish to subscription topics
+- Real-time delivery: PostgreSQL `NOTIFY/LISTEN` channel (configured in `DependencyInjection`)

package/.claude/skills/cx-core/ref-entity-order-sub.md

@@ -1,12 +1,5 @@
 # Order Sub-Entity Field Reference
 
-## Contents
-- OrderEntity
-- TrackingEvent
-- EventDefinition
-- LinkedOrder
-- OrderDocument
-
 Entities associated with orders: OrderEntity (parties), TrackingEvent, LinkedOrder, OrderDocument.
 
 ## OrderEntity
@@ -40,6 +33,13 @@ Represents a party role (Shipper, Consignee, Carrier, etc.) on an order.
 - `attachments` — filterable collection
 - `getOrderEntityAttachments(idPropertyName, filter, orderBy, search)` — resolver
 
+### Import Behavior (Order/Import)
+
+When importing order entities via `Order/Import@1`:
+- The `contact` and `contactAddress` nested objects are excluded from direct field mapping and processed separately.
+- **ContactAddress matching** uses `ImportOrderOptions.ContactAddressMatchByFields` — scoped to organization and (when persisted) to the resolved contact. Supports Lucene filter-based matching on any ContactAddress field (e.g., `["addressLine", "postalCode"]`). If null/empty, falls back to matching by `contactAddressId` only.
+- Both contacts and contact addresses are cached per import session to prevent duplicate creation.
+
 ### EntityTypes Enum
 
 Shipper=0, Consignee=1, Carrier=2, Vendor=3, UltimateConsignee=4, NotifyParty=5, Intermediate=6, ForwardingAgent=7, DestinationAgent=8, PickupFrom=9, DeliverTo=10, DeliveryCarrier=11, ReceivedBy=12, USPPI=13
@@ -94,12 +94,6 @@ Template/type definition for tracking events.
 | `triggerConditionFields` | `string?` | |
 | `customValues` | `Dictionary` | jsonb |
 
-### GraphQL Resolvers
-
-| Resolver | Arguments | Returns | Description |
-|----------|-----------|---------|-------------|
-| `getContact` | `customValuesKey: String!` | `Contact` | Looks up a Contact by ID stored in `customValues[key]` |
-
 ---
 
 ## LinkedOrder

package/.claude/skills/cx-core/ref-entity-order.md

@@ -1,15 +1,5 @@
 # Order Entity Field Reference
 
-## Contents
-- Order Scalar Fields
-- Order Navigation Properties
-- Order Collection Properties
-- Pre-filtered OrderEntity Collections (GraphQL)
-- Order Computed/Resolved GraphQL Fields
-- OrderTypes Enum
-- EntityTypes Enum (for OrderEntity)
-- Order CustomValues
-
 Field names as used in workflow expressions: `{{ entity.orderId }}`, `{{ entity.customValues.myField }}`.
 
 ## Scalar Fields
@@ -65,8 +55,6 @@ Field names as used in workflow expressions: `{{ entity.orderId }}`, `{{ entity.
 | `orderCarriers` | `[OrderCarrier]` | |
 | `allTags` | `[OrderAllTagsView]` | View: all tags including from commodities |
 | `allRelatedOrders` | `[OrderRelatedOrdersView]` | Orders sharing commodities |
-| `attachmentsSummary` | `OrderAttachmentSummaryView?` | DB view: `.totalCount`, `.hasAny` (active attachments) |
-| `notesSummary` | `OrderNoteSummaryView?` | DB view: `.totalCount`, `.hasAny` (non-deleted notes) |
 | `outgoingLinks` | `[LinkedOrder]` | |
 | `incomingLinks` | `[LinkedOrder]` | |
 
@@ -109,10 +97,9 @@ These are virtual fields that filter `orderEntities` by type:
 | `getChargesByChargeType(chargeType)` | `[Charge]` | Charges filtered by type |
 | `getOrderSummary(weightUnit, volumeUnit, dimensionsUnit)` | `OrderSummary` | |
 | `lastTrackingEvent(eventDefinitionName)` | `TrackingEvent` | Most recent |
-| `attachmentsSummary` | `OrderAttachmentSummaryGqlDto` | `.totalCount` (int), `.hasAny` (bool) — batched DataLoader, backed by DB view |
-| `notesSummary` | `OrderNoteSummaryGqlDto` | `.totalCount` (int), `.hasAny` (bool) — batched DataLoader, backed by DB view |
 | `notesCount(threadFilter)` | `int` | |
 | `changeHistory(startDate, endDate, maxResults)` | `[ChangeHistory]` | Audit trail |
+| `getCommoditiesWithRelatedOrder(orderType!, filter?)` | `[Commodity]` | Leaf commodities linked to related orders of specified type. Traverses commodity hierarchy, excludes wrappers. |
 
 ## OrderTypes Enum
 

package/.claude/skills/cx-core/ref-entity-rate.md

@@ -1,13 +1,5 @@
 # Rate, Pricing & Accounting Lookup Reference
 
-## Contents
-- Rate
-- Lane
-- Discount
-- AccountingItem
-- AccountingAccount
-- PaymentTerm
-
 ## Rate
 
 Carrier/vendor rates with tariff rules.

package/.claude/skills/cx-core/ref-entity-shared.md

@@ -1,14 +1,5 @@
 # Shared Entity Reference
 
-## Contents
-- Tag
-- Attachment
-- Division
-- EquipmentType
-- PackageType
-- NoteThread
-- Note
-
 Tag, Attachment, Division, EquipmentType, PackageType, Note/NoteThread.
 
 ## Tag
@@ -154,3 +145,23 @@ No customValues. Linked to carriers via `CarrierEquipment` join.
 | `isDeleted` | `bool` | Soft delete |
 
 **Navigation:** `thread` (NoteThread)
+
+---
+
+## Secret
+
+Encrypted key-value store for sensitive configuration (API keys, tokens, credentials). Encrypted at rest with AES-256; scoped to organizations via qualified naming.
+
+| Field | Type | Notes |
+|-------|------|-------|
+| `id` | `int` | PK |
+| `secretName` | `string` | Qualified name: `org/{organizationId}/{secretName}`. Unique index. Max 500 chars. |
+| `encryptedValue` | `string` | AES-256 encrypted, base64-encoded (random IV prepended) |
+| `createdAt` | `DateTime` | |
+| `updatedAt` | `DateTime` | |
+
+**Table:** `secrets` (snake_case columns)
+**Provider:** `PostgresSecretManager` (default) or `AzureKeyVault` via `SecretManager:Provider` config.
+
+**GraphQL mutations:** `setSecret(organizationId, secretName, secretValue)`, `deleteSecret(organizationId, secretName)`.
+**Org scoping:** Commands validate user org membership; qualified name `org/{orgId}/{name}` is built by the command handler.

package/.claude/skills/cx-core/ref-entity-warehouse.md

@@ -1,10 +1,5 @@
 # Warehouse & Inventory Entity Reference
 
-## Contents
-- InventoryItem
-- WarehouseLocation
-- CargoMovement
-
 ## InventoryItem
 
 SKU-level inventory tracking.

package/.claude/skills/cx-module/SKILL.md

@@ -1,36 +1,30 @@
 ---
 name: cx-module
-description: >
-  Works with CXTMS app module YAML files — creates, modifies, fixes, validates, and deploys UI screens, forms, grids, and routes.
-  Use when the user asks to create, modify, or fix a module YAML file, references *-module.yaml files, or asks about UI components/forms/grids/routes in a CX project.
-  Not for workflow YAML files, TypeScript code, or non-YAML tasks.
+description: Generate schema-valid CargoXplorer app module YAML files (UI screens, forms, grids, routes)
 argument-hint: <description of what to build>
 ---
 
 You are a CargoXplorer module YAML builder. You generate schema-valid YAML for CX app modules — UI screens, forms, data grids, routes, and components. All output must conform to the JSON schemas in `.cx-schema/`.
 
-**IMPORTANT — use `cxtms` for all module operations:**
-- **Scaffold**: `npx cxtms create module <name> --template <template>` — generates a schema-valid YAML file. ALWAYS run this first, then read the generated file, then customize. Do NOT write YAML from scratch or copy templates manually.
-- **Scaffold with fields**: `npx cxtms create module <name> --template <template> --options '<json>'`
-- **Validate**: `npx cxtms <file.yaml>` — run after every change
-- **Schema lookup**: `npx cxtms schema <component>` — e.g., `cxtms schema form`, `cxtms schema dataGrid`
-- **Examples**: `npx cxtms example <component>` — show example YAML
-- **List schemas**: `npx cxtms list`
-- **Extract**: `npx cxtms extract <source> <component> --to <target>` — move components between modules
-- **Feature folder**: `npx cxtms create module <name> --template <template> --feature <feature-name>`
-- **Deploy to server**: `npx cxtms appmodule deploy <file.yaml> --org <id>` — creates or updates module on the CX server
-- **Undeploy from server**: `npx cxtms appmodule undeploy <appModuleId> --org <id>` — removes a module by UUID
-- **Publish all**: `npx cxtms publish [--feature <name>] --org <id>` — deploy all modules and workflows to the server
+**IMPORTANT — use `cx-cli` for all module operations:**
+- **Scaffold**: `npx cx-cli create module <name> --template <template>` — generates a schema-valid YAML file. ALWAYS run this first, then read the generated file, then customize. Do NOT write YAML from scratch or copy templates manually.
+- **Scaffold with fields**: `npx cx-cli create module <name> --template <template> --options '<json>'`
+- **Validate**: `npx cx-cli <file.yaml>` — run after every change
+- **Schema lookup**: `npx cx-cli schema <component>` — e.g., `cx-cli schema form`, `cx-cli schema dataGrid`
+- **Examples**: `npx cx-cli example <component>` — show example YAML
+- **List schemas**: `npx cx-cli list`
+- **Extract**: `npx cx-cli extract <source> <component> --to <target>` — move components between modules
+- **Feature folder**: `npx cx-cli create module <name> --template <template> --feature <feature-name>`
 
 ## Generation Workflow
 
 ### Step 1: Scaffold via CLI — MANDATORY
 
-**You MUST run `cxtms create module` to generate the initial file.** Do not skip this step. Do not write YAML from scratch. Do not read template files and copy them manually. The CLI generates correct UUIDs, file paths, and structure.
+**You MUST run `cx-cli create module` to generate the initial file.** Do not skip this step. Do not write YAML from scratch. Do not read template files and copy them manually. The CLI generates correct UUIDs, file paths, and structure.
 
 ```bash
-npx cxtms create module <name> --template <template>
-npx cxtms create module <name> --template <template> --options '<json>'
+npx cx-cli create module <name> --template <template>
+npx cx-cli create module <name> --template <template> --options '<json>'
 ```
 
 | Template | Use Case |
@@ -58,7 +52,7 @@ npx cxtms create module <name> --template <template> --options '<json>'
 ### Step 4: Validate
 
 ```bash
-npx cxtms <generated-file.yaml>
+npx cx-cli <generated-file.yaml>
 ```
 
 ---
@@ -70,7 +64,7 @@ Customize generated modules at scaffold time with `--options`. Accepts inline JS
 ### Field Array Format (all templates)
 
 ```bash
-npx cxtms create module "Tariff" --template grid --options '[
+npx cx-cli create module "Tariff" --template grid --options '[
   {"name": "code", "type": "text", "label": "Tariff Code", "required": true},
   {"name": "rate", "type": "number", "label": "Rate %"},
   {"name": "effectiveDate", "type": "date"},
@@ -81,7 +75,7 @@ npx cxtms create module "Tariff" --template grid --options '[
 ### Object Format (with entityName)
 
 ```bash
-npx cxtms create module "Country" --template select --options '{
+npx cx-cli create module "Country" --template select --options '{
   "entityName": "Country",
   "fields": [
     {"name": "countryCode", "type": "text", "label": "Country Code"},
@@ -113,18 +107,13 @@ npx cxtms create module "Country" --template select --options '{
 
 ## Extract Command
 
-Move or copy a component (and its routes) from one module into another. Useful for splitting large modules or sharing components.
+Move a component (and its routes) from one module into another. Useful for splitting large modules into smaller, focused ones.
 
 ```bash
-cxtms extract <source-file> <component-name> --to <target-file>
-cxtms extract <source-file> <component-name> --to <target-file> --copy
+cx-cli extract <source-file> <component-name> --to <target-file>
 ```
 
-### Flags
-- `--to <file>` — target module file (required)
-- `--copy` — copy instead of move (source keeps the component, target gets a higher-priority copy)
-
-### What Gets Moved/Copied
+### What Gets Moved
 - The component matching the exact `name` field
 - Any routes whose `component` field matches the component name
 - Permissions and entities are **NOT** moved
@@ -132,14 +121,11 @@ cxtms extract <source-file> <component-name> --to <target-file> --copy
 ### Examples
 
 ```bash
-# Move a component to a new file (creates module scaffold automatically)
-npx cxtms extract modules/orders.yaml Orders/CreateItem --to modules/order-create.yaml
-
-# Copy a component (source unchanged, target gets higher priority)
-npx cxtms extract modules/orders.yaml Orders/CreateItem --to modules/order-create.yaml --copy
+# Extract to a new file (creates module scaffold automatically)
+npx cx-cli extract modules/orders.yaml Orders/CreateItem --to modules/order-create.yaml
 
 # Extract to an existing module
-npx cxtms extract modules/main.yaml Dashboard --to modules/dashboard.yaml
+npx cx-cli extract modules/main.yaml Dashboard --to modules/dashboard.yaml
 ```
 
 ### New Target Scaffold
@@ -152,7 +138,7 @@ When the target file doesn't exist, a new module is created with:
 ### Workflow
 1. Run `extract` to move the component
 2. Manually move any related permissions/entities if needed
-3. Validate both files: `npx cxtms <source>` and `npx cxtms <target>`
+3. Validate both files: `npx cx-cli <source>` and `npx cx-cli <target>`
 
 ---
 
@@ -212,7 +198,7 @@ module:
   description:
     en-US: "Module description"
   application: "CargoXplorer"             # Required
-  filePath: "modules/<name>-module.yaml"  # File path in repo
+  fileName: "modules/<name>-module.yaml"  # File path in repo
 
 entities:
   - name: <EntityName>
@@ -238,15 +224,6 @@ permissions:
     displayName: { en-US: "..." }
     roles: ["Admin", "Manager"]
 
-configurations:                              # Optional: org-level config definitions
-  - configName: "apps.myFeature"             # Unique config key
-    displayName: { en-US: "My Feature Settings" }
-    description: { en-US: "Configure my feature" }
-    component: "ModuleName/ConfigComponent"  # Component that renders the config UI
-    defaultValue:                            # Optional default values
-      enabled: true
-      limit: 100
-
 routes:
   - name: "routeName"
     path: "/module-path"                   # Supports :params
@@ -407,61 +384,9 @@ Reusable select components (e.g., `Countries/Select`, `Ports/Select`) follow thi
 
 ---
 
-## Server Module Commands
-
-Deploy, undeploy, and release commands are listed in the CLI section at the top of this file. For authentication setup (login, PAT tokens, org management): see [cx-core/ref-cli-auth.md](.claude/skills/cx-core/ref-cli-auth.md)
-
-### Releasing App to GitHub
-
-Use `app release` to release modified modules and workflows from the CX server to a GitHub repository. This creates a branch and pull request — it does NOT push directly to the target branch.
-
-```bash
-# Release all unpublished changes to GitHub (creates a PR) — message is required
-npx cxtms app release -m "Add warehouse locations module"
-
-# Release specific modules and/or workflows by YAML file
-npx cxtms app release -m "Fix country module" modules/my-module.yaml
-npx cxtms app release -m "Update billing" modules/a.yaml workflows/b.yaml
-
-# Force release all modules and workflows (not just unpublished ones)
-npx cxtms app release -m "Full republish" --force
-
-# Release with explicit org
-npx cxtms app release -m "Add warehouse locations module" --org 42
-```
-
-**What `app release` does:**
-1. Reads `app.yaml` for the `id` (appManifestId), repository, and branch
-2. Increments the app version (patch bump)
-3. Creates a `publish/{app-name}-v{version}-{timestamp}` branch on GitHub
-4. Commits `app.yaml` + selected module/workflow YAML files to the branch
-5. Creates a pull request from the publish branch to the target branch
-6. Marks published modules and workflows as `hasUnpublishedChanges: false`
-
-**This is a release-to-git operation** — it commits the current server-side YAML directly to GitHub via the API. No local git repo is involved. The modules and workflows being released are taken from the CX server database, not from local files. The YAML file arguments only identify *which* items to include by their IDs.
-
-**Important:** Modules and workflows must be deployed to the TMS server before they can be released. Use `cxtms appmodule deploy` or `cxtms workflow deploy` first, then `cxtms app release` to commit them to GitHub.
-
-**Do NOT run `app release` automatically.** Only release when the user explicitly requests it. Releasing creates a branch and PR on GitHub, so it should be done once when all changes are ready — not after every deploy.
-
-**Prerequisites:**
-- `app.yaml` must exist with a valid `id` field
-- The app manifest must be installed on the server (`app install` first)
-- The server must have a GitHub token configured for the organization
-- The repository and branch must be set on the app manifest
-
-**Related commands:**
-- `npx cxtms app install` — install/refresh app from GitHub into the server
-- `npx cxtms app install --force` — force reinstall even if same version
-- `npx cxtms app install --branch develop` — install from a specific branch
-- `npx cxtms app install --skip-changed` — skip modules with local changes
-- `npx cxtms app list` — list installed app manifests on the server
-
----
-
 # Generation Rules
 
-1. **Always scaffold via `cxtms create module` first** — never write YAML from scratch, never copy templates manually
+1. **Always scaffold via `cx-cli create module` first** — never write YAML from scratch, never copy templates manually
 2. **Use localized strings** `{ en-US: "..." }` for all user-visible text
 3. **Follow naming conventions**:
    - Module names: PascalCase (e.g., `WarehouseLocations`)
@@ -469,9 +394,9 @@ npx cxtms app release -m "Add warehouse locations module" --org 42
    - Route paths: kebab-case (e.g., `/warehouse-locations`)
    - Permission names: PascalCase with slashes (e.g., `WarehouseLocations/Read`, `System/Contacts/Update`)
 4. **Template expressions** use `{{ expression }}` syntax (double curly braces)
-5. **Include filePath** property pointing to the YAML file location
+5. **Include fileName** property pointing to the YAML file location
 6. **Set proper entityKind** when defining entities (Order, Contact, OrderEntity, AccountingTransaction, Calendar, CalendarEvent, Other)
 7. **DataGrid options** requires ALL properties: query, rootEntityName, entityKeys, navigationType, enableDynamicGrid, enableViews, enableSearch, enablePagination, enableColumns, enableFilter, defaultView, onRowClick
 8. **Form component** requires `validationSchema` in props
-9. **Do not change `appModuleId` or `filePath`** — set correctly by CLI scaffold
-10. **Always validate** the final YAML: `npx cxtms <file.yaml>`
+9. **Do not change `appModuleId` or `fileName`** — set correctly by CLI scaffold
+10. **Always validate** the final YAML: `npx cx-cli <file.yaml>`

package/.claude/skills/cx-module/ref-components-data.md

@@ -1,12 +1,5 @@
 # Data & Collection Components
 
-## Contents
-- Collection component
-- List component
-- ListItem component
-- Datasource component
-- Script component
-
 ## collection
 
 Iterates over data items and renders children as templates. Supports drag-and-drop reordering.