Merge pull request #1022 from objectstack-ai/copilot/remove-duplicate-merge-logic

Author: hotlong

ROADMAP.md

@@ -1166,7 +1166,7 @@ The `FlowDesigner` is a canvas-based flow editor that bridges the gap between th
 
 ### P2.6 Plugin Modularization & Dynamic Management
 
-> **Status:** Phase 1 complete — Plugin class standard, install/uninstall API, example plugin classes.
+> **Status:** Phase 1 complete — Plugin class standard, install/uninstall API, example plugin classes. Phase 1.5 complete — composeStacks, plugin isolation, duplicate merge removal.
 
 Plugin architecture refactoring to support true modular development, plugin isolation, and dynamic plugin install/uninstall at runtime.
 
@@ -1181,15 +1181,26 @@ Plugin architecture refactoring to support true modular development, plugin isol
 - [x] Refactor root `objectstack.config.ts` to use plugin-based config collection via `getConfig()`
 - [x] Unit tests for `install()` / `uninstall()` (5 new tests, 18 total in PluginSystem)
 
+**Phase 1.5 — Plugin Isolation & Config Composition ✅**
+- [x] Add explicit `objectName` to all example plugin actions (CRM: 28 actions, Todo: 6 actions, Kitchen Sink: 3 actions)
+- [x] Rename Kitchen Sink `account` → `ks_account` to eliminate same-name object conflicts across plugins
+- [x] Create `composeStacks()` utility in `@object-ui/core` — declarative stack merging with `objectConflict` option, automatic views→objects and actions→objects mapping
+- [x] Remove duplicate `mergeActionsIntoObjects()` from root config and console shared config
+- [x] Remove duplicate `mergeViewsIntoObjects()` from root config and console shared config (moved into `composeStacks`)
+- [x] Refactor root `objectstack.config.ts` and `apps/console/objectstack.shared.ts` to use `composeStacks()`
+- [x] Unit tests for `composeStacks()` (13 tests covering merging, dedup, views, actions, cross-stack)
+
 **Phase 2 — Dynamic Plugin Loading (Planned)**
 - [ ] Hot-reload / lazy loading of plugins for development
 - [ ] Runtime plugin discovery and loading from registry
 - [ ] Plugin dependency graph visualization in Console
 
 **Phase 3 — Plugin Identity & Isolation (Planned)**
+- [x] Eliminate same-name object conflicts across plugins (Kitchen Sink `account` → `ks_account`)
 - [ ] Preserve origin plugin metadata on objects, actions, dashboards for runtime inspection
 - [ ] Per-plugin i18n namespace support
 - [ ] Per-plugin permissions and data isolation
+- [ ] Move `mergeViewsIntoObjects` from `composeStacks` to runtime/provider layer
 
 **Phase 4 — Cross-Repo Plugin Ecosystem (Planned)**
 - [ ] Plugin marketplace / registry for third-party plugins
@@ -1227,7 +1238,7 @@ Plugin architecture refactoring to support true modular development, plugin isol
 - [x] **P1: Chart Widget Server-Side Aggregation** — Fixed chart widgets (bar/line/area/pie/donut/scatter) downloading all raw data and aggregating client-side. Added optional `aggregate()` method to `DataSource` interface (`AggregateParams`, `AggregateResult` types) enabling server-side grouping/aggregation via analytics API (e.g. `GET /api/v1/analytics/{resource}?category=…&metric=…&agg=…`). `ObjectChart` now prefers `dataSource.aggregate()` when available, falling back to `dataSource.find()` + client-side aggregation for backward compatibility. Implemented `aggregate()` in `ValueDataSource` (in-memory), `ApiDataSource` (HTTP), and `ObjectStackAdapter` (analytics API with client-side fallback). Only detail widgets (grid/table/list) continue to fetch full data. 9 new tests.
 - [x] **P1: Spec-Aligned CRM I18n** — Fixed CRM internationalization not taking effect on the console. Root cause: CRM metadata used plain string labels instead of spec-aligned `I18nLabel` objects. Fix: (1) Updated CRM app/dashboard/navigation metadata to use `I18nLabel` objects (`{ key, defaultValue }`) per spec. (2) Updated `NavigationItem` and `NavigationArea` types to support I18nLabel. (3) Added `resolveLabel()` helper in NavigationRenderer. (4) Updated `resolveI18nLabel()` to accept `t()` function for translation. (5) Added `loadLanguage` callback in I18nProvider for API-based translation loading. (6) Added `/api/v1/i18n/:lang` endpoint to mock server. Console contains zero CRM-specific code.
 - [x] **P0: Opportunity List View & ObjectDef Column Enrichment** — Fixed ObjectGrid not using objectDef field metadata for type-aware rendering when columns are `string[]` or `ListColumn[]` without full options. (1) Schema resolution always fetches full schema from DataSource for field type metadata. (2) String[] column path enriched with objectDef types, options (with colors), currency, precision for proper CurrencyCellRenderer, SelectCellRenderer (colored badges), PercentCellRenderer, DateCellRenderer. (3) ListColumn[] fieldMeta deep-merged with objectDef field properties (select options with colors, currency code, precision). (4) Opportunity view columns upgraded from bare `string[]` to `ListColumn[]` with explicit types, alignment, and summary aggregation. 9 new tests.
