Add JSON schema for ObjectOwnershipEnum with enum values 'own' and 'extend'

Author: hotlong

PLANNING.md

@@ -1,7 +1,7 @@
 # ObjectStack Project Master Plan & Status Report
 
-**Date:** 2026-02-05
-**Version:** 1.0.0
+**Date:** 2026-02-07
+**Version:** 1.1.0
 
 ## 1. Project Master Scheme (项目总体方案)
 
@@ -58,7 +58,14 @@ ObjectStack is designed as a **metadata-driven, post-SaaS operating system**. It
 
 ## 3. Next Development Roadmap (下一步开发计划)
 
-The immediate focus shifts from **Architecture/Kernel** stability to **Feature/Persistence** implementation.
+The focus shifts from **Architecture/Kernel** stability to **Namespace Isolation** and **Feature/Persistence** implementation.
+
+### Phase 0: Namespace & Ownership Model (Current Week) ← ACTIVE
+**Objective:** Enable multi-vendor object isolation and extension.
+1.  **Spec Schemas** ✅: `namespace` in manifest, `ObjectOwnershipEnum`, `ObjectExtensionSchema`.
+2.  **Registry Rewrite** 🔄: FQN computation, contributor tracking, priority-based merge.
+3.  **Engine Update**: Pass namespace/ownership through registration flow.
+4.  **Testing**: Comprehensive ownership scenario tests.
 
 ### Phase 1: Persistence Strategy (Week 1-2)
 **Objective:** Move beyond in-memory data to persistent storage.
@@ -94,7 +101,130 @@ The immediate focus shifts from **Architecture/Kernel** stability to **Feature/P
 
 ---
 
-## 4. Immediate Action Items (Today/Tomorrow)
+## 4. **ACTIVE: Namespace & Object Ownership Model** (当前进行中)
+
+**Date Started:** 2026-02-07
+**Status:** 🔄 In Progress
+**Branch:** `feature/namespace-ownership`
+
+### 4.1 Problem Statement
+
+Multi-vendor packages from different vendors will inevitably define objects with the same short name (e.g., both `app-todo` and `app-crm` define `task`). The current flat registry causes silent overwrites. Object names are also tied to database table names, requiring a namespace isolation mechanism.
+
+### 4.2 Agreed Solution (Salesforce-style Namespace Model)
+
+#### 4.2.1 Namespace Rules
+
+| Property | Rule |
+|----------|------|
+| **Format** | `^[a-z][a-z0-9_]{1,19}$` (2-20 chars) |
+| **Uniqueness** | Instance-unique (validated at boot) |
+| **Reserved** | `base`, `system` — no FQN prefix applied |
+| **FQN Formula** | `{namespace}__{short_name}` (double underscore) |
+| **Example** | namespace `crm` + object `account` → FQN `crm__account` |
+
+#### 4.2.2 Ownership Model
+
+| Mode | Description |
+|------|-------------|
+| **`own`** | This package is the original author. Only ONE owner per FQN. Defines base schema (table name, primary key, core fields). |
+| **`extend`** | This package adds fields/config to an existing object. Multiple extenders allowed. Fields merged additively. |
+
+#### 4.2.3 Merge Strategy
+
+1. Owner defines the base object.
+2. Extenders sorted by `priority` (lower first, higher wins on conflict).
+3. Fields: additive merge. Same-name field → higher priority wins.
+4. Non-field props (`label`, `description`): last writer by priority wins.
+
+### 4.3 Implementation Checklist
+
+| # | Task | Status | File(s) |
+|---|------|--------|---------|
+| 1 | Add `namespace` to ManifestSchema | ✅ Done | `spec/src/kernel/manifest.zod.ts` |
+| 2 | Add `ObjectOwnershipEnum`, `ObjectExtensionSchema` | ✅ Done | `spec/src/data/object.zod.ts` |
+| 3 | Add `objectExtensions` to StackDefinitionSchema | ✅ Done | `spec/src/stack.zod.ts` |
+| 4 | **Rewrite SchemaRegistry with ownership model** | 🔄 In Progress | `objectql/src/registry.ts` |
+| 5 | Update Engine to pass namespace/ownership | ⬜ Pending | `objectql/src/engine.ts` |
+| 6 | Update Broker shim | ⬜ Pending | `console/src/mocks/createKernel.ts` |
+| 7 | Add `namespace` to example apps | ⬜ Pending | `app-todo/objectstack.config.ts`, `app-crm/objectstack.config.ts` |
+| 8 | Write comprehensive registry tests | ⬜ Pending | `objectql/src/registry.test.ts` |
+| 9 | Update engine tests | ⬜ Pending | `objectql/src/engine.test.ts` |
+| 10 | Build and verify all packages | ⬜ Pending | — |
+
+### 4.4 Key Data Structures (Registry Rewrite)
+
+```typescript
+// Reserved namespaces (no FQN prefix)
+const RESERVED_NAMESPACES = new Set(['base', 'system']);
+
+// Contributor record
+interface ObjectContributor {
+  packageId: string;
+  namespace: string;
+  ownership: 'own' | 'extend';
+  priority: number;  // 100 = owner default, 200+ = extender
+  definition: ServiceObject;
+}
+
+// Primary storage: FQN → Contributor[]
+objectContributors: Map<string, ObjectContributor[]>;
+
+// Merge cache: FQN → merged ServiceObject
+mergedObjectCache: Map<string, ServiceObject>;
+
+// Namespace uniqueness: namespace → packageId
+namespaceRegistry: Map<string, string>;
+```
+
+### 4.5 API Changes
+
+```typescript
+// Before
+SchemaRegistry.registerObject(schema, packageId?)
+
+// After
+SchemaRegistry.registerObject(schema, packageId, namespace, ownership, priority)
+SchemaRegistry.resolveObject(fqn)        // Returns merged object
+SchemaRegistry.getAllObjects(packageId?) // Returns merged objects
+SchemaRegistry.getObjectContributors(fqn) // Returns all contributors
+```
+
+---
+
+## 5. Immediate Action Items (Today/Tomorrow)
+
+1.  **Complete Registry Rewrite** — Implement FQN computation, contributor tracking, merge engine.
+2.  **Update Engine** — Extract namespace from manifest, handle `objectExtensions` array.
+3.  **Test Extensively** — Own/extend/conflict/merge/FQN/uninstall scenarios.
+
+---
+
+## 6. Future Development Roadmap (下一步开发计划)
 
 1.  **Scaffold `packages/plugins/driver-sqlite`**.
 2.  **Extract Standard Driver Test Suite**: Ensure `packages/core/src/qa` has a reusable test suite that can be applied to new drivers immediately.
