Merge pull request #1200 from objectstack-ai/copilot/fix-sys-sys-object-issues

Fix doubly-prefixed FQN for ObjectOS system objects

Author: xuyushun441-sys

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+- **Doubly-prefixed FQN for `@objectstack/objectos` system objects** — The ObjectOS-layer object definitions (`SysObject`, `SysView`, `SysAgent`, `SysTool`, `SysFlow`, `SysMetadata`) were being registered with fully-qualified names like `sys__sys_object`, `sys__sys_view`, `sys__sys_metadata`, because each object hard-coded a `sys_` prefix into its `name` **and** its manifest was registered under `namespace: 'sys'`, causing `SchemaRegistry.computeFQN(namespace, name)` to apply the prefix twice. The object `name` values are now the unprefixed short form (`object`, `view`, `agent`, `tool`, `flow`, `metadata`), producing the correct FQNs (`sys__object`, `sys__view`, `sys__agent`, `sys__tool`, `sys__flow`). `SysMetadata` (which would collide with the canonical `sys__metadata` owned by `@objectstack/metadata`) is now exported separately and excluded from the auto-registered `SystemObjects` catalog to avoid ownership conflicts; consumers that need it can still import it directly. See `packages/objectos/src/objects/*.ts` and `packages/objectos/src/registry.ts`.
+
 ### Added
 - **Environment-per-database multi-tenancy (`service-tenant` v4.1)** — Refactored the multi-tenant architecture from "per-organization database" to **per-environment database** high-isolation, with a hard split between Control Plane (environment registry / addressing / credentials / RBAC) and Data Plane (one physical database per environment). See [`docs/adr/0002-environment-database-isolation.md`](docs/adr/0002-environment-database-isolation.md) for the full rationale and trade-offs.
   - **Zod protocol schemas** (`packages/spec/src/cloud/environment.zod.ts`): `EnvironmentSchema`, `EnvironmentDatabaseSchema`, `DatabaseCredentialSchema`, `EnvironmentMemberSchema`, `EnvironmentTypeSchema`, `EnvironmentStatusSchema`, `EnvironmentRoleSchema`, `DatabaseCredentialStatusSchema`, `ProvisionEnvironmentRequest/ResponseSchema`, `ProvisionOrganizationRequest/ResponseSchema`. `TenantDatabaseSchema` is now marked `@deprecated`.

packages/metadata/src/plugin.ts