-- [x] **P1: Actions Merge into Object Definitions** — Fixed action buttons never showing in Console/Studio because example object definitions lacked `actions` field. Added `mergeActionsIntoObjects()` helper (mirrors existing `mergeViewsIntoObjects` pattern) to root config and console shared config. Uses longest-prefix name matching with explicit `objectName` fallback. Created todo task actions (6: complete, start, clone, defer, set_reminder, assign) and kitchen-sink showcase actions (3: change_status, assign_owner, archive). All CRM/Todo/Kitchen Sink objects now serve `actions` in metadata. Fixes #840.
+- [x] **P1: Actions Merge into Object Definitions** — Fixed action buttons never showing in Console/Studio because example object definitions lacked `actions` field. Initially added `mergeActionsIntoObjects()` helper with longest-prefix name matching. Later refactored: all actions now declare explicit `objectName`, and merging is handled by `composeStacks()` in `@object-ui/core`. Created todo task actions (6: complete, start, clone, defer, set_reminder, assign) and kitchen-sink showcase actions (3: change_status, assign_owner, archive). All CRM/Todo/Kitchen Sink objects now serve `actions` in metadata. Fixes #840.
 - [x] **P1: Unified Debug/Metadata Entry — Remove Redundant Metadata Button** — Removed the visible `<MetadataToggle>` button from RecordDetailView, DashboardView, PageView, and ReportView headers. End users no longer see a "</> Metadata" button that had no practical purpose. The MetadataInspector panel is now only accessible via `?__debug` URL parameter (auto-opens when debug mode is active). ObjectView retains its admin-only Design Tools menu entry for metadata inspection. This unifies the debug entry point and improves end-user UX by removing redundant UI elements.
 
 ### Ecosystem & Marketplace

apps/console/objectstack.shared.ts

@@ -1,5 +1,6 @@
 import { defineStack } from '@objectstack/spec';
 import type { ObjectStackDefinition } from '@objectstack/spec';
+import { composeStacks } from '@object-ui/core';
 import crmConfigImport from '@object-ui/example-crm/objectstack.config';
 import todoConfigImport from '@object-ui/example-todo/objectstack.config';
 import kitchenSinkConfigImport from '@object-ui/example-kitchen-sink/objectstack.config';
@@ -36,84 +37,13 @@ if (crmApps.length > 0) {
     }
 }
 