+
+---
+
+## Appendix: Design Decision Records
+
+### DDR-001: Namespace Separator (2026-02-07)
+**Decision:** Use double underscore `__` as FQN separator.
+**Rationale:** 
+- Single underscore `_` is common in field names (`created_at`).
+- Dot `.` conflicts with JavaScript property access.
+- Matches Salesforce convention for managed packages.
+
+### DDR-002: Reserved Namespaces (2026-02-07)
+**Decision:** `base` and `system` namespaces are platform-reserved (no prefix applied).
+**Rationale:**
+- Platform-defined objects like `user`, `organization` should not be prefixed.
+- These objects form the foundation that all apps depend on.
+
+### DDR-003: Ownership vs Extension (2026-02-07)
+**Decision:** Separate `own` vs `extend` declaration.
+**Rationale:**
+- Clear ownership prevents accidental table creation by extenders.
+- Extension priority enables deterministic merge order.
+- Follows Salesforce pattern of "managed object" vs "managed package extensions".

examples/app-crm/objectstack.config.ts

@@ -24,6 +24,7 @@ import {
 export default defineStack({
   manifest: {
     id: 'com.example.crm',
+    namespace: 'crm',
     version: '3.0.0',
     type: 'app',
     name: 'Enterprise CRM',

examples/app-todo/objectstack.config.ts

@@ -11,6 +11,7 @@ import * as apps from './src/apps';
 export default defineStack({
   manifest: {
     id: 'com.example.todo',
+    namespace: 'todo',
     version: '2.0.0',
     type: 'app',
     name: 'Todo Manager',

packages/objectql/src/engine.test.ts

@@ -9,7 +9,13 @@ vi.mock('./registry', () => {
   return {
     SchemaRegistry: {
       getObject: vi.fn((name) => mockObjects.get(name)),
-      registerObject: vi.fn((obj) => mockObjects.set(obj.name, obj)),
+      resolveObject: vi.fn((name) => mockObjects.get(name)),
+      registerObject: vi.fn((obj, packageId, namespace, ownership, priority) => {
+        const fqn = namespace ? `${namespace}__${obj.name}` : obj.name;
+        mockObjects.set(fqn, { ...obj, name: fqn });
+        return fqn;
+      }),
+      registerNamespace: vi.fn(),
       registerKind: vi.fn(),
       registerItem: vi.fn(),
       registerApp: vi.fn(),
@@ -19,6 +25,7 @@ vi.mock('./registry', () => {
         enabled: true,
         installedAt: new Date().toISOString(),
       })),
+      reset: vi.fn(() => mockObjects.clear()),
       metadata: {
         get: vi.fn(() => mockObjects) // Expose for verification if needed
       }
@@ -79,16 +86,58 @@ describe('ObjectQL Engine', () => {
     });
 
     describe('Metadata Registration', () => {
-        it('should register objects from app manifest', () => {
+        it('should register objects from app manifest with namespace', () => {
             const manifest = {
                 id: 'com.example.app',
+                namespace: 'example',
                 objects: [
                     { name: 'task', fields: {} }
                 ]
             };
 
             engine.registerApp(manifest);
-            expect(SchemaRegistry.registerObject).toHaveBeenCalledWith(expect.objectContaining({ name: 'task' }), 'com.example.app');
+            expect(SchemaRegistry.registerObject).toHaveBeenCalledWith(
+                expect.objectContaining({ name: 'task' }), 
+                'com.example.app',
+                'example',
+                'own'
+            );
+        });
+
+        it('should register objects without namespace (legacy)', () => {
+            const manifest = {
+                id: 'com.legacy.app',
+                objects: [
+                    { name: 'item', fields: {} }
+                ]
+            };
+            
+            engine.registerApp(manifest);
+            expect(SchemaRegistry.registerObject).toHaveBeenCalledWith(
+                expect.objectContaining({ name: 'item' }), 
+                'com.legacy.app',
+                undefined,
+                'own'
+            );
+        });
+
+        it('should register object extensions', () => {
+            const manifest = {
+                id: 'com.extender.app',
+                namespace: 'ext',
+                objectExtensions: [
+                    { extend: 'base__contact', fields: { custom_field: { type: 'text' } }, priority: 250 }
+                ]
+            };
+            
+            engine.registerApp(manifest);
+            expect(SchemaRegistry.registerObject).toHaveBeenCalledWith(
+                expect.objectContaining({ name: 'base__contact' }),
+                'com.extender.app',
+                undefined,
+                'extend',
+                250
+            );
         });
 
         it('should register kinds from app manifest', () => {

packages/objectql/src/engine.ts

@@ -150,31 +150,54 @@ export class ObjectQL implements IDataEngine {
    */
   registerApp(manifest: any) {
       const id = manifest.id || manifest.name;
-      this.logger.debug('Registering package manifest', { id });
+      const namespace = manifest.namespace as string | undefined;
+      this.logger.debug('Registering package manifest', { id, namespace });
 
       // 1. Register the Package (manifest + lifecycle state)
       SchemaRegistry.installPackage(manifest);
-      this.logger.debug('Installed Package', { id: manifest.id, name: manifest.name });
+      this.logger.debug('Installed Package', { id: manifest.id, name: manifest.name, namespace });
 
-      // 2. Register objects
+      // 2. Register owned objects
       if (manifest.objects) {
           if (Array.isArray(manifest.objects)) {
              this.logger.debug('Registering objects from manifest (Array)', { id, objectCount: manifest.objects.length });
              for (const objDef of manifest.objects) {
-                SchemaRegistry.registerObject(objDef, id);
-                this.logger.debug('Registered Object', { object: objDef.name, from: id });
+                const fqn = SchemaRegistry.registerObject(objDef, id, namespace, 'own');
+                this.logger.debug('Registered Object', { fqn, from: id });
              }
           } else {
              this.logger.debug('Registering objects from manifest (Map)', { id, objectCount: Object.keys(manifest.objects).length });
              for (const [name, objDef] of Object.entries(manifest.objects)) {
                 // Ensure name in definition matches key
                 (objDef as any).name = name;
-                SchemaRegistry.registerObject(objDef as any, id);
-                this.logger.debug('Registered Object', { object: name, from: id });
+                const fqn = SchemaRegistry.registerObject(objDef as any, id, namespace, 'own');
+                this.logger.debug('Registered Object', { fqn, from: id });
              }
           }
       }
 
+      // 2b. Register object extensions (fields added to objects owned by other packages)
+      if (Array.isArray(manifest.objectExtensions) && manifest.objectExtensions.length > 0) {
+          this.logger.debug('Registering object extensions', { id, count: manifest.objectExtensions.length });
+          for (const ext of manifest.objectExtensions) {
+              const targetFqn = ext.extend;
+              const priority = ext.priority ?? 200;
+              // Create a partial object definition for the extension
+              const extDef = {
+                  name: targetFqn, // Use the target FQN as name
+                  fields: ext.fields,
+                  label: ext.label,
+                  pluralLabel: ext.pluralLabel,
+                  description: ext.description,
+                  validations: ext.validations,
+                  indexes: ext.indexes,
+              };
+              // Register as extension (namespace is undefined since we're targeting by FQN)
+              SchemaRegistry.registerObject(extDef as any, id, undefined, 'extend', priority);
+              this.logger.debug('Registered Object Extension', { target: targetFqn, priority, from: id });
+          }
+      }
+
       // 3. Register apps (UI navigation definitions) as their own metadata type
       if (Array.isArray(manifest.apps) && manifest.apps.length > 0) {
           this.logger.debug('Registering apps from manifest', { id, count: manifest.apps.length });

packages/objectql/src/index.ts

@@ -1,5 +1,13 @@
 // Export Registry
-export { SchemaRegistry } from './registry.js';
+export { 
+  SchemaRegistry,
+  computeFQN,
+  parseFQN,
+  RESERVED_NAMESPACES,
+  DEFAULT_OWNER_PRIORITY,
+  DEFAULT_EXTENDER_PRIORITY,
+} from './registry.js';
+export type { ObjectContributor } from './registry.js';
 
 // Export Protocol Implementation
 export { ObjectStackProtocolImplementation } from './protocol.js';