@@ -82,8 +82,8 @@ export class MetadataPlugin implements Plugin {
             });
 
             ctx.logger.info('Registered system metadata objects', {
-                metadata: ['sys_metadata', 'sys_metadata_history'],
-                objectos: Object.keys(SystemObjects),
+                metadata: ['sys__metadata', 'sys__metadata_history'],
+                objectos: Object.keys(SystemObjects).map((name) => `sys__${name}`),
             });
         } catch {
             // ObjectQL not loaded yet — objects will be discovered via legacy fallback

packages/objectos/README.md

@@ -61,7 +61,7 @@ await metadataService.registerSystemObjects(SystemObjects);
 
 // Or register individual objects
 import { SysObject } from '@objectstack/objectos/objects';
-await metadataService.register('object', 'sys_object', SysObject);
+await metadataService.register('object', 'object', SysObject);
 ```
 
 ## Design Philosophy

packages/objectos/src/objects/sys-agent.object.ts

@@ -6,9 +6,12 @@ import { ObjectSchema, Field } from '@objectstack/spec/data';
  * sys_agent Object Definition
  *
  * Represents AI agent metadata as queryable data.
+ *
+ * Registered under namespace `sys`, so the fully qualified name (FQN) is
+ * `sys__agent` (produced by `SchemaRegistry.computeFQN(namespace, name)`).
  */
 export const SysAgent = ObjectSchema.create({
-  name: 'sys_agent',
+  name: 'agent',
   namespace: 'sys',
   label: 'AI Agent',
   pluralLabel: 'AI Agents',

packages/objectos/src/objects/sys-flow.object.ts

@@ -6,9 +6,12 @@ import { ObjectSchema, Field } from '@objectstack/spec/data';
  * sys_flow Object Definition
  *
  * Represents flow metadata as queryable data.
+ *
+ * Registered under namespace `sys`, so the fully qualified name (FQN) is
+ * `sys__flow` (produced by `SchemaRegistry.computeFQN(namespace, name)`).
  */
 export const SysFlow = ObjectSchema.create({
-  name: 'sys_flow',
+  name: 'flow',
   namespace: 'sys',
   label: 'Flow',
   pluralLabel: 'Flows',

packages/objectos/src/objects/sys-metadata.object.test.ts

@@ -5,7 +5,7 @@ import { SysMetadata } from './sys-metadata.object';
 
 describe('SysMetadata Object', () => {
   it('should have correct object name', () => {
-    expect(SysMetadata.name).toBe('sys_metadata');
+    expect(SysMetadata.name).toBe('metadata');
   });
 
   it('should have sys namespace', () => {

packages/objectos/src/objects/sys-metadata.object.ts

@@ -6,10 +6,18 @@ import { ObjectSchema, Field } from '@objectstack/spec/data';
  * sys_metadata Object Definition
  *
  * Generic metadata envelope for ALL metadata types.
- * This is the source of truth for package management, version control, and deployment.
+ *
+ * ⚠️ NOTE: The canonical `sys__metadata` object used by the runtime is owned
+ * by `@objectstack/metadata` (see `packages/metadata/src/objects/sys-metadata.object.ts`).
+ * This richer schema is preserved here as a reference/design artifact for the
+ * ObjectOS layer but is **not** auto-registered by `SystemObjects` — registering
+ * it would cause an ownership conflict on the FQN `sys__metadata`.
+ *
+ * If you need to consume it directly, import the exported constant; do not
+ * register it alongside `@objectstack/metadata` without coordinating ownership.
  */
 export const SysMetadata = ObjectSchema.create({
-  name: 'sys_metadata',
+  name: 'metadata',
   namespace: 'sys',
   label: 'Metadata Record',
   pluralLabel: 'Metadata Records',

packages/objectos/src/objects/sys-object.object.ts

@@ -7,9 +7,12 @@ import { ObjectSchema, Field } from '@objectstack/spec/data';
  *
  * Represents object metadata as queryable data.
  * Allows Studio to browse/filter/search object definitions using the Object Protocol.
+ *
+ * Registered under namespace `sys`, so the fully qualified name (FQN) is
+ * `sys__object` (produced by `SchemaRegistry.computeFQN(namespace, name)`).
  */
 export const SysObject = ObjectSchema.create({
-  name: 'sys_object',
+  name: 'object',
   namespace: 'sys',
   label: 'Object Definition',
   pluralLabel: 'Object Definitions',

packages/objectos/src/objects/sys-tool.object.ts

@@ -6,9 +6,12 @@ import { ObjectSchema, Field } from '@objectstack/spec/data';
  * sys_tool Object Definition
  *
  * Represents AI tool metadata as queryable data.
+ *
+ * Registered under namespace `sys`, so the fully qualified name (FQN) is
+ * `sys__tool` (produced by `SchemaRegistry.computeFQN(namespace, name)`).
  */
 export const SysTool = ObjectSchema.create({
-  name: 'sys_tool',
+  name: 'tool',
   namespace: 'sys',
   label: 'AI Tool',
   pluralLabel: 'AI Tools',

packages/objectos/src/objects/sys-view.object.ts

@@ -6,9 +6,12 @@ import { ObjectSchema, Field } from '@objectstack/spec/data';
  * sys_view Object Definition
  *
  * Represents view metadata as queryable data.
+ *
+ * Registered under namespace `sys`, so the fully qualified name (FQN) is
+ * `sys__view` (produced by `SchemaRegistry.computeFQN(namespace, name)`).
  */
 export const SysView = ObjectSchema.create({
-  name: 'sys_view',
+  name: 'view',
   namespace: 'sys',
   label: 'View Definition',
   pluralLabel: 'View Definitions',