-// ---------------------------------------------------------------------------
-// Merge stack-level views into object definitions.
-// The @objectstack/spec defines views at the stack level (views[].listViews),
-// but the runtime protocol serves objects without listViews. This helper
-// merges listViews from the views array into the corresponding objects so
-// the console can render the correct view type when switching views.
-// ---------------------------------------------------------------------------
-function mergeViewsIntoObjects(objects: any[], configs: any[]): any[] {
-  // Collect all listViews grouped by object name
-  const viewsByObject: Record<string, Record<string, any>> = {};
-  for (const config of configs) {
-    if (!Array.isArray(config.views)) continue;
-    for (const view of config.views) {
-      if (!view.listViews) continue;
-      for (const [viewName, listView] of Object.entries(view.listViews as Record<string, any>)) {
-        const objectName = listView?.data?.object;
-        if (!objectName) continue;
-        if (!viewsByObject[objectName]) viewsByObject[objectName] = {};
-        viewsByObject[objectName][viewName] = listView;
-      }
-    }
-  }
-
-  // Merge into objects
-  return objects.map((obj: any) => {
-    const views = viewsByObject[obj.name];
-    if (!views) return obj;
-    return { ...obj, listViews: { ...(obj.listViews || {}), ...views } };
-  });
-}
-
-// ---------------------------------------------------------------------------
-// Merge stack-level actions into object definitions.
-// Actions declared at the stack level (actions[]) need to be merged into
-// individual object definitions so the runtime protocol (and Console/Studio)
-// can render action buttons directly from objectDef.actions.
-// Matching uses explicit objectName on the action, or longest object-name
-// prefix of the action name (e.g. "account_send_email" → "account").
-// ---------------------------------------------------------------------------
-function mergeActionsIntoObjects(objects: any[], configs: any[]): any[] {
-  const allActions: any[] = [];
-  for (const config of configs) {
-    if (Array.isArray(config.actions)) {
-      allActions.push(...config.actions);
-    }
-  }
-  if (allActions.length === 0) return objects;
-
-  // Sort object names longest-first so "order_item" matches before "order"
-  const objectNames = objects.map((o: any) => o.name as string)
-    .filter(Boolean)
-    .sort((a, b) => b.length - a.length);
-
-  const actionsByObject: Record<string, any[]> = {};
-  for (const action of allActions) {
-    let target: string | undefined = action.objectName;
-    if (!target) {
-      for (const name of objectNames) {
-        if (action.name.startsWith(name + '_')) {
-          target = name;
-          break;
-        }
-      }
-    }
-    if (target) {
-      if (!actionsByObject[target]) actionsByObject[target] = [];
-      actionsByObject[target].push(action);
-    }
-  }
-
-  return objects.map((obj: any) => {
-    const actions = actionsByObject[obj.name];
-    if (!actions) return obj;
-    return { ...obj, actions: [...(obj.actions || []), ...actions] };
-  });
-}
-
-const allConfigs = [crmConfig, todoConfig, kitchenSinkConfig];
+// Compose all example stacks into a single merged definition.
+// composeStacks handles object deduplication (override), views→objects mapping,
+// and actions→objects assignment via objectName.
+const composed = composeStacks(
+  [crmConfig, todoConfig, kitchenSinkConfig] as Record<string, any>[],
+  { objectConflict: 'override' },
+);
 
 export const sharedConfig = {
   // ============================================================================
@@ -125,29 +55,15 @@ export const sharedConfig = {
   description: 'ObjectStack Console',
 
   // ============================================================================
-  // Merged Stack Configuration (CRM + Todo + Kitchen Sink + Mock Metadata)
+  // Merged Stack Configuration (CRM + Todo + Kitchen Sink)
   // ============================================================================
-  objects: mergeActionsIntoObjects(
-    mergeViewsIntoObjects(
-      [
-        ...(crmConfig.objects || []),
-        ...(todoConfig.objects || []),
-        ...(kitchenSinkConfig.objects || []),
-      ],
-      allConfigs,
-    ),
-    allConfigs,
-  ),
+  objects: composed.objects,
   apps: [
     ...crmApps,
     ...(todoConfig.apps || []),
     ...(kitchenSinkConfig.apps || []),
   ],
-  dashboards: [
-    ...(crmConfig.dashboards || []),
-    ...(todoConfig.dashboards || []),
-    ...(kitchenSinkConfig.dashboards || [])
-  ],
+  dashboards: composed.dashboards,
   reports: [
     ...(crmConfig.reports || []),
     // Manually added report since CRM config validation prevents it
@@ -165,21 +81,13 @@ export const sharedConfig = {
       ]
     }
   ],
-  pages: [
-    ...(crmConfig.pages || []),
-    ...(todoConfig.pages || []),
-    ...(kitchenSinkConfig.pages || [])
-  ],
+  pages: composed.pages,
   manifest: {
     id: 'com.objectui.console',
     version: '0.1.0',
     type: 'app',
     name: '@object-ui/console',
-    data: [
-      ...(crmConfig.manifest?.data || []),
-      ...(todoConfig.manifest?.data || []),
-      ...(kitchenSinkConfig.manifest?.data || [])
-    ]
+    data: composed.manifest.data,
   },
   plugins: [],
   datasources: [
@@ -191,14 +99,17 @@ export const sharedConfig = {
   ]
 };
 
+const allConfigs = [crmConfig, todoConfig, kitchenSinkConfig];
+
 // defineStack() validates the config but strips non-standard properties like
-// listViews and actions from objects. Re-merge after validation so the runtime
-// protocol serves objects with their view and action definitions.
+// listViews and actions from objects. A second composeStacks pass restores
+// these runtime properties onto the validated objects. This double-pass is
+// necessary because defineStack's Zod schema doesn't preserve custom fields.
 const validated = defineStack(sharedConfig as Parameters<typeof defineStack>[0]);
 export default {
   ...validated,
-  objects: mergeActionsIntoObjects(
-    mergeViewsIntoObjects(validated.objects || [], allConfigs),
-    allConfigs,
-  ),
+  objects: composeStacks([
+    { objects: validated.objects || [] },
+    ...allConfigs.map((cfg: any) => ({ views: cfg.views || [], actions: cfg.actions || [] })),
+  ]).objects,
 };

examples/crm/src/actions/account.actions.ts

@@ -5,6 +5,7 @@ export const AccountActions = [
     icon: 'mail',
     type: 'api' as const,
     target: 'account_send_email',
+    objectName: 'account',
     locations: ['record_header' as const, 'list_item' as const],
     params: [
       { name: 'to', label: 'To Email', type: 'email' as const, required: true },
@@ -19,6 +20,7 @@ export const AccountActions = [
     icon: 'user-plus',
     type: 'api' as const,
     target: 'account_assign_owner',
+    objectName: 'account',
     locations: ['record_header' as const, 'list_item' as const, 'list_toolbar' as const],
     bulkEnabled: true,
     params: [
@@ -33,6 +35,7 @@ export const AccountActions = [
     icon: 'git-merge',
     type: 'api' as const,
     target: 'account_merge',
+    objectName: 'account',
     locations: ['record_more' as const],
     confirmText: 'Are you sure you want to merge these accounts? This action cannot be undone.',
     variant: 'danger' as const,

examples/crm/src/actions/contact.actions.ts

@@ -5,6 +5,7 @@ export const ContactActions = [
     icon: 'mail',
     type: 'api' as const,
     target: 'contact_send_email',
+    objectName: 'contact',
     locations: ['record_header' as const, 'list_item' as const, 'list_toolbar' as const],
     bulkEnabled: true,
     params: [
@@ -19,6 +20,7 @@ export const ContactActions = [
     icon: 'user-check',
     type: 'api' as const,
     target: 'contact_convert_to_customer',
+    objectName: 'contact',
     locations: ['record_header' as const],
     visible: "type !== 'Customer'",
     confirmText: 'Convert this contact to a customer?',
@@ -31,6 +33,7 @@ export const ContactActions = [
     icon: 'phone',
     type: 'api' as const,
     target: 'contact_log_call',
+    objectName: 'contact',
     locations: ['record_header' as const, 'list_item' as const],
     params: [
       { name: 'call_subject', label: 'Subject', type: 'text' as const, required: true },

examples/crm/src/actions/event.actions.ts

@@ -5,6 +5,7 @@ export const EventActions = [
     icon: 'send',
     type: 'api' as const,
     target: 'event_send_invitation',
+    objectName: 'event',
     locations: ['record_header' as const],
     params: [
       { name: 'message', label: 'Optional Message', type: 'textarea' as const },
@@ -17,6 +18,7 @@ export const EventActions = [
     icon: 'check-circle',
     type: 'api' as const,
     target: 'event_mark_completed',
+    objectName: 'event',
     locations: ['record_header' as const],
     confirmText: 'Mark this event as completed?',
     refreshAfter: true,
@@ -28,6 +30,7 @@ export const EventActions = [
     icon: 'x-circle',
     type: 'api' as const,
     target: 'event_cancel',
+    objectName: 'event',
     locations: ['record_more' as const],
     variant: 'danger' as const,
     params: [

examples/crm/src/actions/opportunity.actions.ts

@@ -5,6 +5,7 @@ export const OpportunityActions = [
     icon: 'arrow-right-circle',
     type: 'api' as const,
     target: 'opportunity_change_stage',
+    objectName: 'opportunity',
     locations: ['record_header' as const, 'list_item' as const, 'list_toolbar' as const],
     bulkEnabled: true,
     visible: "stage !== 'closed_won' && stage !== 'closed_lost'",
@@ -30,6 +31,7 @@ export const OpportunityActions = [
     icon: 'trophy',
     type: 'api' as const,
     target: 'opportunity_mark_won',
+    objectName: 'opportunity',
     locations: ['record_header' as const],
     variant: 'primary' as const,
     visible: "stage !== 'closed_won' && stage !== 'closed_lost'",
@@ -43,6 +45,7 @@ export const OpportunityActions = [
     icon: 'x-circle',
     type: 'api' as const,
     target: 'opportunity_mark_lost',
+    objectName: 'opportunity',
     locations: ['record_more' as const],
     variant: 'danger' as const,
     visible: "stage !== 'closed_won' && stage !== 'closed_lost'",

examples/crm/src/actions/opportunity_contact.actions.ts

@@ -5,6 +5,7 @@ export const OpportunityContactActions = [
     icon: 'star',
     type: 'api' as const,
     target: 'opportunity_contact_set_primary',
+    objectName: 'opportunity_contact',
     locations: ['record_header' as const, 'list_item' as const],
     refreshAfter: true,
     successMessage: 'Primary contact updated',

examples/crm/src/actions/order.actions.ts

@@ -5,6 +5,7 @@ export const OrderActions = [
     icon: 'refresh-cw',
     type: 'api' as const,
     target: 'order_change_status',
+    objectName: 'order',
     locations: ['record_header' as const, 'list_item' as const],
     params: [
       {
@@ -28,6 +29,7 @@ export const OrderActions = [
     icon: 'file-text',
     type: 'api' as const,
     target: 'order_generate_invoice',
+    objectName: 'order',
     locations: ['record_header' as const],
     confirmText: 'Generate an invoice for this order?',
     successMessage: 'Invoice generated successfully',
@@ -38,6 +40,7 @@ export const OrderActions = [
     icon: 'truck',
     type: 'api' as const,
     target: 'order_mark_shipped',
+    objectName: 'order',
     locations: ['record_header' as const],
     params: [
       { name: 'tracking_number', label: 'Tracking Number', type: 'text' as const, required: true },

examples/crm/src/actions/order_item.actions.ts

@@ -5,6 +5,7 @@ export const OrderItemActions = [
     icon: 'hash',
     type: 'api' as const,
     target: 'order_item_adjust_quantity',
+    objectName: 'order_item',
     locations: ['record_header' as const, 'list_item' as const],
     params: [
       { name: 'new_quantity', label: 'New Quantity', type: 'number' as const, required: true },

examples/crm/src/actions/product.actions.ts

@@ -5,6 +5,7 @@ export const ProductActions = [
     icon: 'toggle-left',
     type: 'api' as const,
     target: 'product_toggle_active',
+    objectName: 'product',
     locations: ['record_header' as const, 'list_item' as const],
     refreshAfter: true,
     successMessage: 'Product status updated',
@@ -15,6 +16,7 @@ export const ProductActions = [
     icon: 'dollar-sign',
     type: 'api' as const,
     target: 'product_update_price',
+    objectName: 'product',
     locations: ['record_header' as const],
     params: [
       { name: 'new_price', label: 'New Price', type: 'currency' as const, required: true },