feat: replace @objectql/core ObjectQLPlugin with @objectstack/objectql upstream

- Import ObjectQLPlugin from @objectstack/objectql (fixes app.* discovery chain)
- Decompose deprecated aggregator: add QueryPlugin, ValidatorPlugin, FormulaPlugin separately
- Register MemoryDriver as 'driver.default' service for upstream driver discovery
- Add init/start adapter to QueryPlugin for @objectstack/core kernel compatibility
- Add @objectstack/objectql, @objectql/plugin-formula, @objectql/plugin-query to root devDependencies
- Update ROADMAP.md with migration completion tasks

Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>

Author: Copilot

ROADMAP.md

@@ -842,6 +842,8 @@ const kernel = new ObjectStackKernel([
 | Extract validator wiring | Already in `@objectql/plugin-validator` — remove re-export from aggregator | ✅ |
 | Extract formula wiring | Already in `@objectql/plugin-formula` — remove re-export from aggregator | ✅ |
 | Deprecate `ObjectQLPlugin` aggregator class | Mark as deprecated with `console.warn`, point to explicit imports | ✅ |
+| Migrate `objectstack.config.ts` to upstream | Import `ObjectQLPlugin` from `@objectstack/objectql`, compose sub-plugins directly, register MemoryDriver as `driver.default` service — fixes `app.*` discovery chain for AuthPlugin | ✅ |
+| Add `init`/`start` adapter to `QueryPlugin` | Consistent with ValidatorPlugin / FormulaPlugin adapter pattern for `@objectstack/core` kernel compatibility | ✅ |
 
 ### Phase B: Dispose Bridge Class ✅
 

objectstack.config.ts

@@ -25,7 +25,10 @@ import { JSONRPCPlugin } from '@objectql/protocol-json-rpc';
 import { HonoServerPlugin } from '@objectstack/plugin-hono-server';
 import { AuthPlugin } from '@objectstack/plugin-auth';
 import { ConsolePlugin } from '@object-ui/console';
-import { ObjectQLPlugin } from '@objectql/core';
+import { ObjectQLPlugin } from '@objectstack/objectql';
+import { QueryPlugin } from '@objectql/plugin-query';
+import { ValidatorPlugin } from '@objectql/plugin-validator';
+import { FormulaPlugin } from '@objectql/plugin-formula';
 import { createApiRegistryPlugin } from '@objectstack/core';
 import { MemoryDriver } from '@objectql/driver-memory';
 import * as fs from 'fs';
@@ -55,6 +58,10 @@ function loadObjects(dir: string) {
 
 const projectTrackerDir = path.join(__dirname, 'examples/showcase/project-tracker/src');
 
+// Shared driver instance — registered as 'driver.default' service for
+// upstream ObjectQLPlugin discovery and passed to QueryPlugin for query execution.
+const defaultDriver = new MemoryDriver();
+
 export default {
     metadata: {
         name: 'objectos',
@@ -66,25 +73,30 @@ export default {
         createApiRegistryPlugin(),
         new HonoServerPlugin({}),
         new ConsolePlugin(),
-        new ObjectQLPlugin({
-            enableRepository: true,
-            enableQueryService: true,
-            // Validator and Formula plugins are included by default
-            enableValidator: true,
-            enableFormulas: true,
-            datasources: {
-                default: new MemoryDriver()
-            }
-        }),
+        // Register MemoryDriver as 'driver.default' service so upstream
+        // ObjectQLPlugin can discover it during start() phase.
+        {
+            name: 'driver-memory',
+            init: async (ctx: any) => {
+                ctx.registerService('driver.default', defaultDriver);
+            },
+            start: async () => {},
+        },
+        // Upstream ObjectQLPlugin from @objectstack/objectql:
+        // - Registers objectql, metadata, data, protocol services
+        // - Discovers driver.* and app.* services (fixes auth plugin object registration)
+        // - Registers audit hooks (created_by/updated_by) and tenant isolation middleware
+        new ObjectQLPlugin(),
+        new QueryPlugin({ datasources: { default: defaultDriver } }),
+        new ValidatorPlugin(),
+        new FormulaPlugin(),
         new ObjectQLSecurityPlugin({
             enableAudit: false
         }),
         new AuthPlugin({
             secret: process.env.AUTH_SECRET || 'objectql-dev-secret-change-me-in-production',
             trustedOrigins: ['http://localhost:*'],
         }),
-        // ValidatorPlugin is managed by ObjectQLPlugin now
-        // new ValidatorPlugin(),
         new GraphQLPlugin({
             basePath: '/graphql',
             introspection: true,

package.json

@@ -31,13 +31,16 @@
     "@objectql/example-enterprise-erp": "workspace:*",
     "@objectql/example-project-tracker": "workspace:*",
     "@objectql/plugin-security": "workspace:*",
+    "@objectql/plugin-formula": "workspace:*",
+    "@objectql/plugin-query": "workspace:*",
     "@objectql/plugin-validator": "workspace:*",
     "@objectql/protocol-graphql": "workspace:*",
     "@objectql/protocol-json-rpc": "workspace:*",
     "@objectql/protocol-odata-v4": "workspace:*",
     "@object-ui/console": "^3.1.3",
     "@objectstack/cli": "^3.2.8",
     "@objectstack/core": "^3.2.8",
+    "@objectstack/objectql": "^3.2.8",
     "@objectstack/plugin-auth": "^3.2.8",
     "@objectstack/plugin-hono-server": "^3.2.8",
     "@types/js-yaml": "^4.0.9",

packages/foundation/plugin-query/src/plugin.ts

@@ -88,4 +88,31 @@ export class QueryPlugin implements RuntimePlugin {
   async onStart(_ctx: RuntimeContext): Promise<void> {
     this.logger.debug('Query plugin started');
   }
+
+  // --- Adapter for @objectstack/core compatibility ---
+  init = async (pluginCtx: any): Promise<void> => {
+      const actualKernel = typeof pluginCtx.getKernel === 'function'
+          ? pluginCtx.getKernel()
+          : pluginCtx;
+      const ctx: any = {
+          engine: actualKernel,
+          getKernel: () => actualKernel,
+          registerService: typeof pluginCtx.registerService === 'function'
+              ? pluginCtx.registerService.bind(pluginCtx)
+              : undefined,
+      };
+      return this.install(ctx);
+  }
+
+  start = async (pluginCtx: any): Promise<void> => {
+      const actualKernel = typeof pluginCtx.getKernel === 'function'
+          ? pluginCtx.getKernel()
+          : pluginCtx;
+      const ctx: any = {
+          engine: actualKernel,
+          getKernel: () => actualKernel,
+      };
+      return this.onStart(ctx);
+  }
+  // ---------------------------------------------------
 }