Merge branch 'main' into claude/update-metadata-service-dual-table-projection

Author: hotlong

apps/studio/src/components/global-sidebar.tsx

@@ -28,6 +28,7 @@ import {
   ChevronsUpDown,
   Plus,
   Boxes,
+  Globe,
   Package as PackageIcon,
   Settings,
 } from 'lucide-react';
@@ -179,6 +180,7 @@ export function GlobalSidebar() {
   const envsActive = pathname === '/environments';
   const packagesHref = envId ? `/environments/${envId}/packages` : undefined;
   const packagesActive = !!packagesHref && pathname === packagesHref;
+  const apiConsoleActive = pathname === '/api-console';
 
   return (
     <Sidebar collapsible="icon">
@@ -226,6 +228,17 @@ export function GlobalSidebar() {
                   </SidebarMenuButton>
                 )}
               </SidebarMenuItem>
+
+              {/* API Console — always available; the console discovers
+                  endpoints dynamically from the active client/environment. */}
+              <SidebarMenuItem>
+                <SidebarMenuButton asChild isActive={apiConsoleActive} tooltip="API Console">
+                  <Link to="/api-console">
+                    <Globe className="size-4" />
+                    <span>API Console</span>
+                  </Link>
+                </SidebarMenuButton>
+              </SidebarMenuItem>
             </SidebarMenu>
           </SidebarGroupContent>
         </SidebarGroup>

apps/studio/src/routes/__root.tsx

@@ -52,7 +52,9 @@ function isEnvExemptPath(pathname: string): boolean {
     pathname.startsWith('/login') ||
     pathname.startsWith('/register') ||
     pathname.startsWith('/orgs') ||
-    pathname.startsWith('/environments')
+    pathname.startsWith('/environments') ||
+    pathname === '/api-console' ||
+    pathname.startsWith('/api-console/')
   );
 }
 

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

@@ -55,11 +55,24 @@ export const SysMetadataObject = ObjectSchema.create({
       maxLength: 100,
     }),
 
-    /** Package that owns/delivered this metadata */
+    /** Package that owns/delivered this metadata (legacy string identifier, kept for compat) */
     package_id: Field.text({
       label: 'Package ID',
       required: false,
       maxLength: 255,
+      description: 'Legacy package manifest ID string. Use package_version_id for new records.',
+    }),
+
+    /**
+     * FK → sys_package_version (UUID). Set for metadata that belongs to a specific
+     * package release snapshot. NULL = platform-built-in or environment override.
+     */
+    package_version_id: Field.text({
+      label: 'Package Version ID',
+      required: false,
+      maxLength: 255,
+      description:
+        'Foreign key to sys_package_version (UUID). Null = platform-built-in or env-level override.',
     }),
 
     /** Who manages this record: package, platform, or user */
@@ -184,6 +197,7 @@ export const SysMetadataObject = ObjectSchema.create({
     { fields: ['type', 'scope'] },
     { fields: ['organization_id'] },
     { fields: ['env_id'] },
+    { fields: ['package_version_id'] },
     { fields: ['state'] },
     { fields: ['namespace'] },
   ],

packages/objectos/CI_FIXES.md

@@ -5,6 +5,9 @@ import {
   SysEnvironment,
   SysDatabaseCredential,
   SysEnvironmentMember,
+  SysPackage,
+  SysPackageVersion,
+  SysPackageInstallation,
 } from './index';
 
 describe('control-plane environment objects', () => {
@@ -51,3 +54,68 @@ describe('control-plane environment objects', () => {
     expect(SysEnvironmentMember.isSystem).toBe(true);
   });
 });
+
+describe('control-plane package objects (ADR-0003)', () => {
+  it('registers sys_package and sys_package_version with correct namespaced names', () => {
+    expect(`${SysPackage.namespace}_${SysPackage.name}`).toBe('sys_package');
+    expect(`${SysPackageVersion.namespace}_${SysPackageVersion.name}`).toBe('sys_package_version');
+    expect(`${SysPackageInstallation.namespace}_${SysPackageInstallation.name}`).toBe('sys_package_installation');
+  });
+
+  it('marks all package objects as system objects', () => {
+    expect(SysPackage.isSystem).toBe(true);
+    expect(SysPackageVersion.isSystem).toBe(true);
+    expect(SysPackageInstallation.isSystem).toBe(true);
+  });
+
+  it('sys_package has UNIQUE manifest_id index', () => {
+    const idx = SysPackage.indexes ?? [];
+    expect(
+      idx.some((i: any) => i.unique && i.fields.join(',') === 'manifest_id'),
+    ).toBe(true);
+  });
+
+  it('sys_package_version has UNIQUE (package_id, version) index', () => {
+    const idx = SysPackageVersion.indexes ?? [];
+    expect(
+      idx.some((i: any) => i.unique && i.fields.join(',') === 'package_id,version'),
+    ).toBe(true);
+  });
+
+  it('sys_package_installation has UNIQUE (environment_id, package_id) index', () => {
+    const idx = SysPackageInstallation.indexes ?? [];
+    expect(
+      idx.some((i: any) => i.unique && i.fields.join(',') === 'environment_id,package_id'),
+    ).toBe(true);
+  });
+
+  it('sys_package_installation has package_version_id field (not a version string)', () => {
+    expect(SysPackageInstallation.fields).toHaveProperty('package_version_id');
+    expect(SysPackageInstallation.fields).not.toHaveProperty('upgrade_history');
+  });
+
+  it('sys_package_installation has package_version_id index', () => {
+    const idx = SysPackageInstallation.indexes ?? [];
+    expect(
+      idx.some((i: any) => i.fields.join(',') === 'package_version_id'),
+    ).toBe(true);
+  });
+
+  it('gives every field on sys_package a .description', () => {
+    for (const [name, field] of Object.entries(SysPackage.fields)) {
+      expect((field as any).description, `sys_package.${name} missing description`).toBeTruthy();
+    }
+  });
+
+  it('gives every field on sys_package_version a .description', () => {
+    for (const [name, field] of Object.entries(SysPackageVersion.fields)) {
+      expect((field as any).description, `sys_package_version.${name} missing description`).toBeTruthy();
+    }
+  });
+
+  it('gives every field on sys_package_installation a .description', () => {
+    for (const [name, field] of Object.entries(SysPackageInstallation.fields)) {
+      expect((field as any).description, `sys_package_installation.${name} missing description`).toBeTruthy();
+    }
+  });
+});

packages/services/service-tenant/src/objects/environment-objects.test.ts

@@ -9,6 +9,7 @@ export * from './sys-environment-member.object';
 // docs/adr/0002-environment-database-isolation.md for the migration path.
 export * from './sys-tenant-database.object';
 
-// Package installation registry (lives in control plane for now; will move
-// into each environment's data plane in v5.0 per ADR-0002).
+// Package registry (Control Plane, permanent — see ADR-0003).
+export * from './sys-package.object';
+export * from './sys-package-version.object';
 export * from './sys-package-installation.object';