From 071597867f2fda8f125ba2af76f516e00c5b3358 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 18 Feb 2026 03:33:46 +0000
Subject: [PATCH 01/10] Initial plan


From d043e022cee08ce6e94788111b8ca6212dc1f650 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 18 Feb 2026 03:42:53 +0000
Subject: [PATCH 02/10] refactor(cli): convert init command from Commander.js
 to oclif

Convert the init command to use oclif Command class pattern:
- Replace Commander import with @oclif/core (Args, Command, Flags)
- Convert initCommand to Init class extending Command
- Map .argument() to static args, .option() to static flags
- Replace .action() handler with async run() method
- Replace process.exit(1) with this.error() for oclif convention
- Export TEMPLATES for external consumers
- Update bin.ts to remove Commander-based initCommand registration
- Update test to check oclif static properties

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 packages/cli/src/bin.ts            |  4 +--
 packages/cli/src/commands/init.ts  | 52 ++++++++++++++++++------------
 packages/cli/test/commands.test.ts |  6 ++--
 3 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/packages/cli/src/bin.ts b/packages/cli/src/bin.ts
index f3faf2675d..ac0d495fbf 100644
--- a/packages/cli/src/bin.ts
+++ b/packages/cli/src/bin.ts
@@ -13,7 +13,7 @@ import { serveCommand } from './commands/serve.js';
 import { studioCommand } from './commands/studio.js';
 import { testCommand } from './commands/test.js';
 import { validateCommand } from './commands/validate.js';
-import { initCommand } from './commands/init.js';
+
 import { infoCommand } from './commands/info.js';
 import { generateCommand } from './commands/generate.js';
 import { pluginCommand } from './commands/plugin.js';
@@ -63,7 +63,7 @@ ${chalk.dim('Docs: https://objectstack.dev')}
 `);
 
 // ── Development ──
-program.addCommand(initCommand);
+// initCommand has been migrated to oclif (auto-discovered from commands/)
 program.addCommand(devCommand);
 program.addCommand(serveCommand);
 program.addCommand(studioCommand);
diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts
index cf8e0c5be3..2230b0621e 100644
--- a/packages/cli/src/commands/init.ts
+++ b/packages/cli/src/commands/init.ts
@@ -1,12 +1,12 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Args, Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import fs from 'fs';
 import path from 'path';
 import { printHeader, printSuccess, printError, printStep, printKV, printInfo } from '../utils/format.js';
 
-const TEMPLATES: Record<string, {
+export const TEMPLATES: Record<string, {
   description: string;
   dependencies: Record<string, string>;
   devDependencies: Record<string, string>;
@@ -179,33 +179,48 @@ function toTitleCase(str: string): string {
   return str.replace(/[-_]/g, ' ').replace(/\b\w/g, c => c.toUpperCase());
 }
 
-export const initCommand = new Command('init')
-  .description('Initialize a new ObjectStack project in the current directory')
-  .argument('[name]', 'Project name (defaults to directory name)')
-  .option('-t, --template <template>', 'Template: app, plugin, empty', 'app')
-  .option('--no-install', 'Skip dependency installation')
-  .action(async (name, options) => {
+function printWarning(msg: string) {
+  console.log(chalk.yellow(`  ⚠ ${msg}`));
+}
+
+export default class Init extends Command {
+  static override id = 'init';
+
+  static override description = 'Initialize a new ObjectStack project in the current directory';
+
+  static override args = {
+    name: Args.string({ description: 'Project name (defaults to directory name)', required: false }),
+  };
+
+  static override flags = {
+    template: Flags.string({ char: 't', description: 'Template: app, plugin, empty', default: 'app' }),
+    install: Flags.boolean({ description: 'Install dependencies', default: true, allowNo: true }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(Init);
+
     printHeader('Init');
 
     const cwd = process.cwd();
-    const projectName = name || path.basename(cwd);
-    const template = TEMPLATES[options.template];
+    const projectName = args.name || path.basename(cwd);
+    const template = TEMPLATES[flags.template];
 
     if (!template) {
-      printError(`Unknown template: ${options.template}`);
+      printError(`Unknown template: ${flags.template}`);
       console.log(chalk.dim(`  Available: ${Object.keys(TEMPLATES).join(', ')}`));
-      process.exit(1);
+      this.error(`Unknown template: ${flags.template}`);
     }
 
     // Check for existing config
     if (fs.existsSync(path.join(cwd, 'objectstack.config.ts'))) {
       printError('objectstack.config.ts already exists in this directory');
       console.log(chalk.dim('  Use `objectstack generate` to add metadata to an existing project'));
-      process.exit(1);
+      this.error('objectstack.config.ts already exists in this directory');
     }
 
     printKV('Project', projectName);
-    printKV('Template', `${options.template} — ${template.description}`);
+    printKV('Template', `${flags.template} — ${template.description}`);
     printKV('Directory', cwd);
     console.log('');
 
@@ -286,7 +301,7 @@ export const initCommand = new Command('init')
       console.log('');
 
       // Install dependencies
-      if (options.install !== false) {
+      if (flags.install) {
         printStep('Installing dependencies...');
         const { execSync } = await import('child_process');
         try {
@@ -306,10 +321,7 @@ export const initCommand = new Command('init')
 
     } catch (error: any) {
       printError(error.message || String(error));
-      process.exit(1);
+      this.error(error.message || String(error));
     }
-  });
-
-function printWarning(msg: string) {
-  console.log(chalk.yellow(`  ⚠ ${msg}`));
+  }
 }
diff --git a/packages/cli/test/commands.test.ts b/packages/cli/test/commands.test.ts
index e8f1d2df41..ac8d3c3349 100644
--- a/packages/cli/test/commands.test.ts
+++ b/packages/cli/test/commands.test.ts
@@ -6,7 +6,7 @@ import { doctorCommand } from '../src/commands/doctor';
 import { createCommand } from '../src/commands/create';
 import { testCommand } from '../src/commands/test';
 import { validateCommand } from '../src/commands/validate';
-import { initCommand } from '../src/commands/init';
+import Init from '../src/commands/init';
 import { infoCommand } from '../src/commands/info';
 import { generateCommand } from '../src/commands/generate';
 import { pluginCommand } from '../src/commands/plugin';
@@ -48,8 +48,8 @@ describe('CLI Commands', () => {
   });
 
   it('should have init command', () => {
-    expect(initCommand.name()).toBe('init');
-    expect(initCommand.description()).toContain('Initialize');
+    expect(Init.id).toBe('init');
+    expect(Init.description).toContain('Initialize');
   });
 
   it('should have info command', () => {

From bbea22f3506cfaaf9ff35448c606994f0e248c12 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 18 Feb 2026 03:48:01 +0000
Subject: [PATCH 03/10] refactor(cli): convert compile command from
 Commander.js to oclif

Migrate the compile command to use oclif's class-based Command pattern,
matching the existing init command structure. This includes:
- Replace Commander.js fluent API with oclif Args/Flags static properties
- Export default class instead of named command instance
- Replace process.exit(1) with this.exit(1) and this.error()
- Remove compile command registration from bin.ts (oclif auto-discovers)
- Update test assertions to use oclif class properties

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 packages/cli/bin/run-dev.js          |   5 +
 packages/cli/bin/run.js              |   5 +
 packages/cli/package.json            |  28 +-
 packages/cli/src/bin.ts              |   3 +-
 packages/cli/src/commands/compile.ts |  53 ++--
 packages/cli/test/commands.test.ts   |   5 +-
 packages/cli/tsconfig.build.json     |  18 ++
 pnpm-lock.yaml                       | 391 +++++++++++++++++++++++++--
 8 files changed, 453 insertions(+), 55 deletions(-)
 create mode 100644 packages/cli/bin/run-dev.js
 create mode 100644 packages/cli/bin/run.js
 create mode 100644 packages/cli/tsconfig.build.json

diff --git a/packages/cli/bin/run-dev.js b/packages/cli/bin/run-dev.js
new file mode 100644
index 0000000000..774534ce47
--- /dev/null
+++ b/packages/cli/bin/run-dev.js
@@ -0,0 +1,5 @@
+#!/usr/bin/env tsx
+
+import { execute } from '@oclif/core';
+
+await execute({ type: 'esm', development: true, dir: import.meta.url });
diff --git a/packages/cli/bin/run.js b/packages/cli/bin/run.js
new file mode 100644
index 0000000000..7a6c197a5f
--- /dev/null
+++ b/packages/cli/bin/run.js
@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+
+import { execute } from '@oclif/core';
+
+await execute({ type: 'esm', dir: import.meta.url });
diff --git a/packages/cli/package.json b/packages/cli/package.json
index fde3b76fc0..a2ac9e4913 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -3,25 +3,41 @@
   "version": "3.0.6",
   "description": "Command Line Interface for ObjectStack Protocol",
   "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "bin": {
-    "objectstack": "./bin/objectstack.js",
-    "os": "./bin/objectstack.js"
+    "objectstack": "./bin/run.js",
+    "os": "./bin/run.js"
   },
   "scripts": {
-    "build": "tsup",
-    "dev": "tsup --watch",
+    "build": "tsc -p tsconfig.build.json",
+    "dev": "tsc -p tsconfig.build.json --watch",
     "test": "vitest run",
     "lint": "eslint src"
   },
   "keywords": [
     "objectstack",
     "cli",
+    "oclif",
     "compiler",
     "scaffold"
   ],
   "type": "module",
   "author": "Steedos",
   "license": "Apache-2.0",
+  "oclif": {
+    "bin": "os",
+    "dirname": "objectstack",
+    "commands": {
+      "strategy": "pattern",
+      "target": "./dist/commands",
+      "glob": "**/*.js"
+    },
+    "plugins": [
+      "@oclif/plugin-help",
+      "@oclif/plugin-plugins"
+    ],
+    "topicSeparator": " "
+  },
   "dependencies": {
     "@objectstack/core": "workspace:*",
     "@objectstack/driver-memory": "workspace:^",
@@ -30,9 +46,9 @@
     "@objectstack/rest": "workspace:*",
     "@objectstack/runtime": "workspace:^",
     "@objectstack/spec": "workspace:*",
+    "@oclif/core": "^4.8.0",
     "bundle-require": "^5.1.0",
     "chalk": "^5.3.0",
-    "commander": "^14.0.3",
     "tsx": "^4.7.1",
     "zod": "^4.3.6"
   },
@@ -40,6 +56,8 @@
     "@objectstack/core": "workspace:*"
   },
   "devDependencies": {
+    "@oclif/plugin-help": "^6.2.37",
+    "@oclif/plugin-plugins": "^5.4.56",
     "@types/node": "^25.2.2",
     "tsup": "^8.0.2",
     "typescript": "^5.3.3",
diff --git a/packages/cli/src/bin.ts b/packages/cli/src/bin.ts
index ac0d495fbf..a72e35e262 100644
--- a/packages/cli/src/bin.ts
+++ b/packages/cli/src/bin.ts
@@ -5,7 +5,6 @@ import { Command } from 'commander';
 import chalk from 'chalk';
 
 // Commands
-import { compileCommand } from './commands/compile.js';
 import { devCommand } from './commands/dev.js';
 import { doctorCommand } from './commands/doctor.js';
 import { createCommand } from './commands/create.js';
@@ -69,7 +68,7 @@ program.addCommand(serveCommand);
 program.addCommand(studioCommand);
 
 // ── Build & Validate ──
-program.addCommand(compileCommand);
+// compileCommand has been migrated to oclif (auto-discovered from commands/)
 program.addCommand(validateCommand);
 program.addCommand(infoCommand);
 
diff --git a/packages/cli/src/commands/compile.ts b/packages/cli/src/commands/compile.ts
index 2a5dffb2e2..8bec51d5be 100644
--- a/packages/cli/src/commands/compile.ts
+++ b/packages/cli/src/commands/compile.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Args, Command, Flags } from '@oclif/core';
 import path from 'path';
 import fs from 'fs';
 import chalk from 'chalk';
@@ -19,47 +19,55 @@ import {
   printMetadataStats,
 } from '../utils/format.js';
 
-export const compileCommand = new Command('compile')
-  .description('Compile ObjectStack configuration to JSON artifact')
-  .argument('[config]', 'Source configuration file')
-  .option('-o, --output <path>', 'Output JSON file', 'dist/objectstack.json')
-  .option('--json', 'Output compile result as JSON (for CI)')
-  .action(async (configPath, options) => {
+export default class Compile extends Command {
+  static override description = 'Compile ObjectStack configuration to JSON artifact';
+
+  static override args = {
+    config: Args.string({ description: 'Source configuration file', required: false }),
+  };
+
+  static override flags = {
+    output: Flags.string({ char: 'o', description: 'Output JSON file', default: 'dist/objectstack.json' }),
+    json: Flags.boolean({ description: 'Output compile result as JSON (for CI)' }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(Compile);
     const timer = createTimer();
 
-    if (!options.json) {
+    if (!flags.json) {
       printHeader('Compile');
     }
 
     try {
       // 1. Load Configuration
-      if (!options.json) printStep('Loading configuration...');
-      const { config, absolutePath, duration } = await loadConfig(configPath);
+      if (!flags.json) printStep('Loading configuration...');
+      const { config, absolutePath, duration } = await loadConfig(args.config);
 
-      if (!options.json) {
+      if (!flags.json) {
         printKV('Config', path.relative(process.cwd(), absolutePath));
         printKV('Load time', `${duration}ms`);
       }
 
       // 2. Normalize map-formatted stack definition and validate against Protocol
-      if (!options.json) printStep('Validating protocol compliance...');
+      if (!flags.json) printStep('Validating protocol compliance...');
       const normalized = normalizeStackInput(config as Record<string, unknown>);
       const result = ObjectStackDefinitionSchema.safeParse(normalized);
 
       if (!result.success) {
-        if (options.json) {
+        if (flags.json) {
           console.log(JSON.stringify({ success: false, errors: (result.error as unknown as ZodError).issues }));
-          process.exit(1);
+          this.exit(1);
         }
         console.log('');
         printError('Validation failed');
         formatZodErrors(result.error as unknown as ZodError);
-        process.exit(1);
+        this.exit(1);
       }
 
       // 3. Generate Artifact
-      if (!options.json) printStep('Writing artifact...');
-      const output = options.output;
+      if (!flags.json) printStep('Writing artifact...');
+      const output = flags.output!;
       const artifactPath = path.resolve(process.cwd(), output);
       const artifactDir = path.dirname(artifactPath);
 
@@ -73,7 +81,7 @@ export const compileCommand = new Command('compile')
       const sizeKB = (jsonContent.length / 1024).toFixed(1);
       const stats = collectMetadataStats(config);
 
-      if (options.json) {
+      if (flags.json) {
         console.log(JSON.stringify({
           success: true,
           output: artifactPath,
@@ -94,12 +102,13 @@ export const compileCommand = new Command('compile')
       console.log('');
 
     } catch (error: any) {
-      if (options.json) {
+      if (flags.json) {
         console.log(JSON.stringify({ success: false, error: error.message }));
-        process.exit(1);
+        this.exit(1);
       }
       console.log('');
       printError(error.message || String(error));
-      process.exit(1);
+      this.error(error.message || String(error));
     }
-  });
+  }
+}
diff --git a/packages/cli/test/commands.test.ts b/packages/cli/test/commands.test.ts
index ac8d3c3349..aa3ef76547 100644
--- a/packages/cli/test/commands.test.ts
+++ b/packages/cli/test/commands.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { compileCommand } from '../src/commands/compile';
+import Compile from '../src/commands/compile';
 import { serveCommand } from '../src/commands/serve';
 import { devCommand } from '../src/commands/dev';
 import { doctorCommand } from '../src/commands/doctor';
@@ -13,8 +13,7 @@ import { pluginCommand } from '../src/commands/plugin';
 
 describe('CLI Commands', () => {
   it('should have compile command', () => {
-    expect(compileCommand.name()).toBe('compile');
-    expect(compileCommand.description()).toContain('Compile');
+    expect(Compile.description).toContain('Compile');
   });
 
   it('should have serve command', () => {
diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json
new file mode 100644
index 0000000000..c19942d2de
--- /dev/null
+++ b/packages/cli/tsconfig.build.json
@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "target": "ES2022",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "lib": ["ES2022"],
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "outDir": "dist",
+    "rootDir": "src",
+    "declaration": true,
+    "declarationMap": true,
+    "sourceMap": true
+  },
+  "include": ["src"]
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7bf411e9b6..3f6295dcd6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -477,15 +477,15 @@ importers:
       '@objectstack/spec':
         specifier: workspace:*
         version: link:../spec
+      '@oclif/core':
+        specifier: ^4.8.0
+        version: 4.8.0
       bundle-require:
         specifier: ^5.1.0
         version: 5.1.0(esbuild@0.27.3)
       chalk:
         specifier: ^5.3.0
         version: 5.6.2
-      commander:
-        specifier: ^14.0.3
-        version: 14.0.3
       tsx:
         specifier: ^4.7.1
         version: 4.21.0
@@ -493,6 +493,12 @@ importers:
         specifier: ^4.3.6
         version: 4.3.6
     devDependencies:
+      '@oclif/plugin-help':
+        specifier: ^6.2.37
+        version: 6.2.37
+      '@oclif/plugin-plugins':
+        specifier: ^5.4.56
+        version: 5.4.56
       '@types/node':
         specifier: ^25.2.2
         version: 25.2.2
@@ -1928,6 +1934,18 @@ packages:
     engines: {node: ^14.18.0 || >=16.10.0, npm: '>=5.10.0'}
     hasBin: true
 
+  '@oclif/core@4.8.0':
+    resolution: {integrity: sha512-jteNUQKgJHLHFbbz806aGZqf+RJJ7t4gwF4MYa8fCwCxQ8/klJNWc0MvaJiBebk7Mc+J39mdlsB4XraaCKznFw==}
+    engines: {node: '>=18.0.0'}
+
+  '@oclif/plugin-help@6.2.37':
+    resolution: {integrity: sha512-5N/X/FzlJaYfpaHwDC0YHzOzKDWa41s9t+4FpCDu4f9OMReds4JeNBaaWk9rlIzdKjh2M6AC5Q18ORfECRkHGA==}
+    engines: {node: '>=18.0.0'}
+
+  '@oclif/plugin-plugins@5.4.56':
+    resolution: {integrity: sha512-mZjRudlmVSr6Stz0CVFuaIZOjwZ5DqjWepQCR/yK9nbs8YunGautpuxBx/CcqaEH29xiQfsuNOIUWa1w/+3VSA==}
+    engines: {node: '>=18.0.0'}
+
   '@open-draft/deferred-promise@2.2.0':
     resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==}
 
@@ -3236,6 +3254,10 @@ packages:
     resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
     engines: {node: '>=6'}
 
+  ansi-escapes@4.3.2:
+    resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
+    engines: {node: '>=8'}
+
   ansi-escapes@7.3.0:
     resolution: {integrity: sha512-BvU8nYgGQBxcmMuEeUEmNTvrMVjJNSH7RgW24vXexN4Ven6qCvy4TntnvlnwnMLTVlcRQQdbRY8NKnaIoeWDNg==}
     engines: {node: '>=18'}
@@ -3252,6 +3274,10 @@ packages:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
 
+  ansis@3.17.0:
+    resolution: {integrity: sha512-0qWUglt9JEqLFr3w1I1pbrChn1grhaiAR2ocX1PP/flRmxgtwTzPFFFnfIlD6aMOLQZgSuCRlidD70lvx8yhzg==}
+    engines: {node: '>=14'}
+
   any-promise@1.3.0:
     resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
 
@@ -3291,6 +3317,9 @@ packages:
     resolution: {integrity: sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==}
     hasBin: true
 
+  async@3.2.6:
+    resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
+
   asynckit@0.4.0:
     resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
 
@@ -3422,6 +3451,9 @@ packages:
   brace-expansion@1.1.12:
     resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==}
 
+  brace-expansion@2.0.2:
+    resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
+
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
@@ -3527,6 +3559,14 @@ packages:
   class-variance-authority@0.7.1:
     resolution: {integrity: sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==}
 
+  clean-stack@3.0.1:
+    resolution: {integrity: sha512-lR9wNiMRcVQjSB3a7xXGLuz4cr4wJuuXlaAEbRutGowQTmlp7R72/DOgN21e8jdwblMWl9UOJMJXarX94pzKdg==}
+    engines: {node: '>=10'}
+
+  cli-spinners@2.9.2:
+    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
+    engines: {node: '>=6'}
+
   cli-width@4.1.0:
     resolution: {integrity: sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ==}
     engines: {node: '>= 12'}
@@ -3844,6 +3884,11 @@ packages:
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
+  ejs@3.1.10:
+    resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==}
+    engines: {node: '>=0.10.0'}
+    hasBin: true
+
   electron-to-chromium@1.5.286:
     resolution: {integrity: sha512-9tfDXhJ4RKFNerfjdCcZfufu49vg620741MNs26a9+bhLThdB+plgMeou98CAaHu/WATj2iHOOHTp1hWtABj2A==}
 
@@ -3926,6 +3971,10 @@ packages:
   escape-html@1.0.3:
     resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
 
+  escape-string-regexp@4.0.0:
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
+
   escape-string-regexp@5.0.0:
     resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==}
     engines: {node: '>=12'}
@@ -4034,6 +4083,9 @@ packages:
     resolution: {integrity: sha512-8kPJMIGz1Yt/aPEwOsrR97ZyZaD1Iqm8PClb1nYFclUCkBi0Ma5IsYNQzvSFS9ib51lWyIw5mIT9rWzI/xjpzA==}
     engines: {node: '>=20'}
 
+  filelist@1.0.4:
+    resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
+
   fill-range@7.1.1:
     resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
     engines: {node: '>=8'}
@@ -4235,6 +4287,10 @@ packages:
     resolution: {integrity: sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==}
     engines: {node: '>=6'}
 
+  get-package-type@0.1.0:
+    resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
+    engines: {node: '>=8.0.0'}
+
   get-proto@1.0.1:
     resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
     engines: {node: '>= 0.4'}
@@ -4386,6 +4442,10 @@ packages:
     engines: {node: '>=16.x'}
     hasBin: true
 
+  indent-string@4.0.0:
+    resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
+    engines: {node: '>=8'}
+
   index-to-position@1.2.0:
     resolution: {integrity: sha512-Yg7+ztRkqslMAS2iFaU+Oa4KTSidr63OsFGlOrJoW981kIYO3CGCS3wA95P1mUi/IVSJkn0D479KTJpVpvFNuw==}
     engines: {node: '>=18'}
@@ -4419,6 +4479,11 @@ packages:
   is-decimal@2.0.1:
     resolution: {integrity: sha512-AAB9hiomQs5DXWcRB1rqsxGUstbRroFOPPVAomNk/3XHR5JyEZChOyTWe2oayKnsSsr/kcGqF+z6yuH6HHpN0A==}
 
+  is-docker@2.2.1:
+    resolution: {integrity: sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==}
+    engines: {node: '>=8'}
+    hasBin: true
+
   is-docker@3.0.0:
     resolution: {integrity: sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -4469,6 +4534,10 @@ packages:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
     engines: {node: '>=0.10.0'}
 
+  is-wsl@2.2.0:
+    resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
+    engines: {node: '>=8'}
+
   is-wsl@3.1.0:
     resolution: {integrity: sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==}
     engines: {node: '>=16'}
@@ -4476,6 +4545,10 @@ packages:
   isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
+  isexe@3.1.5:
+    resolution: {integrity: sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==}
+    engines: {node: '>=18'}
+
   istanbul-lib-coverage@3.2.2:
     resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
     engines: {node: '>=8'}
@@ -4500,6 +4573,11 @@ packages:
     resolution: {integrity: sha512-ykkVRwrYvFm1nb2AJfKKYPr0emF6IiXDYUaFx4Zn9ZuIH7MrzEZ3sD5RlqGXNRpHtvUHJyOnCEFxOlNDtGo7wg==}
     engines: {node: 20 || >=22}
 
+  jake@10.9.4:
+    resolution: {integrity: sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==}
+    engines: {node: '>=10'}
+    hasBin: true
+
   jiti@2.6.1:
     resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==}
     hasBin: true
@@ -4960,6 +5038,14 @@ packages:
   minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
 
+  minimatch@5.1.6:
+    resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
+    engines: {node: '>=10'}
+
+  minimatch@9.0.5:
+    resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
   minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
@@ -5088,10 +5174,92 @@ packages:
     resolution: {integrity: sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==}
     engines: {node: ^16.14.0 || >=18.0.0}
 
+  npm-package-arg@11.0.3:
+    resolution: {integrity: sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==}
+    engines: {node: ^16.14.0 || >=18.0.0}
+
+  npm-run-path@5.3.0:
+    resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
   npm-to-yarn@3.0.1:
     resolution: {integrity: sha512-tt6PvKu4WyzPwWUzy/hvPFqn+uwXO0K1ZHka8az3NnrhWJDmSqI8ncWq0fkL0k/lmmi5tAC11FXwXuh0rFbt1A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
+  npm@10.9.4:
+    resolution: {integrity: sha512-OnUG836FwboQIbqtefDNlyR0gTHzIfwRfE3DuiNewBvnMnWEpB0VEXwBlFVgqpNzIgYo/MHh3d2Hel/pszapAA==}
+    engines: {node: ^18.17.0 || >=20.5.0}
+    hasBin: true
+    bundledDependencies:
+      - '@isaacs/string-locale-compare'
+      - '@npmcli/arborist'
+      - '@npmcli/config'
+      - '@npmcli/fs'
+      - '@npmcli/map-workspaces'
+      - '@npmcli/package-json'
+      - '@npmcli/promise-spawn'
+      - '@npmcli/redact'
+      - '@npmcli/run-script'
+      - '@sigstore/tuf'
+      - abbrev
+      - archy
+      - cacache
+      - chalk
+      - ci-info
+      - cli-columns
+      - fastest-levenshtein
+      - fs-minipass
+      - glob
+      - graceful-fs
+      - hosted-git-info
+      - ini
+      - init-package-json
+      - is-cidr
+      - json-parse-even-better-errors
+      - libnpmaccess
+      - libnpmdiff
+      - libnpmexec
+      - libnpmfund
+      - libnpmhook
+      - libnpmorg
+      - libnpmpack
+      - libnpmpublish
+      - libnpmsearch
+      - libnpmteam
+      - libnpmversion
+      - make-fetch-happen
+      - minimatch
+      - minipass
+      - minipass-pipeline
+      - ms
+      - node-gyp
+      - nopt
+      - normalize-package-data
+      - npm-audit-report
+      - npm-install-checks
+      - npm-package-arg
+      - npm-pick-manifest
+      - npm-profile
+      - npm-registry-fetch
+      - npm-user-validate
+      - p-map
+      - pacote
+      - parse-conflict-json
+      - proc-log
+      - qrcode-terminal
+      - read
+      - semver
+      - spdx-expression-parse
+      - ssri
+      - supports-color
+      - tar
+      - text-table
+      - tiny-relative-date
+      - treeverse
+      - validate-npm-package-name
+      - which
+      - write-file-atomic
+
   nth-check@2.1.1:
     resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
 
@@ -5103,6 +5271,10 @@ packages:
     resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
     engines: {node: '>= 0.4'}
 
+  object-treeify@4.0.1:
+    resolution: {integrity: sha512-Y6tg5rHfsefSkfKujv2SwHulInROy/rCL5F4w0QOWxut8AnxYxf0YmNhTh95Zfyxpsudo66uqkux0ACFnyMSgQ==}
+    engines: {node: '>= 16'}
+
   obug@2.1.1:
     resolution: {integrity: sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==}
 
@@ -5194,6 +5366,10 @@ packages:
     resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
     engines: {node: '>=8'}
 
+  path-key@4.0.0:
+    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
+    engines: {node: '>=12'}
+
   path-scurry@2.0.1:
     resolution: {integrity: sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==}
     engines: {node: 20 || >=22}
@@ -5304,6 +5480,10 @@ packages:
     engines: {node: '>=10.13.0'}
     hasBin: true
 
+  proc-log@4.2.0:
+    resolution: {integrity: sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
   process-warning@4.0.1:
     resolution: {integrity: sha512-3c2LzQ3rY9d0hc1emcsHhfT9Jwz0cChib/QN89oME2R451w5fy3f0afAhERFZAwrbDU43wk12d0ORBpDVME50Q==}
 
@@ -5789,6 +5969,10 @@ packages:
     resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
     engines: {node: '>=8'}
 
+  supports-color@8.1.1:
+    resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
+    engines: {node: '>=10'}
+
   supports-hyperlinks@3.2.0:
     resolution: {integrity: sha512-zFObLMyZeEwzAoKCyu1B91U79K2t7ApXuQfo8OuxwXLDgcKxuwM+YvcbIhm6QWqz7mHUH1TVytR1PwVVjEuMig==}
     engines: {node: '>=14.18'}
@@ -5996,6 +6180,10 @@ packages:
     resolution: {integrity: sha512-8Osxz5Tu/Dw2kb31EAY+nhq/YZ3wzmQSmYa1nIArqxgCAldxv9TPlrAiaBUDVnKA4aiPn0OFBD1ACcpc5VFOAQ==}
     hasBin: true
 
+  type-fest@0.21.3:
+    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
+    engines: {node: '>=10'}
+
   type-fest@4.41.0:
     resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==}
     engines: {node: '>=16'}
@@ -6137,6 +6325,10 @@ packages:
   validate-npm-package-license@3.0.4:
     resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==}
 
+  validate-npm-package-name@5.0.1:
+    resolution: {integrity: sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
   vary@1.1.2:
     resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
     engines: {node: '>= 0.8'}
@@ -6251,11 +6443,23 @@ packages:
     engines: {node: '>= 8'}
     hasBin: true
 
+  which@4.0.0:
+    resolution: {integrity: sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==}
+    engines: {node: ^16.13.0 || >=18.0.0}
+    hasBin: true
+
   why-is-node-running@2.3.0:
     resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
     engines: {node: '>=8'}
     hasBin: true
 
+  widest-line@3.1.0:
+    resolution: {integrity: sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==}
+    engines: {node: '>=8'}
+
+  wordwrap@1.0.0:
+    resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==}
+
   wrap-ansi@6.2.0:
     resolution: {integrity: sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==}
     engines: {node: '>=8'}
@@ -6309,6 +6513,11 @@ packages:
     resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
     engines: {node: '>=12'}
 
+  yarn@1.22.22:
+    resolution: {integrity: sha512-prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg==}
+    engines: {node: '>=4.0.0'}
+    hasBin: true
+
   yauzl@2.10.0:
     resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==}
 
@@ -6446,7 +6655,7 @@ snapshots:
       '@babel/types': 7.29.0
       '@jridgewell/remapping': 2.3.5
       convert-source-map: 2.0.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 6.3.1
@@ -6530,7 +6739,7 @@ snapshots:
       '@babel/parser': 7.29.0
       '@babel/template': 7.28.6
       '@babel/types': 7.29.0
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -7223,6 +7432,47 @@ snapshots:
     dependencies:
       consola: 3.4.2
 
+  '@oclif/core@4.8.0':
+    dependencies:
+      ansi-escapes: 4.3.2
+      ansis: 3.17.0
+      clean-stack: 3.0.1
+      cli-spinners: 2.9.2
+      debug: 4.4.3(supports-color@8.1.1)
+      ejs: 3.1.10
+      get-package-type: 0.1.0
+      indent-string: 4.0.0
+      is-wsl: 2.2.0
+      lilconfig: 3.1.3
+      minimatch: 9.0.5
+      semver: 7.7.4
+      string-width: 4.2.3
+      supports-color: 8.1.1
+      tinyglobby: 0.2.15
+      widest-line: 3.1.0
+      wordwrap: 1.0.0
+      wrap-ansi: 7.0.0
+
+  '@oclif/plugin-help@6.2.37':
+    dependencies:
+      '@oclif/core': 4.8.0
+
+  '@oclif/plugin-plugins@5.4.56':
+    dependencies:
+      '@oclif/core': 4.8.0
+      ansis: 3.17.0
+      debug: 4.4.3(supports-color@8.1.1)
+      npm: 10.9.4
+      npm-package-arg: 11.0.3
+      npm-run-path: 5.3.0
+      object-treeify: 4.0.1
+      semver: 7.7.4
+      validate-npm-package-name: 5.0.1
+      which: 4.0.0
+      yarn: 1.22.22
+    transitivePeerDependencies:
+      - supports-color
+
   '@open-draft/deferred-promise@2.2.0': {}
 
   '@open-draft/logger@0.3.0':
@@ -7960,7 +8210,7 @@ snapshots:
       '@secretlint/resolver': 10.2.2
       '@secretlint/types': 10.2.2
       ajv: 8.17.1
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       rc-config-loader: 4.1.3
     transitivePeerDependencies:
       - supports-color
@@ -7969,7 +8219,7 @@ snapshots:
     dependencies:
       '@secretlint/profiler': 10.2.2
       '@secretlint/types': 10.2.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       structured-source: 4.0.0
     transitivePeerDependencies:
       - supports-color
@@ -7982,7 +8232,7 @@ snapshots:
       '@textlint/module-interop': 15.5.1
       '@textlint/types': 15.5.1
       chalk: 5.6.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       pluralize: 8.0.0
       strip-ansi: 7.1.2
       table: 6.9.0
@@ -7998,7 +8248,7 @@ snapshots:
       '@secretlint/profiler': 10.2.2
       '@secretlint/source-creator': 10.2.2
       '@secretlint/types': 10.2.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       p-map: 7.0.4
     transitivePeerDependencies:
       - supports-color
@@ -8200,7 +8450,7 @@ snapshots:
       '@textlint/resolver': 15.5.1
       '@textlint/types': 15.5.1
       chalk: 4.1.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       js-yaml: 4.1.1
       lodash: 4.17.23
       pluralize: 2.0.0
@@ -8221,7 +8471,7 @@ snapshots:
 
   '@tokenizer/inflate@0.4.1':
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       token-types: 6.1.2
     transitivePeerDependencies:
       - supports-color
@@ -8544,6 +8794,10 @@ snapshots:
 
   ansi-colors@4.1.3: {}
 
+  ansi-escapes@4.3.2:
+    dependencies:
+      type-fest: 0.21.3
+
   ansi-escapes@7.3.0:
     dependencies:
       environment: 1.1.0
@@ -8556,6 +8810,8 @@ snapshots:
     dependencies:
       color-convert: 2.0.1
 
+  ansis@3.17.0: {}
+
   any-promise@1.3.0: {}
 
   arg@4.1.3: {}
@@ -8586,6 +8842,8 @@ snapshots:
 
   astring@1.9.0: {}
 
+  async@3.2.6: {}
+
   asynckit@0.4.0: {}
 
   atomic-sleep@1.0.0: {}
@@ -8671,7 +8929,7 @@ snapshots:
     dependencies:
       bytes: 3.1.2
       content-type: 1.0.5
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       http-errors: 2.0.1
       iconv-lite: 0.7.2
       on-finished: 2.4.1
@@ -8690,6 +8948,10 @@ snapshots:
       balanced-match: 1.0.2
       concat-map: 0.0.1
 
+  brace-expansion@2.0.2:
+    dependencies:
+      balanced-match: 1.0.2
+
   braces@3.0.3:
     dependencies:
       fill-range: 7.1.1
@@ -8805,6 +9067,12 @@ snapshots:
     dependencies:
       clsx: 2.1.1
 
+  clean-stack@3.0.1:
+    dependencies:
+      escape-string-regexp: 4.0.0
+
+  cli-spinners@2.9.2: {}
+
   cli-width@4.1.0: {}
 
   client-only@0.0.1: {}
@@ -8893,9 +9161,11 @@ snapshots:
 
   dateformat@4.6.3: {}
 
-  debug@4.4.3:
+  debug@4.4.3(supports-color@8.1.1):
     dependencies:
       ms: 2.1.3
+    optionalDependencies:
+      supports-color: 8.1.1
 
   decode-named-character-reference@1.3.0:
     dependencies:
@@ -8987,6 +9257,10 @@ snapshots:
 
   ee-first@1.1.1: {}
 
+  ejs@3.1.10:
+    dependencies:
+      jake: 10.9.4
+
   electron-to-chromium@1.5.286: {}
 
   emoji-regex@8.0.0: {}
@@ -9113,6 +9387,8 @@ snapshots:
 
   escape-html@1.0.3: {}
 
+  escape-string-regexp@4.0.0: {}
+
   escape-string-regexp@5.0.0: {}
 
   esm-env@1.2.2: {}
@@ -9175,7 +9451,7 @@ snapshots:
       content-type: 1.0.5
       cookie: 0.7.2
       cookie-signature: 1.2.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       depd: 2.0.0
       encodeurl: 2.0.0
       escape-html: 1.0.3
@@ -9274,13 +9550,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  filelist@1.0.4:
+    dependencies:
+      minimatch: 5.1.6
+
   fill-range@7.1.1:
     dependencies:
       to-regex-range: 5.0.1
 
   finalhandler@2.1.1:
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       on-finished: 2.4.1
@@ -9480,6 +9760,8 @@ snapshots:
 
   get-nonce@1.0.1: {}
 
+  get-package-type@0.1.0: {}
+
   get-proto@1.0.1:
     dependencies:
       dunder-proto: 1.0.1
@@ -9672,14 +9954,14 @@ snapshots:
   http-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.6:
     dependencies:
       agent-base: 7.1.4
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -9701,6 +9983,8 @@ snapshots:
 
   image-size@2.0.2: {}
 
+  indent-string@4.0.0: {}
+
   index-to-position@1.2.0: {}
 
   inherits@2.0.4: {}
@@ -9725,6 +10009,8 @@ snapshots:
 
   is-decimal@2.0.1: {}
 
+  is-docker@2.2.1: {}
+
   is-docker@3.0.0: {}
 
   is-extglob@2.1.1: {}
@@ -9759,12 +10045,18 @@ snapshots:
 
   is-windows@1.0.2: {}
 
+  is-wsl@2.2.0:
+    dependencies:
+      is-docker: 2.2.1
+
   is-wsl@3.1.0:
     dependencies:
       is-inside-container: 1.0.0
 
   isexe@2.0.0: {}
 
+  isexe@3.1.5: {}
+
   istanbul-lib-coverage@3.2.2: {}
 
   istanbul-lib-report@3.0.1:
@@ -9790,6 +10082,12 @@ snapshots:
     dependencies:
       '@isaacs/cliui': 9.0.0
 
+  jake@10.9.4:
+    dependencies:
+      async: 3.2.6
+      filelist: 1.0.4
+      picocolors: 1.1.1
+
   jiti@2.6.1: {}
 
   jose@6.1.3: {}
@@ -10425,7 +10723,7 @@ snapshots:
   micromark@4.0.2:
     dependencies:
       '@types/debug': 4.1.12
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       decode-named-character-reference: 1.3.0
       devlop: 1.1.0
       micromark-core-commonmark: 2.0.3
@@ -10476,6 +10774,14 @@ snapshots:
     dependencies:
       brace-expansion: 1.1.12
 
+  minimatch@5.1.6:
+    dependencies:
+      brace-expansion: 2.0.2
+
+  minimatch@9.0.5:
+    dependencies:
+      brace-expansion: 2.0.2
+
   minimist@1.2.8: {}
 
   minipass@7.1.2: {}
@@ -10606,8 +10912,21 @@ snapshots:
       semver: 7.7.4
       validate-npm-package-license: 3.0.4
 
+  npm-package-arg@11.0.3:
+    dependencies:
+      hosted-git-info: 7.0.2
+      proc-log: 4.2.0
+      semver: 7.7.4
+      validate-npm-package-name: 5.0.1
+
+  npm-run-path@5.3.0:
+    dependencies:
+      path-key: 4.0.0
+
   npm-to-yarn@3.0.1: {}
 
+  npm@10.9.4: {}
+
   nth-check@2.1.1:
     dependencies:
       boolbase: 1.0.0
@@ -10616,6 +10935,8 @@ snapshots:
 
   object-inspect@1.13.4: {}
 
+  object-treeify@4.0.1: {}
+
   obug@2.1.1: {}
 
   on-exit-leak-free@2.1.2: {}
@@ -10710,6 +11031,8 @@ snapshots:
 
   path-key@3.1.1: {}
 
+  path-key@4.0.0: {}
+
   path-scurry@2.0.1:
     dependencies:
       lru-cache: 11.2.5
@@ -10828,6 +11151,8 @@ snapshots:
 
   prettier@2.8.8: {}
 
+  proc-log@4.2.0: {}
+
   process-warning@4.0.1: {}
 
   process-warning@5.0.0: {}
@@ -10869,7 +11194,7 @@ snapshots:
 
   rc-config-loader@4.1.3:
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       js-yaml: 4.1.1
       json5: 2.2.3
       require-from-string: 2.0.2
@@ -11145,7 +11470,7 @@ snapshots:
 
   router@2.2.0:
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       depd: 2.0.0
       is-promise: 4.0.0
       parseurl: 1.3.3
@@ -11191,7 +11516,7 @@ snapshots:
       '@secretlint/formatter': 10.2.2
       '@secretlint/node': 10.2.2
       '@secretlint/profiler': 10.2.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       globby: 14.1.0
       read-pkg: 9.0.1
     transitivePeerDependencies:
@@ -11209,7 +11534,7 @@ snapshots:
 
   send@1.2.1:
     dependencies:
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
@@ -11452,6 +11777,10 @@ snapshots:
     dependencies:
       has-flag: 4.0.0
 
+  supports-color@8.1.1:
+    dependencies:
+      has-flag: 4.0.0
+
   supports-hyperlinks@3.2.0:
     dependencies:
       has-flag: 4.0.0
@@ -11608,7 +11937,7 @@ snapshots:
       cac: 6.7.14
       chokidar: 4.0.3
       consola: 3.4.2
-      debug: 4.4.3
+      debug: 4.4.3(supports-color@8.1.1)
       esbuild: 0.27.2
       fix-dts-default-cjs-exports: 1.0.1
       joycon: 3.1.1
@@ -11671,6 +12000,8 @@ snapshots:
       turbo-windows-64: 2.8.3
       turbo-windows-arm64: 2.8.3
 
+  type-fest@0.21.3: {}
+
   type-fest@4.41.0: {}
 
   type-fest@5.4.4:
@@ -11801,6 +12132,8 @@ snapshots:
       spdx-correct: 3.2.0
       spdx-expression-parse: 3.0.1
 
+  validate-npm-package-name@5.0.1: {}
+
   vary@1.1.2: {}
 
   version-range@4.15.0: {}
@@ -11884,11 +12217,21 @@ snapshots:
     dependencies:
       isexe: 2.0.0
 
+  which@4.0.0:
+    dependencies:
+      isexe: 3.1.5
+
   why-is-node-running@2.3.0:
     dependencies:
       siginfo: 2.0.0
       stackback: 0.0.2
 
+  widest-line@3.1.0:
+    dependencies:
+      string-width: 4.2.3
+
+  wordwrap@1.0.0: {}
+
   wrap-ansi@6.2.0:
     dependencies:
       ansi-styles: 4.3.0
@@ -11934,6 +12277,8 @@ snapshots:
       y18n: 5.0.8
       yargs-parser: 21.1.1
 
+  yarn@1.22.22: {}
+
   yauzl@2.10.0:
     dependencies:
       buffer-crc32: 0.2.13

From 6445e3327a8c0b0548278692d25b81289393bff2 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 18 Feb 2026 03:50:27 +0000
Subject: [PATCH 04/10] refactor(cli): convert dev command from Commander.js to
 oclif

Migrate the dev command to use oclif's class-based Command pattern with
static args/flags definitions instead of Commander.js's fluent API.

- Import Args, Command, Flags from @oclif/core
- Export default class Dev extending Command
- Define static args (package) and flags (watch, ui, verbose)
- Use this.parse(Dev) to extract args/flags
- Preserve all existing business logic unchanged

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 packages/cli/src/commands/dev.ts | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/cli/src/commands/dev.ts b/packages/cli/src/commands/dev.ts
index 6295921972..f9bf10c773 100644
--- a/packages/cli/src/commands/dev.ts
+++ b/packages/cli/src/commands/dev.ts
@@ -1,19 +1,29 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Args, Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import { execSync, spawn } from 'child_process';
 import fs from 'fs';
 import path from 'path';
 import { printHeader, printKV, printStep, printError } from '../utils/format.js';
 
-export const devCommand = new Command('dev')
-  .description('Start development mode with hot-reload')
-  .argument('[package]', 'Package name or filter pattern', 'all')
-  .option('-w, --watch', 'Enable watch mode (default)', true)
-  .option('--ui', 'Enable Studio UI at /_studio/')
-  .option('-v, --verbose', 'Verbose output')
-  .action(async (packageName, options) => {
+export default class Dev extends Command {
+  static override description = 'Start development mode with hot-reload';
+
+  static override args = {
+    package: Args.string({ description: 'Package name or filter pattern', default: 'all', required: false }),
+  };
+
+  static override flags = {
+    watch: Flags.boolean({ char: 'w', description: 'Enable watch mode (default)', default: true }),
+    ui: Flags.boolean({ description: 'Enable Studio UI at /_studio/' }),
+    verbose: Flags.boolean({ char: 'v', description: 'Verbose output' }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(Dev);
+    const packageName = args.package;
+
     printHeader('Development Mode');
     
     // Check if we are running inside a package (Single Package Mode)
@@ -28,7 +38,7 @@ export const devCommand = new Command('dev')
        // usage: objectstack serve --dev
        const binPath = process.argv[1]; // path to objectstack bin
        
-       const child = spawn(process.execPath, [binPath, 'serve', '--dev', ...(options.ui ? ['--ui'] : []), ...(options.verbose ? ['--verbose'] : [])], {
+       const child = spawn(process.execPath, [binPath, 'serve', '--dev', ...(flags.ui ? ['--ui'] : []), ...(flags.verbose ? ['--verbose'] : [])], {
          stdio: 'inherit',
          env: { ...process.env, NODE_ENV: 'development' }
        });
@@ -69,4 +79,5 @@ export const devCommand = new Command('dev')
       printError(`Development mode failed: ${error.message || error}`);
       process.exit(1);
     }
-  });
+  }
+}

From 037af7c543f85aeb156e3e1eaa0ef324dc621035 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 18 Feb 2026 03:53:54 +0000
Subject: [PATCH 05/10] refactor(cli): convert serve, studio, validate commands
 from Commander.js to oclif

Convert three CLI command files from Commander.js pattern (named exports
with chained .description/.argument/.option/.action) to oclif class-based
pattern (default class exports with static args/flags and async run()).

- serve.ts: Serve class with port, dev, ui, server flags
- studio.ts: Studio class with config arg and port flag
- validate.ts: Validate class with config arg, strict and json flags
- Replace process.exit(1) with this.exit(1) in command context
- Replace options.X with flags.X, positional args with args.X

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 packages/cli/src/commands/serve.ts    | 50 +++++++++++++++----------
 packages/cli/src/commands/studio.ts   | 32 ++++++++++------
 packages/cli/src/commands/validate.ts | 54 ++++++++++++++++-----------
 3 files changed, 83 insertions(+), 53 deletions(-)

diff --git a/packages/cli/src/commands/serve.ts b/packages/cli/src/commands/serve.ts
index aa81df6a25..c8a5bfb177 100644
--- a/packages/cli/src/commands/serve.ts
+++ b/packages/cli/src/commands/serve.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Args, Command, Flags } from '@oclif/core';
 import path from 'path';
 import fs from 'fs';
 import net from 'net';
@@ -48,15 +48,24 @@ const getAvailablePort = async (startPort: number): Promise<number> => {
   return port;
 };
 
-export const serveCommand = new Command('serve')
-  .description('Start ObjectStack server with plugins from configuration')
-  .argument('[config]', 'Configuration file path', 'objectstack.config.ts')
-  .option('-p, --port <port>', 'Server port', '3000')
-  .option('--dev', 'Run in development mode (load devPlugins)')
-  .option('--ui', 'Enable Studio UI at /_studio/ (default: true in dev mode)')
-  .option('--no-server', 'Skip starting HTTP server plugin')
-  .action(async (configPath, options) => {
-    let port = parseInt(options.port);
+export default class Serve extends Command {
+  static override description = 'Start ObjectStack server with plugins from configuration';
+
+  static override args = {
+    config: Args.string({ description: 'Configuration file path', required: false, default: 'objectstack.config.ts' }),
+  };
+
+  static override flags = {
+    port: Flags.string({ char: 'p', description: 'Server port', default: '3000' }),
+    dev: Flags.boolean({ description: 'Run in development mode (load devPlugins)' }),
+    ui: Flags.boolean({ description: 'Enable Studio UI at /_studio/ (default: true in dev mode)' }),
+    server: Flags.boolean({ description: 'Start HTTP server plugin', default: true, allowNo: true }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(Serve);
+
+    let port = parseInt(flags.port);
     try {
       const availablePort = await getAvailablePort(port);
       if (availablePort !== port) {
@@ -66,15 +75,15 @@ export const serveCommand = new Command('serve')
       // Ignore error and try with original port
     }
 
-    const isDev = options.dev || process.env.NODE_ENV === 'development';
+    const isDev = flags.dev || process.env.NODE_ENV === 'development';
 
-    const absolutePath = path.resolve(process.cwd(), configPath);
+    const absolutePath = path.resolve(process.cwd(), args.config!);
     const relativeConfig = path.relative(process.cwd(), absolutePath);
     
     if (!fs.existsSync(absolutePath)) {
       printError(`Configuration file not found: ${absolutePath}`);
       console.log(chalk.dim('  Hint: Run `objectstack init` to create a new project'));
-      process.exit(1);
+      this.exit(1);
     }
 
     // Quiet loading — only show a single spinner line
@@ -106,7 +115,7 @@ export const serveCommand = new Command('serve')
       console.debug = originalConsoleDebug;
     };
 
-    const portShifted = parseInt(options.port) !== port;
+    const portShifted = parseInt(flags.port) !== port;
 
     try {
       // ── Suppress ALL runtime noise during boot ────────────────────
@@ -131,7 +140,7 @@ export const serveCommand = new Command('serve')
       const config = mod.default || mod;
 
       if (!config) {
-        throw new Error(`No default export found in ${configPath}`);
+        throw new Error(`No default export found in ${args.config}`);
       }
 
       // Import ObjectStack runtime
@@ -151,7 +160,7 @@ export const serveCommand = new Command('serve')
       let plugins = config.plugins || [];
 
       // Merge devPlugins if in dev mode
-      if (options.dev && config.devPlugins) {
+      if (flags.dev && config.devPlugins) {
         plugins = [...plugins, ...config.devPlugins];
       }
 
@@ -228,7 +237,7 @@ export const serveCommand = new Command('serve')
       }
 
       // Add HTTP server plugin if not disabled
-      if (options.server !== false) {
+      if (flags.server) {
         try {
           const { HonoServerPlugin } = await import('@objectstack/plugin-hono-server');
           const serverPlugin = new HonoServerPlugin({ port });
@@ -260,7 +269,7 @@ export const serveCommand = new Command('serve')
       // ── Studio UI ─────────────────────────────────────────────────
       // In dev mode, Studio UI is enabled by default (use --no-ui to disable).
       // Always serves the pre-built dist/ — no Vite dev server, no extra port.
-      const enableUI = options.ui ?? isDev;
+      const enableUI = flags.ui || isDev;
 
       if (enableUI) {
         const studioPath = resolveStudioPath();
@@ -306,6 +315,7 @@ export const serveCommand = new Command('serve')
       console.log('');
       printError(error.message || String(error));
       if (process.env.DEBUG) console.error(chalk.dim(error.stack));
-      process.exit(1);
+      this.exit(1);
     }
-  });
+  }
+}
diff --git a/packages/cli/src/commands/studio.ts b/packages/cli/src/commands/studio.ts
index afd095c95e..42efc9f796 100644
--- a/packages/cli/src/commands/studio.ts
+++ b/packages/cli/src/commands/studio.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Args, Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import { spawn } from 'child_process';
 import { printHeader, printKV, printStep } from '../utils/format.js';
@@ -12,11 +12,20 @@ import { printHeader, printKV, printStep } from '../utils/format.js';
  * Starts the ObjectStack server in development mode with the Studio
  * UI available at http://localhost:<port>/_studio/
  */
-export const studioCommand = new Command('studio')
-  .description('Launch Studio UI with development server')
-  .argument('[config]', 'Configuration file path', 'objectstack.config.ts')
-  .option('-p, --port <port>', 'Server port', '3000')
-  .action(async (configPath, options) => {
+export default class Studio extends Command {
+  static override description = 'Launch Studio UI with development server';
+
+  static override args = {
+    config: Args.string({ description: 'Configuration file path', required: false, default: 'objectstack.config.ts' }),
+  };
+
+  static override flags = {
+    port: Flags.string({ char: 'p', description: 'Server port', default: '3000' }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(Studio);
+
     printHeader('Studio');
     printKV('Mode', 'dev + ui', '🎨');
     printStep('Delegating to serve --dev --ui …');
@@ -24,19 +33,20 @@ export const studioCommand = new Command('studio')
 
     // Delegate to the serve command with --dev --ui flags
     const binPath = process.argv[1];
-    const args = [
+    const spawnArgs = [
       binPath,
       'serve',
-      configPath,
+      args.config!,
       '--dev',
       '--ui',
-      '--port', options.port,
+      '--port', flags.port,
     ];
 
-    const child = spawn(process.execPath, args, {
+    const child = spawn(process.execPath, spawnArgs, {
       stdio: 'inherit',
       env: { ...process.env, NODE_ENV: 'development' },
     });
 
     child.on('exit', (code) => process.exit(code ?? 0));
-  });
+  }
+}
diff --git a/packages/cli/src/commands/validate.ts b/packages/cli/src/commands/validate.ts
index c1872594f9..9e13861347 100644
--- a/packages/cli/src/commands/validate.ts
+++ b/packages/cli/src/commands/validate.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Args, Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import { ZodError } from 'zod';
 import { ObjectStackDefinitionSchema, normalizeStackInput } from '@objectstack/spec';
@@ -17,53 +17,62 @@ import {
   printMetadataStats,
 } from '../utils/format.js';
 
-export const validateCommand = new Command('validate')
-  .description('Validate ObjectStack configuration against the protocol schema')
-  .argument('[config]', 'Configuration file path')
-  .option('--strict', 'Treat warnings as errors')
-  .option('--json', 'Output results as JSON')
-  .action(async (configPath, options) => {
+export default class Validate extends Command {
+  static override description = 'Validate ObjectStack configuration against the protocol schema';
+
+  static override args = {
+    config: Args.string({ description: 'Configuration file path', required: false }),
+  };
+
+  static override flags = {
+    strict: Flags.boolean({ description: 'Treat warnings as errors' }),
+    json: Flags.boolean({ description: 'Output results as JSON' }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(Validate);
+
     const timer = createTimer();
     
-    if (!options.json) {
+    if (!flags.json) {
       printHeader('Validate');
     }
 
     try {
       // 1. Load configuration
-      if (!options.json) printStep('Loading configuration...');
-      const { config, absolutePath, duration } = await loadConfig(configPath);
+      if (!flags.json) printStep('Loading configuration...');
+      const { config, absolutePath, duration } = await loadConfig(args.config);
       
-      if (!options.json) {
+      if (!flags.json) {
         printKV('Config', absolutePath);
         printKV('Load time', `${duration}ms`);
       }
 
       // 2. Normalize map-formatted stack definition and validate against schema
-      if (!options.json) printStep('Validating against ObjectStack Protocol...');
+      if (!flags.json) printStep('Validating against ObjectStack Protocol...');
       const normalized = normalizeStackInput(config as Record<string, unknown>);
       const result = ObjectStackDefinitionSchema.safeParse(normalized);
 
       if (!result.success) {
-        if (options.json) {
+        if (flags.json) {
           console.log(JSON.stringify({
             valid: false,
             errors: (result.error as unknown as ZodError).issues,
             duration: timer.elapsed(),
           }, null, 2));
-          process.exit(1);
+          this.exit(1);
         }
 
         console.log('');
         printError('Validation failed');
         formatZodErrors(result.error as unknown as ZodError);
-        process.exit(1);
+        this.exit(1);
       }
 
       // 3. Collect and display stats
       const stats = collectMetadataStats(config);
 
-      if (options.json) {
+      if (flags.json) {
         console.log(JSON.stringify({
           valid: true,
           manifest: config.manifest,
@@ -109,25 +118,26 @@ export const validateCommand = new Command('validate')
         for (const w of warnings) {
           console.log(chalk.yellow(`  ⚠ ${w}`));
         }
-        if (options.strict) {
+        if (flags.strict) {
           console.log('');
           printError('Strict mode: warnings treated as errors');
-          process.exit(1);
+          this.exit(1);
         }
       }
 
       console.log('');
     } catch (error: any) {
-      if (options.json) {
+      if (flags.json) {
         console.log(JSON.stringify({
           valid: false,
           error: error.message,
           duration: timer.elapsed(),
         }, null, 2));
-        process.exit(1);
+        this.exit(1);
       }
       console.log('');
       printError(error.message || String(error));
-      process.exit(1);
+      this.exit(1);
     }
-  });
+  }
+}

From c16d5a2bc62e9510fb9c275d4edfe5b38891c044 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 18 Feb 2026 04:00:09 +0000
Subject: [PATCH 06/10] refactor(cli): convert info, create, generate commands
 from Commander.js to oclif

Convert three CLI command files from Commander.js pattern to oclif pattern:
- info.ts: Convert to oclif Command class with Args/Flags
- create.ts: Convert to oclif Command class, preserve exported templates
- generate.ts: Convert main command and sub-commands to oclif pattern,
  extract internal Commander sub-commands into plain async functions

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 packages/cli/src/commands/create.ts   |  48 +++++---
 packages/cli/src/commands/generate.ts | 171 ++++++++++++--------------
 packages/cli/src/commands/info.ts     |  31 +++--
 3 files changed, 130 insertions(+), 120 deletions(-)

diff --git a/packages/cli/src/commands/create.ts b/packages/cli/src/commands/create.ts
index cdd8523397..922ee08f87 100644
--- a/packages/cli/src/commands/create.ts
+++ b/packages/cli/src/commands/create.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Args, Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import fs from 'fs';
 import path from 'path';
@@ -182,37 +182,46 @@ function toCamelCase(str: string): string {
   return str.replace(/-([a-z])/g, (g) => g[1].toUpperCase());
 }
 
-export const createCommand = new Command('create')
-  .description('Create a new package, plugin, or example from template')
-  .argument('<type>', 'Type of project to create (plugin, example)')
-  .argument('[name]', 'Name of the project')
-  .option('-d, --dir <directory>', 'Target directory')
-  .action(async (type: string, name?: string, options?: { dir?: string }) => {
+export default class Create extends Command {
+  static override description = 'Create a new package, plugin, or example from template';
+
+  static override args = {
+    type: Args.string({ description: 'Type of project to create (plugin, example)', required: true }),
+    name: Args.string({ description: 'Name of the project', required: false }),
+  };
+
+  static override flags = {
+    dir: Flags.string({ char: 'd', description: 'Target directory' }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(Create);
+
     console.log(chalk.bold(`\n📦 ObjectStack Project Creator`));
     console.log(chalk.dim(`-------------------------------`));
     
-    if (!templates[type as keyof typeof templates]) {
-      console.error(chalk.red(`\n❌ Unknown type: ${type}`));
+    if (!templates[args.type as keyof typeof templates]) {
+      console.error(chalk.red(`\n❌ Unknown type: ${args.type}`));
       console.log(chalk.dim('Available types: plugin, example'));
       process.exit(1);
     }
     
-    if (!name) {
+    if (!args.name) {
       console.error(chalk.red('\n❌ Project name is required'));
-      console.log(chalk.dim(`Usage: objectstack create ${type} <name>`));
+      console.log(chalk.dim(`Usage: objectstack create ${args.type} <name>`));
       process.exit(1);
     }
     
-    const template = templates[type as keyof typeof templates];
+    const template = templates[args.type as keyof typeof templates];
     const cwd = process.cwd();
     
     // Determine target directory
     let targetDir: string;
-    if (options?.dir) {
-      targetDir = path.resolve(cwd, options.dir);
+    if (flags.dir) {
+      targetDir = path.resolve(cwd, flags.dir);
     } else {
-      const baseDir = type === 'plugin' ? 'packages/plugins' : 'examples';
-      const projectName = type === 'plugin' ? `plugin-${name}` : name;
+      const baseDir = args.type === 'plugin' ? 'packages/plugins' : 'examples';
+      const projectName = args.type === 'plugin' ? `plugin-${args.name}` : args.name;
       targetDir = path.join(cwd, baseDir, projectName);
     }
     
@@ -222,7 +231,7 @@ export const createCommand = new Command('create')
       process.exit(1);
     }
     
-    console.log(`📁 Creating ${type}: ${chalk.blue(name)}`);
+    console.log(`📁 Creating ${args.type}: ${chalk.blue(args.name)}`);
     console.log(`📂 Location: ${chalk.dim(targetDir)}`);
     console.log('');
     
@@ -239,7 +248,7 @@ export const createCommand = new Command('create')
           fs.mkdirSync(dir, { recursive: true });
         }
         
-        const content = contentFn(name);
+        const content = contentFn(args.name);
         const fileContent = typeof content === 'string' 
           ? content 
           : JSON.stringify(content, null, 2);
@@ -268,4 +277,5 @@ export const createCommand = new Command('create')
       
       process.exit(1);
     }
-  });
+  }
+}
diff --git a/packages/cli/src/commands/generate.ts b/packages/cli/src/commands/generate.ts
index f8c06b25c9..e7d33f309f 100644
--- a/packages/cli/src/commands/generate.ts
+++ b/packages/cli/src/commands/generate.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Args, Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import fs from 'fs';
 import path from 'path';
@@ -305,14 +305,7 @@ function generateTypesFromConfig(config: Record<string, unknown>): string {
 
 // ─── Command ────────────────────────────────────────────────────────
 
-const generateMetadataCommand = new Command('metadata')
-  .alias('m')
-  .description('Generate metadata scaffold (object, view, action, flow, agent, dashboard, app)')
-  .argument('<type>', 'Metadata type to generate')
-  .argument('<name>', 'Name for the metadata (use kebab-case)')
-  .option('-d, --dir <directory>', 'Target directory (overrides default)')
-  .option('--dry-run', 'Show what would be created without writing files')
-  .action(async (type: string, name: string, options) => {
+async function runMetadataGeneration(type: string, name: string, flags: { dir?: string; dryRun?: boolean }): Promise<void> {
     printHeader('Generate');
 
     const generator = GENERATORS[type];
@@ -330,7 +323,7 @@ const generateMetadataCommand = new Command('metadata')
       process.exit(1);
     }
 
-    const dir = options.dir || generator.defaultDir;
+    const dir = flags.dir || generator.defaultDir;
     const fileName = `${toSnakeCase(name)}.ts`;
     const filePath = path.join(process.cwd(), dir, fileName);
 
@@ -339,7 +332,7 @@ const generateMetadataCommand = new Command('metadata')
     console.log(`  ${chalk.dim('File:')}  ${chalk.white(path.join(dir, fileName))}`);
     console.log('');
 
-    if (options.dryRun) {
+    if (flags.dryRun) {
       printInfo('Dry run — no files written');
       console.log('');
       console.log(chalk.dim('  Content:'));
@@ -395,14 +388,9 @@ const generateMetadataCommand = new Command('metadata')
       printError(error.message || String(error));
       process.exit(1);
     }
-  });
-
-const generateTypesCommand = new Command('types')
-  .description('Generate TypeScript type definitions from ObjectStack configuration')
-  .argument('[config]', 'Configuration file path')
-  .option('-o, --output <file>', 'Output file path', 'src/types/objectstack.d.ts')
-  .option('--dry-run', 'Show what would be generated without writing files')
-  .action(async (configPath, options) => {
+}
+
+async function runTypesGeneration(configPath: string | undefined, flags: { output: string; dryRun?: boolean }): Promise<void> {
     printHeader('Generate Types');
 
     try {
@@ -411,12 +399,12 @@ const generateTypesCommand = new Command('types')
       const { config, absolutePath } = await loadConfig(configPath);
 
       console.log(`  ${chalk.dim('Config:')} ${chalk.white(absolutePath)}`);
-      console.log(`  ${chalk.dim('Output:')} ${chalk.white(options.output)}`);
+      console.log(`  ${chalk.dim('Output:')} ${chalk.white(flags.output)}`);
       console.log('');
 
       const content = generateTypesFromConfig(config as Record<string, unknown>);
 
-      if (options.dryRun) {
+      if (flags.dryRun) {
         printInfo('Dry run — no files written');
         console.log('');
         for (const line of content.split('\n')) {
@@ -426,20 +414,20 @@ const generateTypesCommand = new Command('types')
         return;
       }
 
-      const outPath = path.resolve(process.cwd(), options.output);
+      const outPath = path.resolve(process.cwd(), flags.output);
       const outDir = path.dirname(outPath);
       if (!fs.existsSync(outDir)) {
         fs.mkdirSync(outDir, { recursive: true });
       }
       fs.writeFileSync(outPath, content);
-      printSuccess(`Generated types at ${options.output}`);
+      printSuccess(`Generated types at ${flags.output}`);
       console.log('');
 
     } catch (error: any) {
       printError(error.message || String(error));
       process.exit(1);
     }
-  });
+}
 
 // ─── Client SDK Generator ───────────────────────────────────────────
 
@@ -541,12 +529,7 @@ function generateClientFromConfig(config: Record<string, unknown>): string {
   return lines.join('\n') + '\n';
 }
 
-const generateClientCommand = new Command('client')
-  .description('Generate a type-safe client SDK from ObjectStack configuration')
-  .argument('[config]', 'Configuration file path')
-  .option('-o, --output <file>', 'Output file path', 'src/client/objectstack-client.ts')
-  .option('--dry-run', 'Show output without writing')
-  .action(async (configPath, options) => {
+async function runClientGeneration(configPath: string | undefined, flags: { output: string; dryRun?: boolean }): Promise<void> {
     printHeader('Generate Client SDK');
 
     try {
@@ -556,13 +539,13 @@ const generateClientCommand = new Command('client')
       const { config, absolutePath } = await loadConfig(configPath);
 
       console.log(`  ${chalk.dim('Config:')} ${chalk.white(absolutePath)}`);
-      console.log(`  ${chalk.dim('Output:')} ${chalk.white(options.output)}`);
+      console.log(`  ${chalk.dim('Output:')} ${chalk.white(flags.output)}`);
       console.log('');
 
       printStep('Generating client SDK...');
       const content = generateClientFromConfig(config as Record<string, unknown>);
 
-      if (options.dryRun) {
+      if (flags.dryRun) {
         printInfo('Dry run — no files written');
         console.log('');
         for (const line of content.split('\n')) {
@@ -572,20 +555,20 @@ const generateClientCommand = new Command('client')
         return;
       }
 
-      const outPath = path.resolve(process.cwd(), options.output);
+      const outPath = path.resolve(process.cwd(), flags.output);
       const outDir = path.dirname(outPath);
       if (!fs.existsSync(outDir)) {
         fs.mkdirSync(outDir, { recursive: true });
       }
       fs.writeFileSync(outPath, content);
-      printSuccess(`Generated client SDK at ${options.output} (${timer.display()})`);
+      printSuccess(`Generated client SDK at ${flags.output} (${timer.display()})`);
       console.log('');
 
     } catch (error: any) {
       printError(error.message || String(error));
       process.exit(1);
     }
-  });
+}
 
 // ─── Migration Generator ────────────────────────────────────────────
 
@@ -777,13 +760,7 @@ function generateMigrationTs(config: Record<string, unknown>): string {
   return lines.join('\n') + '\n';
 }
 
-const generateMigrationCommand = new Command('migration')
-  .description('Generate database migration from ObjectStack schema')
-  .argument('[config]', 'Configuration file path')
-  .option('-o, --output <file>', 'Output file path')
-  .option('--format <format>', 'Output format: sql or typescript', 'typescript')
-  .option('--dry-run', 'Show output without writing')
-  .action(async (configPath, options) => {
+async function runMigrationGeneration(configPath: string | undefined, flags: { output?: string; format: string; dryRun?: boolean }): Promise<void> {
     printHeader('Generate Migration');
 
     try {
@@ -792,23 +769,23 @@ const generateMigrationCommand = new Command('migration')
       printInfo('Loading configuration...');
       const { config, absolutePath } = await loadConfig(configPath);
 
-      const ext = options.format === 'sql' ? 'sql' : 'ts';
+      const ext = flags.format === 'sql' ? 'sql' : 'ts';
       // Format: YYYYMMDDHHmmss (e.g. 20250101120000)
       const timestamp = new Date().toISOString().replace(/[-:T]/g, '').slice(0, 14);
       const defaultOutput = `migrations/${timestamp}_migration.${ext}`;
-      const output = options.output || defaultOutput;
+      const output = flags.output || defaultOutput;
 
       console.log(`  ${chalk.dim('Config:')} ${chalk.white(absolutePath)}`);
-      console.log(`  ${chalk.dim('Format:')} ${chalk.white(options.format)}`);
+      console.log(`  ${chalk.dim('Format:')} ${chalk.white(flags.format)}`);
       console.log(`  ${chalk.dim('Output:')} ${chalk.white(output)}`);
       console.log('');
 
       printStep('Generating migration...');
-      const content = options.format === 'sql'
+      const content = flags.format === 'sql'
         ? generateMigrationSql(config as Record<string, unknown>)
         : generateMigrationTs(config as Record<string, unknown>);
 
-      if (options.dryRun) {
+      if (flags.dryRun) {
         printInfo('Dry run — no files written');
         console.log('');
         for (const line of content.split('\n')) {
@@ -831,15 +808,11 @@ const generateMigrationCommand = new Command('migration')
       printError(error.message || String(error));
       process.exit(1);
     }
-  });
+}
 
 // ─── JSON Schema Generator ──────────────────────────────────────────
 
-const generateSchemaCommand = new Command('schema')
-  .description('Generate JSON Schema for objectstack.config.ts (for IDE autocomplete)')
-  .option('-o, --output <file>', 'Output file path', 'objectstack.schema.json')
-  .option('--dry-run', 'Show output without writing')
-  .action(async (options) => {
+async function runSchemaGeneration(flags: { output: string; dryRun?: boolean }): Promise<void> {
     printHeader('Generate Schema');
 
     try {
@@ -864,20 +837,20 @@ const generateSchemaCommand = new Command('schema')
 
       const content = JSON.stringify(schema, null, 2) + '\n';
 
-      if (options.dryRun) {
+      if (flags.dryRun) {
         printInfo('Dry run — no files written');
         console.log('');
         console.log(content);
         return;
       }
 
-      const outPath = path.resolve(process.cwd(), options.output);
+      const outPath = path.resolve(process.cwd(), flags.output);
       const outDir = path.dirname(outPath);
       if (!fs.existsSync(outDir)) {
         fs.mkdirSync(outDir, { recursive: true });
       }
       fs.writeFileSync(outPath, content);
-      printSuccess(`Generated JSON Schema at ${options.output} (${timer.display()})`);
+      printSuccess(`Generated JSON Schema at ${flags.output} (${timer.display()})`);
       console.log('');
       console.log(chalk.dim('  Usage: Reference in your IDE or editor for autocomplete'));
       console.log(chalk.dim(`  Path:  ${outPath}`));
@@ -887,47 +860,65 @@ const generateSchemaCommand = new Command('schema')
       printError(error.message || String(error));
       process.exit(1);
     }
-  });
+}
 
 // ─── Main Generate Command ──────────────────────────────────────────
 
-export const generateCommand = new Command('generate')
-  .alias('g')
-  .description('Generate metadata files or TypeScript types')
-  .argument('[type]', 'Metadata type to generate (object, view, action, flow, agent, dashboard, app)')
-  .argument('[name]', 'Name for the metadata (use kebab-case)')
-  .option('-d, --dir <directory>', 'Target directory (overrides default)')
-  .option('--dry-run', 'Show what would be created without writing files')
-  .addCommand(generateTypesCommand)
-  .addCommand(generateClientCommand)
-  .addCommand(generateMigrationCommand)
-  .addCommand(generateSchemaCommand)
-  .action(async (type: string | undefined, name: string | undefined, options) => {
-    if (!type) {
-      printHeader('Generate');
-      console.log(chalk.bold('  Sub-commands:'));
-      console.log(`    ${chalk.cyan('types'.padEnd(12))} Generate TypeScript type definitions from config`);
-      console.log(`    ${chalk.cyan('client'.padEnd(12))} Generate a type-safe client SDK from config`);
-      console.log(`    ${chalk.cyan('migration'.padEnd(12))} Generate database migration from schema`);
-      console.log(`    ${chalk.cyan('schema'.padEnd(12))} Generate JSON Schema for objectstack.config.ts (IDE autocomplete)`);
-      console.log('');
-      console.log(chalk.bold('  Metadata types:'));
-      for (const [key, gen] of Object.entries(GENERATORS)) {
-        console.log(`    ${chalk.cyan(key.padEnd(12))} ${chalk.dim(gen.description)}`);
-      }
-      console.log('');
-      console.log(chalk.dim('  Usage: objectstack generate <type> <name>'));
-      console.log(chalk.dim('  Usage: objectstack generate types [config]'));
-      return;
+export default class Generate extends Command {
+  static override description = 'Generate metadata files or TypeScript types';
+
+  static override aliases = ['g'];
+
+  static override args = {
+    type: Args.string({ description: 'Metadata type to generate (object, view, action, flow, agent, dashboard, app)', required: true }),
+    name: Args.string({ description: 'Name for the metadata (use kebab-case)', required: false }),
+  };
+
+  static override flags = {
+    dir: Flags.string({ char: 'd', description: 'Target directory (overrides default)' }),
+    'dry-run': Flags.boolean({ description: 'Show what would be created without writing files' }),
+    output: Flags.string({ char: 'o', description: 'Output file path' }),
+    format: Flags.string({ description: 'Output format: sql or typescript', default: 'typescript' }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(Generate);
+
+    // Route to sub-commands by type name
+    switch (args.type) {
+      case 'types':
+        return runTypesGeneration(args.name, {
+          output: flags.output ?? 'src/types/objectstack.d.ts',
+          dryRun: flags['dry-run'],
+        });
+      case 'client':
+        return runClientGeneration(args.name, {
+          output: flags.output ?? 'src/client/objectstack-client.ts',
+          dryRun: flags['dry-run'],
+        });
+      case 'migration':
+        return runMigrationGeneration(args.name, {
+          output: flags.output,
+          format: flags.format ?? 'typescript',
+          dryRun: flags['dry-run'],
+        });
+      case 'schema':
+        return runSchemaGeneration({
+          output: flags.output ?? 'objectstack.schema.json',
+          dryRun: flags['dry-run'],
+        });
     }
 
-    // Delegate to metadata command action
-    if (!name) {
+    // Metadata generation
+    if (!args.name) {
       printError('Missing required argument: <name>');
       console.log(chalk.dim('  Usage: objectstack generate <type> <name>'));
       process.exit(1);
     }
 
-    // Execute metadata generation inline
-    await generateMetadataCommand.parseAsync([type, name, ...process.argv.slice(4)], { from: 'user' });
-  });
+    await runMetadataGeneration(args.type, args.name, {
+      dir: flags.dir,
+      dryRun: flags['dry-run'],
+    });
+  }
+}
diff --git a/packages/cli/src/commands/info.ts b/packages/cli/src/commands/info.ts
index 2dd37d7a61..18130b5296 100644
--- a/packages/cli/src/commands/info.ts
+++ b/packages/cli/src/commands/info.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Args, Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import { normalizeStackInput } from '@objectstack/spec';
 import { loadConfig } from '../utils/config.js';
@@ -15,23 +15,31 @@ import {
   printMetadataStats,
 } from '../utils/format.js';
 
-export const infoCommand = new Command('info')
-  .description('Display metadata summary of an ObjectStack configuration')
-  .argument('[config]', 'Configuration file path')
-  .option('--json', 'Output as JSON')
-  .action(async (configPath, options) => {
+export default class Info extends Command {
+  static override description = 'Display metadata summary of an ObjectStack configuration';
+
+  static override args = {
+    config: Args.string({ description: 'Configuration file path', required: false }),
+  };
+
+  static override flags = {
+    json: Flags.boolean({ description: 'Output as JSON' }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(Info);
     const timer = createTimer();
 
-    if (!options.json) {
+    if (!flags.json) {
       printHeader('Info');
     }
 
     try {
-      const { config: rawConfig, absolutePath, duration } = await loadConfig(configPath);
+      const { config: rawConfig, absolutePath, duration } = await loadConfig(args.config);
       const config: any = normalizeStackInput(rawConfig as Record<string, unknown>);
       const stats = collectMetadataStats(config);
 
-      if (options.json) {
+      if (flags.json) {
         console.log(JSON.stringify({
           config: absolutePath,
           manifest: config.manifest || null,
@@ -104,7 +112,7 @@ export const infoCommand = new Command('info')
       console.log('');
 
     } catch (error: any) {
-      if (options.json) {
+      if (flags.json) {
         console.log(JSON.stringify({ error: error.message }));
         process.exit(1);
       }
@@ -112,4 +120,5 @@ export const infoCommand = new Command('info')
       printError(error.message || String(error));
       process.exit(1);
     }
-  });
+  }
+}

From cca99fdcce4dd2e40560542fee6a3e0a59a91f04 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 18 Feb 2026 04:03:40 +0000
Subject: [PATCH 07/10] refactor(cli): convert commands from Commander.js to
 oclif format

Convert test, doctor, lint, and diff commands from Commander.js pattern
to oclif class-based pattern with Args/Flags static properties.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 packages/cli/src/commands/diff.ts   | 47 +++++++++++++++++------------
 packages/cli/src/commands/doctor.ts | 27 +++++++++++------
 packages/cli/src/commands/lint.ts   | 38 ++++++++++++++---------
 packages/cli/src/commands/test.ts   | 31 +++++++++++++------
 4 files changed, 90 insertions(+), 53 deletions(-)

diff --git a/packages/cli/src/commands/diff.ts b/packages/cli/src/commands/diff.ts
index 50ebc29eda..492f243810 100644
--- a/packages/cli/src/commands/diff.ts
+++ b/packages/cli/src/commands/diff.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Args, Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import { loadConfig } from '../utils/config.js';
 import {
@@ -153,19 +153,27 @@ function diffNamedArrays(
 
 // ─── Command ────────────────────────────────────────────────────────
 
-export const diffCommand = new Command('diff')
-  .description('Compare two ObjectStack configurations and detect breaking changes')
-  .argument('[before]', 'Path to the "before" config file')
-  .argument('[after]', 'Path to the "after" config file')
-  .option('--before <path>', 'Path to the "before" config (alternative)')
-  .option('--after <path>', 'Path to the "after" config (alternative)')
-  .option('--json', 'Output as JSON')
-  .option('--breaking-only', 'Show only breaking changes')
-  .action(async (beforeArg, afterArg, options) => {
+export default class Diff extends Command {
+  static override description = 'Compare two ObjectStack configurations and detect breaking changes';
+
+  static override args = {
+    before: Args.string({ description: 'Path to the "before" config file', required: false }),
+    after: Args.string({ description: 'Path to the "after" config file', required: false }),
+  };
+
+  static override flags = {
+    before: Flags.string({ description: 'Path to the "before" config (alternative)' }),
+    after: Flags.string({ description: 'Path to the "after" config (alternative)' }),
+    json: Flags.boolean({ description: 'Output as JSON' }),
+    'breaking-only': Flags.boolean({ description: 'Show only breaking changes' }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(Diff);
     const timer = createTimer();
 
-    const beforePath: string | undefined = beforeArg || options.before;
-    const afterPath: string | undefined = afterArg || options.after;
+    const beforePath: string | undefined = args.before || flags.before;
+    const afterPath: string | undefined = args.after || flags.after;
 
     if (!beforePath || !afterPath) {
       printError('Two config file paths are required.');
@@ -175,7 +183,7 @@ export const diffCommand = new Command('diff')
       process.exit(1);
     }
 
-    if (!options.json) {
+    if (!flags.json) {
       printHeader('Diff');
       printStep('Loading configurations...');
     }
@@ -184,7 +192,7 @@ export const diffCommand = new Command('diff')
       const { config: beforeConfig } = await loadConfig(beforePath);
       const { config: afterConfig } = await loadConfig(afterPath);
 
-      if (!options.json) {
+      if (!flags.json) {
         printInfo(`Before: ${chalk.white(beforePath)}`);
         printInfo(`After:  ${chalk.white(afterPath)}`);
       }
@@ -215,14 +223,14 @@ export const diffCommand = new Command('diff')
       }
 
       // ── Filter ──
-      const diffs = options.breakingOnly
+      const diffs = flags['breaking-only']
         ? allDiffs.filter((d) => d.breaking)
         : allDiffs;
 
       const breakingCount = allDiffs.filter((d) => d.breaking).length;
 
       // ── Output ──
-      if (options.json) {
+      if (flags.json) {
         console.log(JSON.stringify({
           before: beforePath,
           after: afterPath,
@@ -237,7 +245,7 @@ export const diffCommand = new Command('diff')
       console.log('');
 
       if (diffs.length === 0) {
-        printSuccess(options.breakingOnly
+        printSuccess(flags['breaking-only']
           ? 'No breaking changes detected.'
           : 'No changes detected.');
         console.log('');
@@ -274,7 +282,7 @@ export const diffCommand = new Command('diff')
       console.log('');
 
     } catch (error: any) {
-      if (options.json) {
+      if (flags.json) {
         console.log(JSON.stringify({ error: error.message }));
         process.exit(1);
       }
@@ -282,4 +290,5 @@ export const diffCommand = new Command('diff')
       printError(error.message || String(error));
       process.exit(1);
     }
-  });
+  }
+}
diff --git a/packages/cli/src/commands/doctor.ts b/packages/cli/src/commands/doctor.ts
index 2e473bedcb..bf6205fc35 100644
--- a/packages/cli/src/commands/doctor.ts
+++ b/packages/cli/src/commands/doctor.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import { execSync } from 'child_process';
 import fs from 'fs';
@@ -299,11 +299,17 @@ function scanDeprecatedPatterns(dir: string): Array<{ file: string; line: number
 
 // ─── Command ────────────────────────────────────────────────────────
 
-export const doctorCommand = new Command('doctor')
-  .description('Check development environment and configuration health')
-  .option('-v, --verbose', 'Show detailed information')
-  .option('--scan-deprecations', 'Scan for deprecated ObjectStack patterns')
-  .action(async (options) => {
+export default class Doctor extends Command {
+  static override description = 'Check development environment and configuration health';
+
+  static override flags = {
+    verbose: Flags.boolean({ char: 'v', description: 'Show detailed information' }),
+    'scan-deprecations': Flags.boolean({ description: 'Scan for deprecated ObjectStack patterns' }),
+  };
+
+  async run(): Promise<void> {
+    const { flags } = await this.parse(Doctor);
+
     printHeader('Environment Health Check');
     
     const results: HealthCheckResult[] = [];
@@ -439,7 +445,7 @@ export const doctorCommand = new Command('doctor')
         printError(`${padded} ${result.message}`);
       }
       
-      if (result.fix && (options.verbose || result.status === 'error')) {
+      if (result.fix && (flags.verbose || result.status === 'error')) {
         console.log(chalk.dim(`      → ${result.fix}`));
       }
       
@@ -526,7 +532,7 @@ export const doctorCommand = new Command('doctor')
     }
 
     // ── Deprecation Pattern Scan ─────────────────────────────────────
-    if (options.scanDeprecations) {
+    if (flags['scan-deprecations']) {
       printStep('Scanning for deprecated ObjectStack patterns...');
       const scanDir = path.join(cwd, 'src');
       const deprecations = scanDeprecatedPatterns(scanDir);
@@ -534,7 +540,7 @@ export const doctorCommand = new Command('doctor')
         hasWarnings = true;
         for (const dep of deprecations) {
           printWarning(`${dep.file}:${dep.line} — ${dep.description}`);
-          if (options.verbose) {
+          if (flags.verbose) {
             console.log(chalk.dim(`      → ${dep.replacement}`));
           }
         }
@@ -562,4 +568,5 @@ export const doctorCommand = new Command('doctor')
     }
     
     console.log('');
-  });
+  }
+}
diff --git a/packages/cli/src/commands/lint.ts b/packages/cli/src/commands/lint.ts
index a03c586e98..694d9b7806 100644
--- a/packages/cli/src/commands/lint.ts
+++ b/packages/cli/src/commands/lint.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Args, Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import { normalizeStackInput } from '@objectstack/spec';
 import { loadConfig } from '../utils/config.js';
@@ -188,15 +188,24 @@ function lintConfig(config: any): LintIssue[] {
 
 // ─── Command ────────────────────────────────────────────────────────
 
-export const lintCommand = new Command('lint')
-  .description('Check ObjectStack configuration for style and convention issues')
-  .argument('[config]', 'Configuration file path')
-  .option('--json', 'Output as JSON')
-  .option('--fix', 'Show what would be fixed (dry-run)')
-  .action(async (configPath, options) => {
+export default class Lint extends Command {
+  static override description = 'Check ObjectStack configuration for style and convention issues';
+
+  static override args = {
+    config: Args.string({ description: 'Configuration file path', required: false }),
+  };
+
+  static override flags = {
+    json: Flags.boolean({ description: 'Output as JSON' }),
+    fix: Flags.boolean({ description: 'Show what would be fixed (dry-run)' }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(Lint);
+    const configPath = args.config;
     const timer = createTimer();
 
-    if (!options.json) {
+    if (!flags.json) {
       printHeader('Lint');
       printStep('Loading configuration...');
     }
@@ -204,7 +213,7 @@ export const lintCommand = new Command('lint')
     try {
       const { config, absolutePath } = await loadConfig(configPath);
 
-      if (!options.json) {
+      if (!flags.json) {
         printInfo(`Config: ${chalk.white(absolutePath)}`);
       }
 
@@ -212,7 +221,7 @@ export const lintCommand = new Command('lint')
       const issues = lintConfig(normalized);
 
       // ── JSON output ──
-      if (options.json) {
+      if (flags.json) {
         const errors = issues.filter((i) => i.severity === 'error');
         const warnings = issues.filter((i) => i.severity === 'warning');
         const suggestions = issues.filter((i) => i.severity === 'suggestion');
@@ -254,7 +263,7 @@ export const lintCommand = new Command('lint')
 
         console.log(`  ${color(icon)} ${color(issue.message)}`);
         console.log(chalk.dim(`    ${issue.rule}  at ${issue.path}`));
-        if (options.fix && issue.fix) {
+        if (flags.fix && issue.fix) {
           console.log(chalk.green(`    → fix: ${issue.fix}`));
         }
       };
@@ -284,7 +293,7 @@ export const lintCommand = new Command('lint')
       if (suggestions.length > 0) parts.push(chalk.blue(`${suggestions.length} suggestion(s)`));
       console.log(`  ${parts.join(', ')} ${chalk.dim(`(${timer.display()})`)}`);
 
-      if (options.fix) {
+      if (flags.fix) {
         console.log('');
         printInfo('Dry-run mode: no files were modified.');
       }
@@ -294,7 +303,7 @@ export const lintCommand = new Command('lint')
       if (errors.length > 0) process.exit(1);
 
     } catch (error: any) {
-      if (options.json) {
+      if (flags.json) {
         console.log(JSON.stringify({ error: error.message }));
         process.exit(1);
       }
@@ -302,4 +311,5 @@ export const lintCommand = new Command('lint')
       printError(error.message || String(error));
       process.exit(1);
     }
-  });
+  }
+}
diff --git a/packages/cli/src/commands/test.ts b/packages/cli/src/commands/test.ts
index 814a0869e5..62b521f425 100644
--- a/packages/cli/src/commands/test.ts
+++ b/packages/cli/src/commands/test.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Args, Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import path from 'path';
 import fs from 'fs';
@@ -52,18 +52,28 @@ function resolveGlob(pattern: string): string[] {
     .filter(fullPath => fs.statSync(fullPath).isFile());
 }
 
-export const testCommand = new Command('test')
-  .description('Run Quality Protocol test scenarios against a running server')
-  .argument('[files]', 'Glob pattern for test files (e.g. "qa/*.test.json")', 'qa/*.test.json')
-  .option('--url <url>', 'Target base URL', 'http://localhost:3000')
-  .option('--token <token>', 'Authentication token')
-  .action(async (filesPattern, options) => {
+export default class Test extends Command {
+  static override description = 'Run Quality Protocol test scenarios against a running server';
+
+  static override args = {
+    files: Args.string({ description: 'Glob pattern for test files (e.g. "qa/*.test.json")', required: false, default: 'qa/*.test.json' }),
+  };
+
+  static override flags = {
+    url: Flags.string({ description: 'Target base URL', default: 'http://localhost:3000' }),
+    token: Flags.string({ description: 'Authentication token' }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(Test);
+    const filesPattern = args.files;
+
     console.log(chalk.bold(`\n🧪 ObjectStack Quality Protocol Runner`));
     console.log(chalk.dim(`-------------------------------------`));
-    console.log(`Target: ${chalk.blue(options.url)}`);
+    console.log(`Target: ${chalk.blue(flags.url)}`);
     
     // 1. Setup Runner
-    const adapter = new CoreQA.HttpTestAdapter(options.url, options.token);
+    const adapter = new CoreQA.HttpTestAdapter(flags.url, flags.token);
     const runner = new CoreQA.TestRunner(adapter);
 
     // 2. Find test files using glob-style pattern matching
@@ -121,4 +131,5 @@ export const testCommand = new Command('test')
         console.log(chalk.green(`SUCCESS: All ${totalPassed} scenarios passed.`));
         process.exit(0);
     }
-  });
+  }
+}

From a38003741f5a91ac2f1c41ad9cc08bfd8d795c5f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 18 Feb 2026 04:07:39 +0000
Subject: [PATCH 08/10] refactor(cli): migrate explain and codemod commands
 from Commander.js to oclif

- Convert explain command to oclif class pattern with Args/Flags
- Split codemod command into codemod/v2-to-v3.ts subcommand
- Delete old codemod.ts (oclif auto-discovers subcommands from directory)
- Update bin.ts to remove Commander.js imports and addCommand calls

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 packages/cli/src/bin.ts                       |  6 +--
 .../{codemod.ts => codemod/v2-to-v3.ts}       | 49 ++++++++-----------
 packages/cli/src/commands/explain.ts          | 30 ++++++++----
 3 files changed, 43 insertions(+), 42 deletions(-)
 rename packages/cli/src/commands/{codemod.ts => codemod/v2-to-v3.ts} (76%)

diff --git a/packages/cli/src/bin.ts b/packages/cli/src/bin.ts
index a72e35e262..e79c7f0104 100644
--- a/packages/cli/src/bin.ts
+++ b/packages/cli/src/bin.ts
@@ -18,8 +18,6 @@ import { generateCommand } from './commands/generate.js';
 import { pluginCommand } from './commands/plugin.js';
 import { diffCommand } from './commands/diff.js';
 import { lintCommand } from './commands/lint.js';
-import { explainCommand } from './commands/explain.js';
-import { codemodCommand } from './commands/codemod.js';
 import { loadPluginCommands } from './utils/plugin-commands.js';
 
 const require = createRequire(import.meta.url);
@@ -86,10 +84,10 @@ program.addCommand(lintCommand);
 program.addCommand(diffCommand);
 
 // ── Reference ──
-program.addCommand(explainCommand);
+// explainCommand has been migrated to oclif (auto-discovered from commands/)
 
 // ── Code Transforms ──
-program.addCommand(codemodCommand);
+// codemodCommand has been migrated to oclif (auto-discovered from commands/codemod/)
 
 // ── Plugin-Contributed Commands ──
 // Load commands from installed plugins that declare `contributes.commands` in their manifest.
diff --git a/packages/cli/src/commands/codemod.ts b/packages/cli/src/commands/codemod/v2-to-v3.ts
similarity index 76%
rename from packages/cli/src/commands/codemod.ts
rename to packages/cli/src/commands/codemod/v2-to-v3.ts
index 583bc92653..c94e1cfeff 100644
--- a/packages/cli/src/commands/codemod.ts
+++ b/packages/cli/src/commands/codemod/v2-to-v3.ts
@@ -1,10 +1,10 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import fs from 'fs';
 import path from 'path';
-import { printHeader, printSuccess, printError, printInfo, printStep, createTimer } from '../utils/format.js';
+import { printHeader, printSuccess, printError, printInfo, printStep, createTimer } from '../../utils/format.js';
 
 // ─── Transform Definitions ──────────────────────────────────────────
 
@@ -76,25 +76,31 @@ function walkDir(dir: string, ext: string): string[] {
   return results;
 }
 
-// ─── v2-to-v3 Sub-Command ──────────────────────────────────────────
+// ─── Command ────────────────────────────────────────────────────────
+
+export default class V2ToV3 extends Command {
+  static override description = 'Migrate ObjectStack v2 config to v3 format';
+
+  static override flags = {
+    dir: Flags.string({ description: 'Directory to scan', default: 'src/' }),
+    'dry-run': Flags.boolean({ description: 'Show changes without writing files' }),
+  };
+
+  async run(): Promise<void> {
+    const { flags } = await this.parse(V2ToV3);
 
-const v2ToV3Command = new Command('v2-to-v3')
-  .description('Migrate ObjectStack v2 code patterns to v3')
-  .option('--dir <directory>', 'Directory to scan', 'src/')
-  .option('--dry-run', 'Show changes without writing files')
-  .action(async (options) => {
     printHeader('Codemod: v2 → v3');
 
     const timer = createTimer();
-    const dir = path.resolve(process.cwd(), options.dir);
+    const dir = path.resolve(process.cwd(), flags.dir);
 
     if (!fs.existsSync(dir)) {
       printError(`Directory not found: ${dir}`);
       process.exit(1);
     }
 
-    console.log(`  ${chalk.dim('Directory:')} ${chalk.white(options.dir)}`);
-    console.log(`  ${chalk.dim('Dry run:')}   ${chalk.white(options.dryRun ? 'yes' : 'no')}`);
+    console.log(`  ${chalk.dim('Directory:')} ${chalk.white(flags.dir)}`);
+    console.log(`  ${chalk.dim('Dry run:')}   ${chalk.white(flags['dry-run'] ? 'yes' : 'no')}`);
     console.log('');
 
     printStep('Scanning TypeScript files...');
@@ -132,7 +138,7 @@ const v2ToV3Command = new Command('v2-to-v3')
         filesModified++;
         totalTransforms += fileTransforms;
 
-        if (options.dryRun) {
+        if (flags['dry-run']) {
           printInfo(`${relPath} — ${fileTransforms} change(s)`);
         } else {
           fs.writeFileSync(file, content);
@@ -152,7 +158,7 @@ const v2ToV3Command = new Command('v2-to-v3')
       }
       console.log('');
 
-      if (options.dryRun) {
+      if (flags['dry-run']) {
         printInfo(`Would modify ${filesModified} file(s) with ${totalTransforms} total change(s)`);
         console.log(chalk.dim('  Run without --dry-run to apply changes'));
       } else {
@@ -161,18 +167,5 @@ const v2ToV3Command = new Command('v2-to-v3')
     }
 
     console.log('');
-  });
-
-// ─── Main Codemod Command ───────────────────────────────────────────
-
-export const codemodCommand = new Command('codemod')
-  .description('Run automated code transformations')
-  .addCommand(v2ToV3Command)
-  .action(() => {
-    printHeader('Codemod');
-    console.log(chalk.bold('  Available codemods:'));
-    console.log(`    ${chalk.cyan('v2-to-v3'.padEnd(16))} Migrate ObjectStack v2 code patterns to v3`);
-    console.log('');
-    console.log(chalk.dim('  Usage: objectstack codemod v2-to-v3 [--dir src/] [--dry-run]'));
-    console.log('');
-  });
+  }
+}
diff --git a/packages/cli/src/commands/explain.ts b/packages/cli/src/commands/explain.ts
index ee3dc81c67..efababa105 100644
--- a/packages/cli/src/commands/explain.ts
+++ b/packages/cli/src/commands/explain.ts
@@ -1,6 +1,6 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { Command } from 'commander';
+import { Args, Command, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import {
   printHeader,
@@ -314,15 +314,24 @@ const SCHEMAS: Record<string, SchemaInfo> = {
 
 // ─── Command ────────────────────────────────────────────────────────
 
-export const explainCommand = new Command('explain')
-  .description('Display human-readable explanation of an ObjectStack schema')
-  .argument('[schema]', 'Schema name (e.g., object, field, view, flow, agent, app)')
-  .option('--json', 'Output as JSON')
-  .action(async (schemaName, options) => {
+export default class Explain extends Command {
+  static override description = 'Display human-readable explanation of an ObjectStack schema';
+
+  static override args = {
+    schema: Args.string({ description: 'Schema name (e.g., object, field, view, flow, agent, app)', required: false }),
+  };
+
+  static override flags = {
+    json: Flags.boolean({ description: 'Output as JSON' }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(Explain);
+    const schemaName = args.schema;
 
     // ── No argument: list all schemas ──
     if (!schemaName) {
-      if (options.json) {
+      if (flags.json) {
         console.log(JSON.stringify({
           schemas: Object.entries(SCHEMAS).map(([key, s]) => ({
             name: key,
@@ -347,7 +356,7 @@ export const explainCommand = new Command('explain')
     // ── Lookup schema ──
     const schema = SCHEMAS[schemaName.toLowerCase()];
     if (!schema) {
-      if (options.json) {
+      if (flags.json) {
         console.log(JSON.stringify({ error: `Unknown schema: ${schemaName}` }));
         process.exit(1);
       }
@@ -359,7 +368,7 @@ export const explainCommand = new Command('explain')
     }
 
     // ── JSON output ──
-    if (options.json) {
+    if (flags.json) {
       console.log(JSON.stringify(schema, null, 2));
       return;
     }
@@ -399,4 +408,5 @@ export const explainCommand = new Command('explain')
     // Documentation link
     printKV('  Docs', `https://objectstack.dev/docs/${schema.docsPath}`);
     console.log('');
-  });
+  }
+}

From dd1e67bbda21643d50a85a5606545517a35ca5d1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 18 Feb 2026 04:11:06 +0000
Subject: [PATCH 09/10] feat: migrate CLI architecture from Commander.js to
 oclif

- Convert all 16 commands to oclif Command classes
- Split plugin subcommands into topic structure (plugin/list, plugin/add, etc.)
- Split codemod subcommands into topic structure (codemod/v2-to-v3)
- Add oclif configuration to package.json
- Create oclif bin entry points (bin/run.js, bin/run-dev.js)
- Remove Commander.js dependency and loadPluginCommands mechanism
- Update all tests for oclif command classes (35 tests passing)

Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>
---
 packages/cli/src/bin.ts                    | 112 +------
 packages/cli/src/commands/plugin.ts        | 372 ---------------------
 packages/cli/src/commands/plugin/add.ts    | 112 +++++++
 packages/cli/src/commands/plugin/info.ts   |  79 +++++
 packages/cli/src/commands/plugin/list.ts   |  93 ++++++
 packages/cli/src/commands/plugin/remove.ts |  97 ++++++
 packages/cli/src/index.ts                  |  32 +-
 packages/cli/src/utils/plugin-commands.ts  | 163 ---------
 packages/cli/src/utils/plugin-helpers.ts   |  37 ++
 packages/cli/test/commands.test.ts         | 102 ++++--
 packages/cli/test/plugin-commands.test.ts  | 202 +++--------
 packages/cli/test/plugin.test.ts           |  42 ++-
 12 files changed, 581 insertions(+), 862 deletions(-)
 delete mode 100644 packages/cli/src/commands/plugin.ts
 create mode 100644 packages/cli/src/commands/plugin/add.ts
 create mode 100644 packages/cli/src/commands/plugin/info.ts
 create mode 100644 packages/cli/src/commands/plugin/list.ts
 create mode 100644 packages/cli/src/commands/plugin/remove.ts
 delete mode 100644 packages/cli/src/utils/plugin-commands.ts
 create mode 100644 packages/cli/src/utils/plugin-helpers.ts

diff --git a/packages/cli/src/bin.ts b/packages/cli/src/bin.ts
index e79c7f0104..7e7f9d6f63 100644
--- a/packages/cli/src/bin.ts
+++ b/packages/cli/src/bin.ts
@@ -1,103 +1,13 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-import { createRequire } from 'module';
-import { Command } from 'commander';
-import chalk from 'chalk';
-
-// Commands
-import { devCommand } from './commands/dev.js';
-import { doctorCommand } from './commands/doctor.js';
-import { createCommand } from './commands/create.js';
-import { serveCommand } from './commands/serve.js';
-import { studioCommand } from './commands/studio.js';
-import { testCommand } from './commands/test.js';
-import { validateCommand } from './commands/validate.js';
-
-import { infoCommand } from './commands/info.js';
-import { generateCommand } from './commands/generate.js';
-import { pluginCommand } from './commands/plugin.js';
-import { diffCommand } from './commands/diff.js';
-import { lintCommand } from './commands/lint.js';
-import { loadPluginCommands } from './utils/plugin-commands.js';
-
-const require = createRequire(import.meta.url);
-const pkg = require('../package.json');
-
-// ─── Global Error Handling ──────────────────────────────────────────
-process.on('unhandledRejection', (err: any) => {
-  console.error(chalk.red(`\n  ✗ Unhandled error: ${err?.message || err}`));
-  if (err?.stack && process.env.DEBUG) {
-    console.error(chalk.dim(err.stack));
-  }
-  process.exit(1);
-});
-
-// ─── Program Definition ─────────────────────────────────────────────
-const program = new Command();
-
-program
-  .name('objectstack')
-  .description('ObjectStack CLI — Build metadata-driven apps with the ObjectStack Protocol')
-  .version(pkg.version, '-v, --version')
-  .configureHelp({
-    sortSubcommands: false,
-  })
-  .addHelpText('before', `
-${chalk.bold.cyan('◆ ObjectStack CLI')} ${chalk.dim(`v${pkg.version}`)}
-`)
-  .addHelpText('after', `
-${chalk.bold('Workflow:')}
-  ${chalk.dim('$')} os init                      ${chalk.dim('# Create a new project')}
-  ${chalk.dim('$')} os generate object task       ${chalk.dim('# Add metadata')}
-  ${chalk.dim('$')} os plugin add <package>       ${chalk.dim('# Add a plugin')}
-  ${chalk.dim('$')} os validate                   ${chalk.dim('# Check configuration')}
-  ${chalk.dim('$')} os dev                        ${chalk.dim('# Start dev server')}
-  ${chalk.dim('$')} os studio                     ${chalk.dim('# Dev server + Studio UI')}
-  ${chalk.dim('$')} os compile                    ${chalk.dim('# Build for production')}
-
-${chalk.dim('Aliases: objectstack | os')}
-${chalk.dim('Docs: https://objectstack.dev')}
-`);
-
-// ── Development ──
-// initCommand has been migrated to oclif (auto-discovered from commands/)
-program.addCommand(devCommand);
-program.addCommand(serveCommand);
-program.addCommand(studioCommand);
-
-// ── Build & Validate ──
-// compileCommand has been migrated to oclif (auto-discovered from commands/)
-program.addCommand(validateCommand);
-program.addCommand(infoCommand);
-
-// ── Scaffolding ──
-program.addCommand(generateCommand);
-program.addCommand(createCommand);
-
-// ── Plugin Management ──
-program.addCommand(pluginCommand);
-
-// ── Quality ──
-program.addCommand(testCommand);
-program.addCommand(doctorCommand);
-program.addCommand(lintCommand);
-program.addCommand(diffCommand);
-
-// ── Reference ──
-// explainCommand has been migrated to oclif (auto-discovered from commands/)
-
-// ── Code Transforms ──
-// codemodCommand has been migrated to oclif (auto-discovered from commands/codemod/)
-
-// ── Plugin-Contributed Commands ──
-// Load commands from installed plugins that declare `contributes.commands` in their manifest.
-// This must complete before `program.parse()` so that plugin commands are available.
-loadPluginCommands(program).then(() => {
-  program.parse(process.argv);
-}).catch((err) => {
-  // If plugin command loading fails, still parse with built-in commands
-  if (process.env.DEBUG) {
-    console.error(chalk.yellow(`\n  ⚠ Plugin command loading failed: ${err?.message || err}`));
-  }
-  program.parse(process.argv);
-});
+/**
+ * ObjectStack CLI — oclif-based entry point.
+ *
+ * All commands are auto-discovered from `src/commands/` by oclif.
+ * Plugins extend the CLI via oclif's built-in plugin system
+ * (configured in package.json under "oclif.plugins").
+ *
+ * Run `os --help` for available commands.
+ */
+
+export { execute } from '@oclif/core';
diff --git a/packages/cli/src/commands/plugin.ts b/packages/cli/src/commands/plugin.ts
deleted file mode 100644
index 86591e6013..0000000000
--- a/packages/cli/src/commands/plugin.ts
+++ /dev/null
@@ -1,372 +0,0 @@
-// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
-
-import { Command } from 'commander';
-import chalk from 'chalk';
-import fs from 'fs';
-import path from 'path';
-import { loadConfig, resolveConfigPath } from '../utils/config.js';
-import { printHeader, printSuccess, printError, printInfo, printWarning, printKV } from '../utils/format.js';
-
-// ─── Helpers ────────────────────────────────────────────────────────
-
-/**
- * Resolve plugin display name from a plugin entry.
- * Plugins can be string package names, objects with `.name`, or class instances.
- */
-function resolvePluginName(plugin: unknown): string {
-  if (typeof plugin === 'string') return plugin;
-  if (plugin && typeof plugin === 'object') {
-    const p = plugin as Record<string, unknown>;
-    if (typeof p.name === 'string') return p.name;
-    if (p.constructor && p.constructor.name !== 'Object') return p.constructor.name;
-  }
-  return 'unknown';
-}
-
-/**
- * Resolve plugin version from a plugin entry.
- */
-function resolvePluginVersion(plugin: unknown): string {
-  if (plugin && typeof plugin === 'object') {
-    const p = plugin as Record<string, unknown>;
-    if (typeof p.version === 'string') return p.version;
-  }
-  return '-';
-}
-
-/**
- * Resolve plugin type from a plugin entry.
- */
-function resolvePluginType(plugin: unknown): string {
-  if (plugin && typeof plugin === 'object') {
-    const p = plugin as Record<string, unknown>;
-    if (typeof p.type === 'string') return p.type;
-  }
-  return 'standard';
-}
-
-/**
- * Read the raw text of the config file.
- */
-function readConfigText(configPath: string): string {
-  return fs.readFileSync(configPath, 'utf-8');
-}
-
-/**
- * Add a plugin import and entry to objectstack.config.ts.
- *
- * This performs a simple text-based transformation:
- * 1. Adds an import statement for the package at the top of the file.
- * 2. Inserts the imported identifier into the `plugins` array, creating one if absent.
- */
-function addPluginToConfig(configPath: string, packageName: string): void {
-  let content = readConfigText(configPath);
-
-  // Derive a variable name from the package name
-  // e.g. "@objectstack/plugin-auth" → "authPlugin"
-  const shortName = packageName
-    .replace(/^@[^/]+\//, '')        // strip scope
-    .replace(/^plugin-/, '')          // strip "plugin-" prefix
-    .replace(/-+/g, '-')             // collapse consecutive hyphens
-    .replace(/^-|-$/g, '');          // trim leading/trailing hyphens
-  const varName = shortName.replace(/-([a-z])/g, (_, c: string) => c.toUpperCase()) + 'Plugin';
-
-  // 1. Add import
-  const importLine = `import ${varName} from '${packageName}';\n`;
-
-  if (content.includes(packageName)) {
-    throw new Error(`Plugin '${packageName}' is already referenced in the config`);
-  }
-
-  // Insert import after the last existing import
-  const importRegex = /^import .+$/gm;
-  let lastImportEnd = 0;
-  let match: RegExpExecArray | null;
-  while ((match = importRegex.exec(content)) !== null) {
-    lastImportEnd = match.index + match[0].length;
-  }
-
-  if (lastImportEnd > 0) {
-    content = content.slice(0, lastImportEnd) + '\n' + importLine + content.slice(lastImportEnd);
-  } else {
-    content = importLine + '\n' + content;
-  }
-
-  // 2. Add to plugins array (target only the first plugins: [ within defineStack)
-  if (/plugins\s*:\s*\[/.test(content)) {
-    // plugins array exists — append to it (first occurrence only)
-    let replaced = false;
-    content = content.replace(
-      /(plugins\s*:\s*\[)/,
-      (match) => {
-        if (replaced) return match;
-        replaced = true;
-        return `${match}\n    ${varName},`;
-      }
-    );
-  } else {
-    // No plugins array — add one before the closing of defineStack({...})
-    // Look for the last property before the closing `})` or `})`
-    content = content.replace(
-      /(defineStack\(\{[\s\S]*?)(}\s*\))/,
-      `$1  plugins: [\n    ${varName},\n  ],\n$2`
-    );
-  }
-
-  fs.writeFileSync(configPath, content);
-}
-
-/**
- * Remove a plugin reference from objectstack.config.ts.
- *
- * Removes matching import line and the entry from the plugins array.
- */
-function removePluginFromConfig(configPath: string, pluginName: string): void {
-  let content = readConfigText(configPath);
-
-  // Remove the import line that references this plugin (exact package name match)
-  const importRegex = new RegExp(`^import .+['"]${escapeRegex(pluginName)}['"]\\s*;?\\s*$\\n?`, 'gm');
-  const hadImport = importRegex.test(content);
-  // Reset regex lastIndex after test()
-  importRegex.lastIndex = 0;
-  content = content.replace(importRegex, '');
-
-  // Also try to remove by a derived variable name
-  const shortName = pluginName
-    .replace(/^@[^/]+\//, '')
-    .replace(/^plugin-/, '')
-    .replace(/-+/g, '-')
-    .replace(/^-|-$/g, '');
-  const varName = shortName.replace(/-([a-z])/g, (_, c: string) => c.toUpperCase()) + 'Plugin';
-
-  // Remove import by variable name if it wasn't caught above
-  if (!hadImport) {
-    const varImportRegex = new RegExp(`^import .* ${escapeRegex(varName)} .+$\\n?`, 'gm');
-    content = content.replace(varImportRegex, '');
-  }
-
-  // Remove the entry from the plugins array
-  // Match: varName, or 'package-name', or "package-name"
-  const entryPatterns = [
-    new RegExp(`\\s*${escapeRegex(varName)},?\\n?`, 'g'),
-    new RegExp(`\\s*['"]${escapeRegex(pluginName)}['"],?\\n?`, 'g'),
-  ];
-
-  for (const pattern of entryPatterns) {
-    content = content.replace(pattern, '\n');
-  }
-
-  // Clean up empty plugins array: plugins: [\n  ],
-  content = content.replace(/plugins\s*:\s*\[\s*\],?\n?/g, '');
-
-  fs.writeFileSync(configPath, content);
-}
-
-function escapeRegex(str: string): string {
-  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-}
-
-// ─── Subcommands ────────────────────────────────────────────────────
-
-const listCommand = new Command('list')
-  .alias('ls')
-  .description('List plugins defined in the configuration')
-  .argument('[config]', 'Configuration file path')
-  .option('--json', 'Output as JSON')
-  .action(async (configSource?: string, options?: { json?: boolean }) => {
-    try {
-      const { config } = await loadConfig(configSource);
-      const plugins: unknown[] = config.plugins || [];
-      const devPlugins: unknown[] = config.devPlugins || [];
-
-      if (options?.json) {
-        const data = {
-          plugins: plugins.map(p => ({
-            name: resolvePluginName(p),
-            version: resolvePluginVersion(p),
-            type: resolvePluginType(p),
-            dev: false,
-          })),
-          devPlugins: devPlugins.map(p => ({
-            name: resolvePluginName(p),
-            version: resolvePluginVersion(p),
-            type: resolvePluginType(p),
-            dev: true,
-          })),
-        };
-        console.log(JSON.stringify(data, null, 2));
-        return;
-      }
-
-      printHeader('Plugins');
-
-      if (plugins.length === 0 && devPlugins.length === 0) {
-        printInfo('No plugins configured');
-        console.log('');
-        console.log(chalk.dim('  Hint: Add plugins to your objectstack.config.ts'));
-        console.log(chalk.dim('  Or run: os plugin add <package-name>'));
-        console.log('');
-        return;
-      }
-
-      if (plugins.length > 0) {
-        console.log(chalk.bold(`\n  Plugins (${plugins.length}):`));
-        for (const plugin of plugins) {
-          const name = resolvePluginName(plugin);
-          const version = resolvePluginVersion(plugin);
-          const type = resolvePluginType(plugin);
-          console.log(
-            `    ${chalk.cyan('●')} ${chalk.white(name)}` +
-            (version !== '-' ? chalk.dim(` v${version}`) : '') +
-            (type !== 'standard' ? chalk.dim(` [${type}]`) : '')
-          );
-        }
-      }
-
-      if (devPlugins.length > 0) {
-        console.log(chalk.bold(`\n  Dev Plugins (${devPlugins.length}):`));
-        for (const plugin of devPlugins) {
-          const name = resolvePluginName(plugin);
-          const version = resolvePluginVersion(plugin);
-          console.log(
-            `    ${chalk.yellow('●')} ${chalk.white(name)}` +
-            (version !== '-' ? chalk.dim(` v${version}`) : '') +
-            chalk.dim(' [dev]')
-          );
-        }
-      }
-
-      console.log('');
-    } catch (error: any) {
-      printError(error.message || String(error));
-      process.exit(1);
-    }
-  });
-
-const infoSubCommand = new Command('info')
-  .description('Show detailed information about a plugin')
-  .argument('<name>', 'Plugin name or package name')
-  .argument('[config]', 'Configuration file path')
-  .action(async (name: string, configSource?: string) => {
-    try {
-      const { config } = await loadConfig(configSource);
-      const allPlugins: unknown[] = [
-        ...(config.plugins || []),
-        ...(config.devPlugins || []),
-      ];
-
-      const found = allPlugins.find((p) => {
-        const pName = resolvePluginName(p);
-        return pName === name || pName.includes(name);
-      });
-
-      if (!found) {
-        printError(`Plugin '${name}' not found in configuration`);
-        console.log('');
-        console.log(chalk.dim('  Available plugins:'));
-        for (const p of allPlugins) {
-          console.log(chalk.dim(`    - ${resolvePluginName(p)}`));
-        }
-        console.log('');
-        process.exit(1);
-      }
-
-      printHeader(`Plugin: ${resolvePluginName(found)}`);
-
-      printKV('Name', resolvePluginName(found));
-      printKV('Version', resolvePluginVersion(found));
-      printKV('Type', resolvePluginType(found));
-
-      const isDev = (config.devPlugins || []).includes(found);
-      printKV('Environment', isDev ? 'development' : 'production');
-
-      if (found && typeof found === 'object') {
-        const p = found as Record<string, unknown>;
-
-        if (typeof p.description === 'string') {
-          printKV('Description', p.description);
-        }
-
-        if (Array.isArray(p.dependencies) && p.dependencies.length > 0) {
-          printKV('Dependencies', p.dependencies.join(', '));
-        }
-
-        // Show services if it's a loaded plugin instance
-        if (typeof p.init === 'function') {
-          printInfo('This is a runtime plugin instance (has init function)');
-        }
-      }
-
-      if (typeof found === 'string') {
-        printInfo('This is a string reference (will be imported at runtime)');
-      }
-
-      console.log('');
-    } catch (error: any) {
-      printError(error.message || String(error));
-      process.exit(1);
-    }
-  });
-
-const addCommand = new Command('add')
-  .description('Add a plugin to objectstack.config.ts')
-  .argument('<package>', 'Plugin package name (e.g. @objectstack/plugin-auth)')
-  .option('-d, --dev', 'Add as a dev-only plugin')
-  .option('-c, --config <path>', 'Configuration file path')
-  .action(async (packageName: string, options?: { dev?: boolean; config?: string }) => {
-    try {
-      const configPath = resolveConfigPath(options?.config);
-
-      printHeader('Add Plugin');
-      console.log(`  ${chalk.dim('Package:')} ${chalk.white(packageName)}`);
-      console.log(`  ${chalk.dim('Config:')}  ${chalk.white(path.relative(process.cwd(), configPath))}`);
-      console.log('');
-
-      addPluginToConfig(configPath, packageName);
-      printSuccess(`Added ${chalk.cyan(packageName)} to config`);
-
-      console.log('');
-      console.log(chalk.dim('  Next steps:'));
-      console.log(chalk.dim(`  1. Install the package: pnpm add ${packageName}`));
-      console.log(chalk.dim('  2. Run: os validate'));
-      console.log('');
-    } catch (error: any) {
-      printError(error.message || String(error));
-      process.exit(1);
-    }
-  });
-
-const removeCommand = new Command('remove')
-  .alias('rm')
-  .description('Remove a plugin from objectstack.config.ts')
-  .argument('<name>', 'Plugin name or package name to remove')
-  .option('-c, --config <path>', 'Configuration file path')
-  .action(async (pluginName: string, options?: { config?: string }) => {
-    try {
-      const configPath = resolveConfigPath(options?.config);
-
-      printHeader('Remove Plugin');
-      console.log(`  ${chalk.dim('Plugin:')} ${chalk.white(pluginName)}`);
-      console.log(`  ${chalk.dim('Config:')} ${chalk.white(path.relative(process.cwd(), configPath))}`);
-      console.log('');
-
-      removePluginFromConfig(configPath, pluginName);
-      printSuccess(`Removed ${chalk.cyan(pluginName)} from config`);
-
-      console.log('');
-      console.log(chalk.dim('  Tip: Run `pnpm remove ' + pluginName + '` to uninstall the package'));
-      console.log('');
-    } catch (error: any) {
-      printError(error.message || String(error));
-      process.exit(1);
-    }
-  });
-
-// ─── Main Plugin Command ────────────────────────────────────────────
-
-export const pluginCommand = new Command('plugin')
-  .description('Manage plugins (list, info, add, remove)')
-  .addCommand(listCommand)
-  .addCommand(infoSubCommand)
-  .addCommand(addCommand)
-  .addCommand(removeCommand);
diff --git a/packages/cli/src/commands/plugin/add.ts b/packages/cli/src/commands/plugin/add.ts
new file mode 100644
index 0000000000..0aa8354f60
--- /dev/null
+++ b/packages/cli/src/commands/plugin/add.ts
@@ -0,0 +1,112 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
+import { Args, Command, Flags } from '@oclif/core';
+import chalk from 'chalk';
+import fs from 'fs';
+import path from 'path';
+import { resolveConfigPath } from '../../utils/config.js';
+import { printHeader, printSuccess, printError } from '../../utils/format.js';
+
+/**
+ * Add a plugin import and entry to objectstack.config.ts.
+ *
+ * This performs a simple text-based transformation:
+ * 1. Adds an import statement for the package at the top of the file.
+ * 2. Inserts the imported identifier into the `plugins` array, creating one if absent.
+ */
+function addPluginToConfig(configPath: string, packageName: string): void {
+  let content = fs.readFileSync(configPath, 'utf-8');
+
+  // Derive a variable name from the package name
+  // e.g. "@objectstack/plugin-auth" → "authPlugin"
+  const shortName = packageName
+    .replace(/^@[^/]+\//, '')        // strip scope
+    .replace(/^plugin-/, '')          // strip "plugin-" prefix
+    .replace(/-+/g, '-')             // collapse consecutive hyphens
+    .replace(/^-|-$/g, '');          // trim leading/trailing hyphens
+  const varName = shortName.replace(/-([a-z])/g, (_, c: string) => c.toUpperCase()) + 'Plugin';
+
+  // 1. Add import
+  const importLine = `import ${varName} from '${packageName}';\n`;
+
+  if (content.includes(packageName)) {
+    throw new Error(`Plugin '${packageName}' is already referenced in the config`);
+  }
+
+  // Insert import after the last existing import
+  const importRegex = /^import .+$/gm;
+  let lastImportEnd = 0;
+  let match: RegExpExecArray | null;
+  while ((match = importRegex.exec(content)) !== null) {
+    lastImportEnd = match.index + match[0].length;
+  }
+
+  if (lastImportEnd > 0) {
+    content = content.slice(0, lastImportEnd) + '\n' + importLine + content.slice(lastImportEnd);
+  } else {
+    content = importLine + '\n' + content;
+  }
+
+  // 2. Add to plugins array (target only the first plugins: [ within defineStack)
+  if (/plugins\s*:\s*\[/.test(content)) {
+    // plugins array exists — append to it (first occurrence only)
+    let replaced = false;
+    content = content.replace(
+      /(plugins\s*:\s*\[)/,
+      (match) => {
+        if (replaced) return match;
+        replaced = true;
+        return `${match}\n    ${varName},`;
+      }
+    );
+  } else {
+    // No plugins array — add one before the closing of defineStack({...})
+    // Look for the last property before the closing `})` or `})`
+    content = content.replace(
+      /(defineStack\(\{[\s\S]*?)(}\s*\))/,
+      `$1  plugins: [\n    ${varName},\n  ],\n$2`
+    );
+  }
+
+  fs.writeFileSync(configPath, content);
+}
+
+export { addPluginToConfig };
+
+export default class PluginAdd extends Command {
+  static override description = 'Add a plugin to objectstack.config.ts';
+
+  static override args = {
+    package: Args.string({ description: 'Plugin package name (e.g. @objectstack/plugin-auth)', required: true }),
+  };
+
+  static override flags = {
+    dev: Flags.boolean({ char: 'd', description: 'Add as a dev-only plugin' }),
+    config: Flags.string({ char: 'c', description: 'Configuration file path' }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(PluginAdd);
+
+    try {
+      const configPath = resolveConfigPath(flags.config);
+
+      printHeader('Add Plugin');
+      console.log(`  ${chalk.dim('Package:')} ${chalk.white(args.package)}`);
+      console.log(`  ${chalk.dim('Config:')}  ${chalk.white(path.relative(process.cwd(), configPath))}`);
+      console.log('');
+
+      addPluginToConfig(configPath, args.package);
+      printSuccess(`Added ${chalk.cyan(args.package)} to config`);
+
+      console.log('');
+      console.log(chalk.dim('  Next steps:'));
+      console.log(chalk.dim(`  1. Install the package: pnpm add ${args.package}`));
+      console.log(chalk.dim('  2. Run: os validate'));
+      console.log('');
+    } catch (error: any) {
+      printError(error.message || String(error));
+      this.exit(1);
+    }
+  }
+}
diff --git a/packages/cli/src/commands/plugin/info.ts b/packages/cli/src/commands/plugin/info.ts
new file mode 100644
index 0000000000..be7d4b96ad
--- /dev/null
+++ b/packages/cli/src/commands/plugin/info.ts
@@ -0,0 +1,79 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
+import { Args, Command } from '@oclif/core';
+import chalk from 'chalk';
+import { loadConfig } from '../../utils/config.js';
+import { printHeader, printError, printInfo, printKV } from '../../utils/format.js';
+import { resolvePluginName, resolvePluginVersion, resolvePluginType } from '../../utils/plugin-helpers.js';
+
+export default class PluginInfo extends Command {
+  static override description = 'Show detailed information about a plugin';
+
+  static override args = {
+    name: Args.string({ description: 'Plugin name or package name', required: true }),
+    config: Args.string({ description: 'Configuration file path', required: false }),
+  };
+
+  async run(): Promise<void> {
+    const { args } = await this.parse(PluginInfo);
+
+    try {
+      const { config } = await loadConfig(args.config);
+      const allPlugins: unknown[] = [
+        ...(config.plugins || []),
+        ...(config.devPlugins || []),
+      ];
+
+      const found = allPlugins.find((p) => {
+        const pName = resolvePluginName(p);
+        return pName === args.name || pName.includes(args.name);
+      });
+
+      if (!found) {
+        printError(`Plugin '${args.name}' not found in configuration`);
+        console.log('');
+        console.log(chalk.dim('  Available plugins:'));
+        for (const p of allPlugins) {
+          console.log(chalk.dim(`    - ${resolvePluginName(p)}`));
+        }
+        console.log('');
+        this.exit(1);
+      }
+
+      printHeader(`Plugin: ${resolvePluginName(found)}`);
+
+      printKV('Name', resolvePluginName(found));
+      printKV('Version', resolvePluginVersion(found));
+      printKV('Type', resolvePluginType(found));
+
+      const isDev = (config.devPlugins || []).includes(found);
+      printKV('Environment', isDev ? 'development' : 'production');
+
+      if (found && typeof found === 'object') {
+        const p = found as Record<string, unknown>;
+
+        if (typeof p.description === 'string') {
+          printKV('Description', p.description);
+        }
+
+        if (Array.isArray(p.dependencies) && p.dependencies.length > 0) {
+          printKV('Dependencies', p.dependencies.join(', '));
+        }
+
+        // Show services if it's a loaded plugin instance
+        if (typeof p.init === 'function') {
+          printInfo('This is a runtime plugin instance (has init function)');
+        }
+      }
+
+      if (typeof found === 'string') {
+        printInfo('This is a string reference (will be imported at runtime)');
+      }
+
+      console.log('');
+    } catch (error: any) {
+      printError(error.message || String(error));
+      this.exit(1);
+    }
+  }
+}
diff --git a/packages/cli/src/commands/plugin/list.ts b/packages/cli/src/commands/plugin/list.ts
new file mode 100644
index 0000000000..0ab40c3bc8
--- /dev/null
+++ b/packages/cli/src/commands/plugin/list.ts
@@ -0,0 +1,93 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
+import { Args, Command, Flags } from '@oclif/core';
+import chalk from 'chalk';
+import { loadConfig } from '../../utils/config.js';
+import { printHeader, printInfo, printError } from '../../utils/format.js';
+import { resolvePluginName, resolvePluginVersion, resolvePluginType } from '../../utils/plugin-helpers.js';
+
+export default class PluginList extends Command {
+  static override description = 'List plugins defined in the configuration';
+
+  static override aliases = ['plugin ls'];
+
+  static override args = {
+    config: Args.string({ description: 'Configuration file path', required: false }),
+  };
+
+  static override flags = {
+    json: Flags.boolean({ description: 'Output as JSON' }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(PluginList);
+
+    try {
+      const { config } = await loadConfig(args.config);
+      const plugins: unknown[] = config.plugins || [];
+      const devPlugins: unknown[] = config.devPlugins || [];
+
+      if (flags.json) {
+        const data = {
+          plugins: plugins.map(p => ({
+            name: resolvePluginName(p),
+            version: resolvePluginVersion(p),
+            type: resolvePluginType(p),
+            dev: false,
+          })),
+          devPlugins: devPlugins.map(p => ({
+            name: resolvePluginName(p),
+            version: resolvePluginVersion(p),
+            type: resolvePluginType(p),
+            dev: true,
+          })),
+        };
+        console.log(JSON.stringify(data, null, 2));
+        return;
+      }
+
+      printHeader('Plugins');
+
+      if (plugins.length === 0 && devPlugins.length === 0) {
+        printInfo('No plugins configured');
+        console.log('');
+        console.log(chalk.dim('  Hint: Add plugins to your objectstack.config.ts'));
+        console.log(chalk.dim('  Or run: os plugin add <package-name>'));
+        console.log('');
+        return;
+      }
+
+      if (plugins.length > 0) {
+        console.log(chalk.bold(`\n  Plugins (${plugins.length}):`));
+        for (const plugin of plugins) {
+          const name = resolvePluginName(plugin);
+          const version = resolvePluginVersion(plugin);
+          const type = resolvePluginType(plugin);
+          console.log(
+            `    ${chalk.cyan('●')} ${chalk.white(name)}` +
+            (version !== '-' ? chalk.dim(` v${version}`) : '') +
+            (type !== 'standard' ? chalk.dim(` [${type}]`) : '')
+          );
+        }
+      }
+
+      if (devPlugins.length > 0) {
+        console.log(chalk.bold(`\n  Dev Plugins (${devPlugins.length}):`));
+        for (const plugin of devPlugins) {
+          const name = resolvePluginName(plugin);
+          const version = resolvePluginVersion(plugin);
+          console.log(
+            `    ${chalk.yellow('●')} ${chalk.white(name)}` +
+            (version !== '-' ? chalk.dim(` v${version}`) : '') +
+            chalk.dim(' [dev]')
+          );
+        }
+      }
+
+      console.log('');
+    } catch (error: any) {
+      printError(error.message || String(error));
+      this.exit(1);
+    }
+  }
+}
diff --git a/packages/cli/src/commands/plugin/remove.ts b/packages/cli/src/commands/plugin/remove.ts
new file mode 100644
index 0000000000..81bf60709c
--- /dev/null
+++ b/packages/cli/src/commands/plugin/remove.ts
@@ -0,0 +1,97 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
+import { Args, Command, Flags } from '@oclif/core';
+import chalk from 'chalk';
+import fs from 'fs';
+import path from 'path';
+import { resolveConfigPath } from '../../utils/config.js';
+import { printHeader, printSuccess, printError } from '../../utils/format.js';
+
+function escapeRegex(str: string): string {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+/**
+ * Remove a plugin reference from objectstack.config.ts.
+ *
+ * Removes matching import line and the entry from the plugins array.
+ */
+function removePluginFromConfig(configPath: string, pluginName: string): void {
+  let content = fs.readFileSync(configPath, 'utf-8');
+
+  // Remove the import line that references this plugin (exact package name match)
+  const importRegex = new RegExp(`^import .+['"]${escapeRegex(pluginName)}['"]\\s*;?\\s*$\\n?`, 'gm');
+  const hadImport = importRegex.test(content);
+  // Reset regex lastIndex after test()
+  importRegex.lastIndex = 0;
+  content = content.replace(importRegex, '');
+
+  // Also try to remove by a derived variable name
+  const shortName = pluginName
+    .replace(/^@[^/]+\//, '')
+    .replace(/^plugin-/, '')
+    .replace(/-+/g, '-')
+    .replace(/^-|-$/g, '');
+  const varName = shortName.replace(/-([a-z])/g, (_, c: string) => c.toUpperCase()) + 'Plugin';
+
+  // Remove import by variable name if it wasn't caught above
+  if (!hadImport) {
+    const varImportRegex = new RegExp(`^import .* ${escapeRegex(varName)} .+$\\n?`, 'gm');
+    content = content.replace(varImportRegex, '');
+  }
+
+  // Remove the entry from the plugins array
+  // Match: varName, or 'package-name', or "package-name"
+  const entryPatterns = [
+    new RegExp(`\\s*${escapeRegex(varName)},?\\n?`, 'g'),
+    new RegExp(`\\s*['"]${escapeRegex(pluginName)}['"],?\\n?`, 'g'),
+  ];
+
+  for (const pattern of entryPatterns) {
+    content = content.replace(pattern, '\n');
+  }
+
+  // Clean up empty plugins array: plugins: [\n  ],
+  content = content.replace(/plugins\s*:\s*\[\s*\],?\n?/g, '');
+
+  fs.writeFileSync(configPath, content);
+}
+
+export { removePluginFromConfig };
+
+export default class PluginRemove extends Command {
+  static override description = 'Remove a plugin from objectstack.config.ts';
+
+  static override aliases = ['plugin rm'];
+
+  static override args = {
+    name: Args.string({ description: 'Plugin name or package name to remove', required: true }),
+  };
+
+  static override flags = {
+    config: Flags.string({ char: 'c', description: 'Configuration file path' }),
+  };
+
+  async run(): Promise<void> {
+    const { args, flags } = await this.parse(PluginRemove);
+
+    try {
+      const configPath = resolveConfigPath(flags.config);
+
+      printHeader('Remove Plugin');
+      console.log(`  ${chalk.dim('Plugin:')} ${chalk.white(args.name)}`);
+      console.log(`  ${chalk.dim('Config:')} ${chalk.white(path.relative(process.cwd(), configPath))}`);
+      console.log('');
+
+      removePluginFromConfig(configPath, args.name);
+      printSuccess(`Removed ${chalk.cyan(args.name)} from config`);
+
+      console.log('');
+      console.log(chalk.dim('  Tip: Run `pnpm remove ' + args.name + '` to uninstall the package'));
+      console.log('');
+    } catch (error: any) {
+      printError(error.message || String(error));
+      this.exit(1);
+    }
+  }
+}
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index bd87b1bef9..815faf5e64 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -1,14 +1,22 @@
 // Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
 
-export * from './commands/compile.js';
-export * from './commands/validate.js';
-export * from './commands/info.js';
-export * from './commands/init.js';
-export * from './commands/generate.js';
-export * from './commands/create.js';
-export * from './commands/plugin.js';
-export * from './commands/dev.js';
-export * from './commands/serve.js';
-export * from './commands/test.js';
-export * from './commands/doctor.js';
-export * from './utils/plugin-commands.js';
+// ─── oclif Command Classes ──────────────────────────────────────────
+// Each command is auto-discovered by oclif from `src/commands/`.
+// These re-exports provide programmatic access for testing and integration.
+
+export { default as CompileCommand } from './commands/compile.js';
+export { default as ValidateCommand } from './commands/validate.js';
+export { default as InfoCommand } from './commands/info.js';
+export { default as InitCommand } from './commands/init.js';
+export { default as GenerateCommand } from './commands/generate.js';
+export { default as CreateCommand } from './commands/create.js';
+export { default as DevCommand } from './commands/dev.js';
+export { default as ServeCommand } from './commands/serve.js';
+export { default as TestCommand } from './commands/test.js';
+export { default as DoctorCommand } from './commands/doctor.js';
+
+// ─── Plugin topic subcommands ───────────────────────────────────────
+export { default as PluginListCommand } from './commands/plugin/list.js';
+export { default as PluginInfoCommand } from './commands/plugin/info.js';
+export { default as PluginAddCommand } from './commands/plugin/add.js';
+export { default as PluginRemoveCommand } from './commands/plugin/remove.js';
diff --git a/packages/cli/src/utils/plugin-commands.ts b/packages/cli/src/utils/plugin-commands.ts
deleted file mode 100644
index 765aa7a250..0000000000
--- a/packages/cli/src/utils/plugin-commands.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
-
-import { Command } from 'commander';
-import chalk from 'chalk';
-import { loadConfig } from './config.js';
-
-/**
- * CLI Command Contribution resolved from a plugin manifest.
- */
-interface ResolvedCommandContribution {
-  /** CLI command name */
-  name: string;
-  /** Brief description */
-  description?: string;
-  /** Module path to import */
-  module?: string;
-  /** Source plugin package name */
-  pluginName: string;
-}
-
-/**
- * Discover CLI command contributions from installed plugins.
- * 
- * Scans the project's `objectstack.config.ts` for plugins that declare
- * `contributes.commands` in their manifest, then dynamically imports
- * those plugin modules to register Commander.js commands.
- * 
- * @param program - The root Commander.js program to register commands on
- */
-export async function loadPluginCommands(program: Command): Promise<void> {
-  let config: Record<string, unknown>;
-
-  try {
-    const loaded = await loadConfig();
-    config = loaded.config;
-  } catch {
-    // No config file found — nothing to load
-    return;
-  }
-
-  const plugins: unknown[] = [
-    ...((config.plugins as unknown[] | undefined) || []),
-    ...((config.devPlugins as unknown[] | undefined) || []),
-  ];
-
-  // Collect command contributions from plugin manifests
-  const contributions: ResolvedCommandContribution[] = [];
-
-  for (const plugin of plugins) {
-    if (!plugin || typeof plugin !== 'object') continue;
-    const p = plugin as Record<string, unknown>;
-
-    const manifest = p.manifest as Record<string, unknown> | undefined;
-    const contributes = (manifest?.contributes ?? p.contributes) as Record<string, unknown> | undefined;
-    if (!contributes) continue;
-
-    const commands = contributes.commands as Array<Record<string, unknown>> | undefined;
-    if (!Array.isArray(commands)) continue;
-
-    const pluginName = resolvePluginName(p);
-
-    for (const cmd of commands) {
-      if (!cmd || typeof cmd.name !== 'string') continue;
-      contributions.push({
-        name: cmd.name,
-        description: typeof cmd.description === 'string' ? cmd.description : undefined,
-        module: typeof cmd.module === 'string' ? cmd.module : undefined,
-        pluginName,
-      });
-    }
-  }
-
-  if (contributions.length === 0) return;
-
-  // Load and register each contributed command
-  for (const contribution of contributions) {
-    try {
-      const commands = await importPluginCommands(contribution);
-      for (const cmd of commands) {
-        program.addCommand(cmd);
-      }
-    } catch (error: unknown) {
-      // Log warning but don't crash — plugin commands are optional
-      if (process.env.DEBUG) {
-        const message = error instanceof Error ? error.message : String(error);
-        console.error(
-          chalk.yellow(`  ⚠ Failed to load CLI command '${contribution.name}' from plugin '${contribution.pluginName}': ${message}`)
-        );
-      }
-    }
-  }
-}
-
-/**
- * Import Commander.js commands from a plugin module.
- * 
- * The module must export commands in one of these forms:
- * - `export const commands: Command[]`
- * - `export default Command`
- * - `export default Command[]`
- */
-async function importPluginCommands(
-  contribution: ResolvedCommandContribution
-): Promise<Command[]> {
-  // Resolve the module specifier
-  const moduleId = contribution.module
-    ? `${contribution.pluginName}/${contribution.module.replace(/^\.\//, '')}`
-    : contribution.pluginName;
-
-  const mod = await import(moduleId);
-
-  // Form 1: Named export `commands`
-  if (Array.isArray(mod.commands)) {
-    return mod.commands.filter(isCommandInstance);
-  }
-
-  // Form 2: Default export (single or array)
-  const defaultExport = mod.default;
-  if (defaultExport) {
-    if (Array.isArray(defaultExport)) {
-      return defaultExport.filter(isCommandInstance);
-    }
-    if (isCommandInstance(defaultExport)) {
-      return [defaultExport];
-    }
-  }
-
-  // Fallback: search for any Command instances in module exports
-  const commands: Command[] = [];
-  for (const key of Object.keys(mod)) {
-    if (isCommandInstance(mod[key])) {
-      commands.push(mod[key]);
-    }
-  }
-
-  return commands;
-}
-
-/**
- * Check if a value is a Commander.js Command instance.
- * Uses duck-typing to avoid import dependency issues.
- */
-function isCommandInstance(value: unknown): value is Command {
-  if (value === null || typeof value !== 'object') return false;
-  const obj = value as Record<string, unknown>;
-  return (
-    typeof obj.name === 'function' &&
-    typeof obj.description === 'function' &&
-    typeof obj.action === 'function' &&
-    typeof obj.parse === 'function'
-  );
-}
-
-/**
- * Resolve a human-readable name from a plugin object.
- */
-function resolvePluginName(plugin: Record<string, unknown>): string {
-  if (typeof plugin.name === 'string') return plugin.name;
-  const manifest = plugin.manifest as Record<string, unknown> | undefined;
-  if (manifest && typeof manifest.name === 'string') return manifest.name;
-  if (plugin.constructor && plugin.constructor.name !== 'Object') return plugin.constructor.name;
-  return 'unknown';
-}
diff --git a/packages/cli/src/utils/plugin-helpers.ts b/packages/cli/src/utils/plugin-helpers.ts
new file mode 100644
index 0000000000..ca9930b73e
--- /dev/null
+++ b/packages/cli/src/utils/plugin-helpers.ts
@@ -0,0 +1,37 @@
+// Copyright (c) 2025 ObjectStack. Licensed under the Apache-2.0 license.
+
+/**
+ * Resolve plugin display name from a plugin entry.
+ * Plugins can be string package names, objects with `.name`, or class instances.
+ */
+export function resolvePluginName(plugin: unknown): string {
+  if (typeof plugin === 'string') return plugin;
+  if (plugin && typeof plugin === 'object') {
+    const p = plugin as Record<string, unknown>;
+    if (typeof p.name === 'string') return p.name;
+    if (p.constructor && p.constructor.name !== 'Object') return p.constructor.name;
+  }
+  return 'unknown';
+}
+
+/**
+ * Resolve plugin version from a plugin entry.
+ */
+export function resolvePluginVersion(plugin: unknown): string {
+  if (plugin && typeof plugin === 'object') {
+    const p = plugin as Record<string, unknown>;
+    if (typeof p.version === 'string') return p.version;
+  }
+  return '-';
+}
+
+/**
+ * Resolve plugin type from a plugin entry.
+ */
+export function resolvePluginType(plugin: unknown): string {
+  if (plugin && typeof plugin === 'object') {
+    const p = plugin as Record<string, unknown>;
+    if (typeof p.type === 'string') return p.type;
+  }
+  return 'standard';
+}
diff --git a/packages/cli/test/commands.test.ts b/packages/cli/test/commands.test.ts
index aa3ef76547..175e79c029 100644
--- a/packages/cli/test/commands.test.ts
+++ b/packages/cli/test/commands.test.ts
@@ -1,69 +1,109 @@
 import { describe, it, expect } from 'vitest';
 import Compile from '../src/commands/compile';
-import { serveCommand } from '../src/commands/serve';
-import { devCommand } from '../src/commands/dev';
-import { doctorCommand } from '../src/commands/doctor';
-import { createCommand } from '../src/commands/create';
-import { testCommand } from '../src/commands/test';
-import { validateCommand } from '../src/commands/validate';
+import Serve from '../src/commands/serve';
+import Dev from '../src/commands/dev';
+import Doctor from '../src/commands/doctor';
+import Create from '../src/commands/create';
+import Test from '../src/commands/test';
+import Validate from '../src/commands/validate';
 import Init from '../src/commands/init';
-import { infoCommand } from '../src/commands/info';
-import { generateCommand } from '../src/commands/generate';
-import { pluginCommand } from '../src/commands/plugin';
+import Info from '../src/commands/info';
+import Generate from '../src/commands/generate';
+import Lint from '../src/commands/lint';
+import Diff from '../src/commands/diff';
+import Explain from '../src/commands/explain';
+import Studio from '../src/commands/studio';
+import PluginList from '../src/commands/plugin/list';
+import PluginInfo from '../src/commands/plugin/info';
+import PluginAdd from '../src/commands/plugin/add';
+import PluginRemove from '../src/commands/plugin/remove';
+import V2ToV3 from '../src/commands/codemod/v2-to-v3';
 
-describe('CLI Commands', () => {
+describe('CLI Commands (oclif)', () => {
   it('should have compile command', () => {
     expect(Compile.description).toContain('Compile');
   });
 
   it('should have serve command', () => {
-    expect(serveCommand.name()).toBe('serve');
-    expect(serveCommand.description()).toContain('server');
+    expect(Serve.description).toContain('server');
   });
 
   it('should have dev command', () => {
-    expect(devCommand.name()).toBe('dev');
-    expect(devCommand.description()).toContain('development mode');
+    expect(Dev.description).toContain('development mode');
   });
 
   it('should have doctor command', () => {
-    expect(doctorCommand.name()).toBe('doctor');
-    expect(doctorCommand.description()).toContain('health');
+    expect(Doctor.description).toContain('health');
   });
 
   it('should have create command', () => {
-    expect(createCommand.name()).toBe('create');
-    expect(createCommand.description()).toContain('Create');
+    expect(Create.description).toContain('Create');
   });
 
   it('should have test command', () => {
-    expect(testCommand.name()).toBe('test');
-    expect(testCommand.description()).toContain('Quality Protocol');
+    expect(Test.description).toContain('Quality Protocol');
   });
 
   it('should have validate command', () => {
-    expect(validateCommand.name()).toBe('validate');
-    expect(validateCommand.description()).toContain('Validate');
+    expect(Validate.description).toContain('Validate');
   });
 
   it('should have init command', () => {
-    expect(Init.id).toBe('init');
     expect(Init.description).toContain('Initialize');
   });
 
   it('should have info command', () => {
-    expect(infoCommand.name()).toBe('info');
-    expect(infoCommand.description()).toContain('summary');
+    expect(Info.description).toContain('summary');
   });
 
   it('should have generate command with alias', () => {
-    expect(generateCommand.name()).toBe('generate');
-    expect(generateCommand.alias()).toBe('g');
-    expect(generateCommand.description()).toContain('Generate');
+    expect(Generate.aliases).toContain('g');
+    expect(Generate.description).toContain('Generate');
   });
 
-  it('should have plugin command with subcommands', () => {
-    expect(pluginCommand.name()).toBe('plugin');
-    expect(pluginCommand.description()).toContain('plugin');
+  it('should have lint command', () => {
+    expect(Lint.description).toContain('style');
+  });
+
+  it('should have diff command', () => {
+    expect(Diff.description).toContain('Compare');
+  });
+
+  it('should have explain command', () => {
+    expect(Explain.description).toContain('explanation');
+  });
+
+  it('should have studio command', () => {
+    expect(Studio.description).toContain('Studio');
+  });
+
+  it('should have codemod v2-to-v3 command', () => {
+    expect(V2ToV3.description).toContain('v2');
+  });
+
+  describe('Plugin subcommands', () => {
+    it('should have plugin list command', () => {
+      expect(PluginList.description).toContain('List');
+    });
+
+    it('should have plugin info command', () => {
+      expect(PluginInfo.description).toContain('information');
+    });
+
+    it('should have plugin add command', () => {
+      expect(PluginAdd.description).toContain('Add');
+    });
+
+    it('should have plugin remove command', () => {
+      expect(PluginRemove.description).toContain('Remove');
+    });
+
+    it('should have plugin remove alias', () => {
+      expect(PluginRemove.aliases).toContain('plugin rm');
+    });
+
+    it('should have plugin list alias', () => {
+      expect(PluginList.aliases).toContain('plugin ls');
+    });
   });
 });
diff --git a/packages/cli/test/plugin-commands.test.ts b/packages/cli/test/plugin-commands.test.ts
index e8f93f4cb6..ddb9b4daaa 100644
--- a/packages/cli/test/plugin-commands.test.ts
+++ b/packages/cli/test/plugin-commands.test.ts
@@ -1,162 +1,44 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { Command } from 'commander';
-import { loadPluginCommands } from '../src/utils/plugin-commands';
-
-// Mock the config loader
-vi.mock('../src/utils/config.js', () => ({
-  loadConfig: vi.fn(),
-}));
-
-import { loadConfig } from '../src/utils/config';
-
-const mockedLoadConfig = vi.mocked(loadConfig);
-
-describe('loadPluginCommands', () => {
-  let program: Command;
-
-  beforeEach(() => {
-    program = new Command();
-    program.name('objectstack');
-    vi.clearAllMocks();
-  });
-
-  it('should do nothing when no config file exists', async () => {
-    mockedLoadConfig.mockRejectedValue(new Error('No config found'));
-
-    await loadPluginCommands(program);
-    expect(program.commands).toHaveLength(0);
-  });
-
-  it('should do nothing when no plugins have command contributions', async () => {
-    mockedLoadConfig.mockResolvedValue({
-      config: {
-        plugins: [
-          { name: 'simple-plugin' },
-        ],
-      },
-      absolutePath: '/test/objectstack.config.ts',
-      duration: 10,
-    });
-
-    await loadPluginCommands(program);
-    expect(program.commands).toHaveLength(0);
-  });
-
-  it('should do nothing when plugins array is empty', async () => {
-    mockedLoadConfig.mockResolvedValue({
-      config: {
-        plugins: [],
-      },
-      absolutePath: '/test/objectstack.config.ts',
-      duration: 10,
-    });
-
-    await loadPluginCommands(program);
-    expect(program.commands).toHaveLength(0);
-  });
-
-  it('should do nothing when config has no plugins key', async () => {
-    mockedLoadConfig.mockResolvedValue({
-      config: {},
-      absolutePath: '/test/objectstack.config.ts',
-      duration: 10,
-    });
-
-    await loadPluginCommands(program);
-    expect(program.commands).toHaveLength(0);
-  });
-
-  it('should detect command contributions from plugin manifest', async () => {
-    // This test verifies that the contribution detection logic works,
-    // even though the dynamic import will fail (no real module to load)
-    mockedLoadConfig.mockResolvedValue({
-      config: {
-        plugins: [
-          {
-            name: '@acme/plugin-marketplace',
-            manifest: {
-              contributes: {
-                commands: [
-                  {
-                    name: 'marketplace',
-                    description: 'Manage marketplace apps',
-                    module: './cli',
-                  },
-                ],
-              },
-            },
-          },
-        ],
-      },
-      absolutePath: '/test/objectstack.config.ts',
-      duration: 10,
-    });
-
-    // loadPluginCommands will try to import the module and fail silently
-    // (since no real module exists), but it should not throw
-    await loadPluginCommands(program);
-  });
-
-  it('should detect contributions from top-level contributes field', async () => {
-    mockedLoadConfig.mockResolvedValue({
-      config: {
-        plugins: [
-          {
-            name: '@acme/plugin-deploy',
-            contributes: {
-              commands: [
-                {
-                  name: 'deploy',
-                  description: 'Deploy to cloud',
-                },
-              ],
-            },
-          },
-        ],
-      },
-      absolutePath: '/test/objectstack.config.ts',
-      duration: 10,
-    });
-
-    // Should not throw even if import fails
-    await loadPluginCommands(program);
-  });
-
-  it('should skip non-object plugins', async () => {
-    mockedLoadConfig.mockResolvedValue({
-      config: {
-        plugins: [
-          'some-string-plugin',
-          null,
-          undefined,
-          42,
-        ],
-      },
-      absolutePath: '/test/objectstack.config.ts',
-      duration: 10,
-    });
-
-    await loadPluginCommands(program);
-    expect(program.commands).toHaveLength(0);
-  });
-
-  it('should handle plugins with non-array commands gracefully', async () => {
-    mockedLoadConfig.mockResolvedValue({
-      config: {
-        plugins: [
-          {
-            name: '@acme/bad-plugin',
-            contributes: {
-              commands: 'not-an-array',
-            },
-          },
-        ],
-      },
-      absolutePath: '/test/objectstack.config.ts',
-      duration: 10,
-    });
-
-    await loadPluginCommands(program);
-    expect(program.commands).toHaveLength(0);
+import { describe, it, expect } from 'vitest';
+
+/**
+ * The custom loadPluginCommands mechanism has been removed.
+ * Plugin command extension is now handled by oclif's built-in plugin system.
+ *
+ * Plugins extend the CLI by:
+ * 1. Including `oclif` config in their package.json
+ * 2. Exporting oclif Command classes from `src/commands/`
+ * 3. Being installed via `os plugins install <package>`
+ *
+ * The objectstack.config.ts no longer determines CLI command availability.
+ */
+
+describe('oclif Plugin System', () => {
+  it('should have oclif plugins configured in package.json', async () => {
+    const { createRequire } = await import('module');
+    const require = createRequire(import.meta.url);
+    const pkg = require('../package.json');
+
+    expect(pkg.oclif).toBeDefined();
+    expect(pkg.oclif.plugins).toContain('@oclif/plugin-help');
+    expect(pkg.oclif.plugins).toContain('@oclif/plugin-plugins');
+  });
+
+  it('should have oclif command discovery configured', async () => {
+    const { createRequire } = await import('module');
+    const require = createRequire(import.meta.url);
+    const pkg = require('../package.json');
+
+    expect(pkg.oclif.commands).toBeDefined();
+    expect(pkg.oclif.commands.strategy).toBe('pattern');
+    expect(pkg.oclif.commands.target).toBe('./dist/commands');
+  });
+
+  it('should have bin entries pointing to oclif runner', async () => {
+    const { createRequire } = await import('module');
+    const require = createRequire(import.meta.url);
+    const pkg = require('../package.json');
+
+    expect(pkg.bin.os).toBe('./bin/run.js');
+    expect(pkg.bin.objectstack).toBe('./bin/run.js');
   });
 });
diff --git a/packages/cli/test/plugin.test.ts b/packages/cli/test/plugin.test.ts
index 6ff3581ad1..9cf466632a 100644
--- a/packages/cli/test/plugin.test.ts
+++ b/packages/cli/test/plugin.test.ts
@@ -1,39 +1,35 @@
 import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { pluginCommand } from '../src/commands/plugin';
+import PluginList from '../src/commands/plugin/list';
+import PluginInfo from '../src/commands/plugin/info';
+import PluginAdd from '../src/commands/plugin/add';
+import PluginRemove from '../src/commands/plugin/remove';
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
 
-describe('Plugin Command', () => {
-  it('should have plugin command with subcommands', () => {
-    expect(pluginCommand.name()).toBe('plugin');
-    expect(pluginCommand.description()).toContain('plugin');
+describe('Plugin Commands (oclif)', () => {
+  it('should have plugin list command', () => {
+    expect(PluginList.description).toContain('List');
   });
 
-  it('should have list subcommand with alias', () => {
-    const list = pluginCommand.commands.find(c => c.name() === 'list');
-    expect(list).toBeDefined();
-    expect(list!.alias()).toBe('ls');
-    expect(list!.description()).toContain('List');
+  it('should have plugin list alias', () => {
+    expect(PluginList.aliases).toContain('plugin ls');
   });
 
-  it('should have info subcommand', () => {
-    const info = pluginCommand.commands.find(c => c.name() === 'info');
-    expect(info).toBeDefined();
-    expect(info!.description()).toContain('information');
+  it('should have plugin info command', () => {
+    expect(PluginInfo.description).toContain('information');
   });
 
-  it('should have add subcommand', () => {
-    const add = pluginCommand.commands.find(c => c.name() === 'add');
-    expect(add).toBeDefined();
-    expect(add!.description()).toContain('Add');
+  it('should have plugin add command', () => {
+    expect(PluginAdd.description).toContain('Add');
   });
 
-  it('should have remove subcommand with alias', () => {
-    const remove = pluginCommand.commands.find(c => c.name() === 'remove');
-    expect(remove).toBeDefined();
-    expect(remove!.alias()).toBe('rm');
-    expect(remove!.description()).toContain('Remove');
+  it('should have plugin remove command', () => {
+    expect(PluginRemove.description).toContain('Remove');
+  });
+
+  it('should have plugin remove alias', () => {
+    expect(PluginRemove.aliases).toContain('plugin rm');
   });
 });
 

From b3a8a81853f0c741b16a27d985286cdfd8590976 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 18 Feb 2026 04:14:51 +0000
Subject: [PATCH 10/10] feat: update CLI extension spec, README, and bin entry
 points for oclif

- Update CLIExtensionSpec to reference oclif plugin model
- Add OclifPluginConfigSchema for plugin package.json validation
- Update cli-extension.test.ts for new schemas (11 tests passing)
- Update README.md with oclif architecture, plugin docs, migration table
- Remove old bin/objectstack.js, add bin/run.js and bin/run-dev.js
- Update root package.json scripts to use new bin entry

Co-authored-by: hotlong <50353452+hotlong@users.noreply.github.com>
---
 package.json                                  |   6 +-
 packages/cli/README.md                        | 152 +++++++++++-------
 packages/cli/bin/objectstack.js               |   2 -
 .../spec/src/kernel/cli-extension.test.ts     |  52 +++---
 packages/spec/src/kernel/cli-extension.zod.ts | 136 +++++++++-------
 5 files changed, 209 insertions(+), 139 deletions(-)
 delete mode 100755 packages/cli/bin/objectstack.js

diff --git a/package.json b/package.json
index 43349b3dd4..5b5183b4dc 100644
--- a/package.json
+++ b/package.json
@@ -5,12 +5,12 @@
   "description": "ObjectStack Protocol & Specification - Monorepo for TypeScript Interfaces, JSON Schemas, and Convention Configurations",
   "scripts": {
     "build": "turbo run build --filter=!@objectstack/docs",
-    "dev": "pnpm --filter @objectstack/cli build && node packages/cli/bin/objectstack.js serve --dev",
+    "dev": "pnpm --filter @objectstack/cli build && node packages/cli/bin/run.js serve --dev",
     "dev:studio": "pnpm --filter @objectstack/studio dev",
-    "studio": "pnpm --filter @objectstack/cli build && node packages/cli/bin/objectstack.js studio",
+    "studio": "pnpm --filter @objectstack/cli build && node packages/cli/bin/run.js studio",
     "test": "turbo run test --filter=@objectstack/spec",
     "clean": "turbo run clean && rm -rf dist",
-    "doctor": "pnpm --filter @objectstack/cli build && node packages/cli/bin/objectstack.js doctor",
+    "doctor": "pnpm --filter @objectstack/cli build && node packages/cli/bin/run.js doctor",
     "setup": "pnpm install && pnpm --filter @objectstack/spec build",
     "version": "changeset version",
     "release": "pnpm run build && changeset publish",
diff --git a/packages/cli/README.md b/packages/cli/README.md
index 34dec8f445..9c8baf0efb 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -2,6 +2,8 @@
 
 Command Line Interface for building metadata-driven applications with the ObjectStack Protocol.
 
+Built on [oclif](https://oclif.io/) — commands are auto-discovered, and plugins can extend the CLI without modifying the main package.
+
 ## Installation
 
 ```bash
@@ -40,6 +42,7 @@ os compile
 | `os init [name]` | Initialize a new ObjectStack project in the current directory |
 | `os dev [package]` | Start development mode with hot reload |
 | `os serve [config]` | Start the ObjectStack server with plugin auto-detection |
+| `os studio [config]` | Launch Studio UI with development server |
 
 ### Build & Validate
 
@@ -73,6 +76,20 @@ Available generate types: `object`, `view`, `action`, `flow`, `agent`, `dashboar
 |---------|-------------|
 | `os test [files]` | Run Quality Protocol test scenarios against a running server |
 | `os doctor` | Check development environment health |
+| `os lint [config]` | Check configuration for style and convention issues |
+| `os diff [before] [after]` | Compare two configurations and detect breaking changes |
+
+### Reference
+
+| Command | Description |
+|---------|-------------|
+| `os explain [schema]` | Display human-readable explanation of an ObjectStack schema |
+
+### Code Transforms
+
+| Command | Description |
+|---------|-------------|
+| `os codemod v2-to-v3` | Migrate ObjectStack v2 config to v3 format |
 
 ## Configuration
 
@@ -120,12 +137,12 @@ export default defineStack({
 
 - `-p, --port <port>` — Server port (default: `3000`)
 - `--dev` — Run in development mode (load devPlugins, pretty logging)
+- `--ui` — Enable Studio UI
 - `--no-server` — Skip starting HTTP server plugin
 
 ### `os generate`
 
 - `-d, --dir <directory>` — Override target directory
-- `--dry-run` — Preview without writing files
 
 ### `os plugin list`
 
@@ -140,75 +157,78 @@ export default defineStack({
 
 - `-c, --config <path>` — Configuration file path
 
-## Plugin CLI Extensions
+### `os info`
+
+- `--json` — Output as JSON
 
-Plugins can extend the CLI with custom commands via the `contributes.commands` manifest field. The CLI automatically discovers and loads these commands at startup.
+### `os doctor`
 
-### How to Create a CLI Plugin
+- `-v, --verbose` — Show fix suggestions for warnings
+- `--scan-deprecations` — Scan for deprecated patterns
 
-**1. Declare commands in the plugin manifest:**
+## oclif Plugin System
 
-```typescript
-export default defineStack({
-  manifest: {
-    id: 'com.acme.marketplace',
-    version: '1.0.0',
-    type: 'plugin',
-    name: 'Marketplace Plugin',
-    contributes: {
-      commands: [
-        {
-          name: 'marketplace',
-          description: 'Manage marketplace applications',
-          module: './dist/cli.js',
-        },
-      ],
-    },
-  },
-});
+The CLI uses oclif's built-in plugin system for extensibility. Third-party plugins (e.g., cloud commands, marketplace tools) can extend the CLI without modifying the main package.
+
+### How Plugin Extension Works
+
+1. **Create an oclif plugin package** with its own `oclif` config in `package.json`
+2. **Export oclif Command classes** from the plugin's `src/commands/` directory
+3. **Install the plugin** via `os plugins install <package>` or declare it in the main CLI's `oclif.plugins`
+
+### Creating a CLI Plugin
+
+**1. Configure the plugin's `package.json`:**
+
+```json
+{
+  "name": "@acme/plugin-marketplace",
+  "oclif": {
+    "commands": {
+      "strategy": "pattern",
+      "target": "./dist/commands",
+      "glob": "**/*.js"
+    }
+  }
+}
 ```
 
-**2. Export Commander.js commands from the module:**
+**2. Create oclif Command classes:**
 
 ```typescript
-// src/cli.ts
-import { Command } from 'commander';
-
-const marketplaceCommand = new Command('marketplace')
-  .description('Manage marketplace applications')
-  .addCommand(
-    new Command('search')
-      .argument('<query>')
-      .action(async (query) => { /* ... */ })
-  )
-  .addCommand(
-    new Command('install')
-      .argument('<app>')
-      .action(async (app) => { /* ... */ })
-  );
-
-// Named export (recommended)
-export const commands = [marketplaceCommand];
-// Also supports: export default Command | Command[]
+// src/commands/marketplace/search.ts
+import { Args, Command, Flags } from '@oclif/core';
+
+export default class MarketplaceSearch extends Command {
+  static override description = 'Search marketplace applications';
+
+  static override args = {
+    query: Args.string({ description: 'Search query', required: true }),
+  };
+
+  async run() {
+    const { args } = await this.parse(MarketplaceSearch);
+    // Implementation...
+  }
+}
 ```
 
-**3. Register the plugin in the host project and use:**
+**3. Install and use:**
 
 ```bash
-os plugin add @acme/plugin-marketplace
+os plugins install @acme/plugin-marketplace
 os marketplace search "crm"
-os marketplace install com.acme.crm
 ```
 
-For a complete guide, see the [Plugin CLI Extensions](/docs/guides/plugins#cli-command-extensions) section in the Plugins guide.
+### Key Differences from Previous Plugin Model
 
-### `os info`
-
-- `--json` — Output as JSON
-
-### `os doctor`
-
-- `-v, --verbose` — Show fix suggestions for warnings
+| Before (Commander.js) | After (oclif) |
+|---|---|
+| Plugins declared in `objectstack.config.ts` | Plugins installed via `os plugins install` or `oclif.plugins` |
+| Custom `loadPluginCommands` mechanism | oclif's built-in plugin discovery |
+| `contributes.commands` in manifest | `oclif.commands` in `package.json` |
+| Commander.js `new Command(...)` exports | oclif `class extends Command` exports |
+| Project config determines CLI commands | CLI commands available without project init |
 
 ## Typical Workflow
 
@@ -223,6 +243,30 @@ os dev                           # 7. Start dev server
 os compile                       # 8. Build for production
 ```
 
+## Architecture
+
+```
+@objectstack/cli (oclif)
+├── bin/run.js                  # Entry point (os / objectstack)
+├── src/commands/               # Auto-discovered command classes
+│   ├── init.ts                 # os init
+│   ├── dev.ts                  # os dev
+│   ├── serve.ts                # os serve
+│   ├── compile.ts              # os compile
+│   ├── validate.ts             # os validate
+│   ├── generate.ts             # os generate (alias: g)
+│   ├── plugin/                 # os plugin <subcommand>
+│   │   ├── list.ts
+│   │   ├── info.ts
+│   │   ├── add.ts
+│   │   └── remove.ts
+│   ├── codemod/                # os codemod <subcommand>
+│   │   └── v2-to-v3.ts
+│   └── ...
+├── src/utils/                  # Shared utilities
+└── package.json                # oclif config under "oclif" key
+```
+
 ## License
 
 Apache-2.0
diff --git a/packages/cli/bin/objectstack.js b/packages/cli/bin/objectstack.js
deleted file mode 100755
index c7ad3e202b..0000000000
--- a/packages/cli/bin/objectstack.js
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-import '../dist/bin.js';
diff --git a/packages/spec/src/kernel/cli-extension.test.ts b/packages/spec/src/kernel/cli-extension.test.ts
index 5d8027fc39..39951eb12e 100644
--- a/packages/spec/src/kernel/cli-extension.test.ts
+++ b/packages/spec/src/kernel/cli-extension.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from 'vitest';
 import {
   CLICommandContributionSchema,
-  CLIExtensionExportSchema,
+  OclifPluginConfigSchema,
 } from './cli-extension.zod';
 
 describe('CLICommandContributionSchema', () => {
@@ -18,9 +18,9 @@ describe('CLICommandContributionSchema', () => {
     const result = CLICommandContributionSchema.parse({
       name: 'deploy',
       description: 'Deploy to cloud',
-      module: './dist/cli.js',
+      module: './dist/commands/deploy.js',
     });
-    expect(result.module).toBe('./dist/cli.js');
+    expect(result.module).toBe('./dist/commands/deploy.js');
   });
 
   it('should accept minimal command (name only)', () => {
@@ -64,30 +64,44 @@ describe('CLICommandContributionSchema', () => {
   });
 });
 
-describe('CLIExtensionExportSchema', () => {
-  it('should accept named commands export', () => {
-    const result = CLIExtensionExportSchema.parse({
-      commands: [{}, {}],
+describe('OclifPluginConfigSchema', () => {
+  it('should accept valid oclif plugin config', () => {
+    const result = OclifPluginConfigSchema.parse({
+      commands: {
+        strategy: 'pattern',
+        target: './dist/commands',
+        glob: '**/*.js',
+      },
     });
-    expect(result.commands).toHaveLength(2);
+    expect(result.commands?.strategy).toBe('pattern');
+    expect(result.commands?.target).toBe('./dist/commands');
   });
 
-  it('should accept default export', () => {
-    const result = CLIExtensionExportSchema.parse({
-      default: {},
+  it('should accept config with topicSeparator', () => {
+    const result = OclifPluginConfigSchema.parse({
+      commands: { strategy: 'pattern' },
+      topicSeparator: ' ',
     });
-    expect(result.default).toBeDefined();
+    expect(result.topicSeparator).toBe(' ');
   });
 
-  it('should accept default array export', () => {
-    const result = CLIExtensionExportSchema.parse({
-      default: [{}, {}],
+  it('should accept empty config', () => {
+    const result = OclifPluginConfigSchema.parse({});
+    expect(result).toBeDefined();
+  });
+
+  it('should accept config with only commands', () => {
+    const result = OclifPluginConfigSchema.parse({
+      commands: {
+        strategy: 'explicit',
+      },
     });
-    expect(Array.isArray(result.default)).toBe(true);
+    expect(result.commands?.strategy).toBe('explicit');
   });
 
-  it('should accept empty object', () => {
-    const result = CLIExtensionExportSchema.parse({});
-    expect(result).toBeDefined();
+  it('should reject invalid strategy', () => {
+    expect(() => OclifPluginConfigSchema.parse({
+      commands: { strategy: 'invalid' },
+    })).toThrow();
   });
 });
diff --git a/packages/spec/src/kernel/cli-extension.zod.ts b/packages/spec/src/kernel/cli-extension.zod.ts
index a12306a854..2d1f5bdbc1 100644
--- a/packages/spec/src/kernel/cli-extension.zod.ts
+++ b/packages/spec/src/kernel/cli-extension.zod.ts
@@ -7,58 +7,69 @@ import { z } from 'zod';
  * 
  * Defines the contract for plugins that extend the ObjectStack CLI with
  * custom commands. This enables third-party packages (e.g., marketplace,
- * deployment tools) to register new top-level or nested CLI commands.
+ * cloud deployment tools) to register new CLI commands via oclif's
+ * built-in plugin system.
  * 
- * ## How It Works
+ * ## How It Works (oclif Plugin Model)
  * 
- * 1. **Declare** — Plugin's manifest declares `contributes.commands` entries.
- * 2. **Discover** — The CLI scans installed plugins for command contributions.
- * 3. **Load** — The CLI dynamically imports the plugin module and registers
- *    exported Commander.js `Command` instances.
+ * 1. **Declare** — Plugin's `package.json` includes an `oclif` config section
+ *    declaring its commands directory and any topics.
+ * 2. **Discover** — The main CLI (`@objectstack/cli`) lists the plugin in its
+ *    `oclif.plugins` array, or users install it via `os plugins install <pkg>`.
+ * 3. **Load** — oclif automatically discovers and registers all Command classes
+ *    exported from the plugin's commands directory.
  * 
- * ## Plugin Module Contract
+ * ## Plugin Package Contract
  * 
- * The plugin must export commands in one of these forms:
+ * The plugin must be a valid oclif plugin:
  * 
- * ```typescript
- * // Form 1: Named export array
- * export const commands = [marketplaceCommand, deployCommand];
- * 
- * // Form 2: Default export (single command)
- * export default marketplaceCommand;
- * 
- * // Form 3: Default export (array)
- * export default [marketplaceCommand, deployCommand];
+ * ```json
+ * // package.json of the plugin
+ * {
+ *   "name": "@acme/plugin-marketplace",
+ *   "oclif": {
+ *     "commands": {
+ *       "strategy": "pattern",
+ *       "target": "./dist/commands",
+ *       "glob": "**\/*.js"
+ *     }
+ *   }
+ * }
  * ```
  * 
- * @example
- * ```typescript
- * // In @acme/plugin-marketplace/src/cli.ts
- * import { Command } from 'commander';
+ * Commands are standard oclif Command classes:
  * 
- * const marketplaceCommand = new Command('marketplace')
- *   .description('Manage marketplace applications')
- *   .addCommand(
- *     new Command('publish')
- *       .description('Publish app to marketplace')
- *       .action(async () => { ... })
- *   )
- *   .addCommand(
- *     new Command('search')
- *       .description('Search marketplace apps')
- *       .argument('<query>', 'Search query')
- *       .action(async (query) => { ... })
- *   );
+ * ```typescript
+ * // src/commands/marketplace/search.ts
+ * import { Args, Command, Flags } from '@oclif/core';
  * 
- * export const commands = [marketplaceCommand];
+ * export default class MarketplaceSearch extends Command {
+ *   static override description = 'Search marketplace apps';
+ *   static override args = {
+ *     query: Args.string({ description: 'Search query', required: true }),
+ *   };
+ *   async run() {
+ *     const { args } = await this.parse(MarketplaceSearch);
+ *     // ...
+ *   }
+ * }
  * ```
+ * 
+ * ## Migration from Commander.js
+ * 
+ * The previous plugin model required `contributes.commands` in the manifest
+ * and exported Commander.js `Command` instances. The new model uses oclif's
+ * native plugin system for automatic command discovery and registration.
+ * The `objectstack.config.ts` plugins array no longer determines CLI commands.
  */
 
 /**
  * Schema for a CLI Command Contribution declaration in the manifest.
  * 
- * This is the declarative metadata — the actual Commander.js `Command`
- * objects are loaded at runtime from the plugin's module.
+ * This declarative metadata describes CLI commands contributed by a plugin.
+ * With the oclif migration, commands are auto-discovered from the plugin's
+ * commands directory. This schema is retained for backward compatibility
+ * and for describing command metadata in plugin manifests.
  */
 export const CLICommandContributionSchema = z.object({
   /** 
@@ -77,38 +88,41 @@ export const CLICommandContributionSchema = z.object({
   description: z.string().optional().describe('Command description for help text'),
 
   /** 
-   * Module path that exports the Commander.js command(s).
-   * Relative to the plugin package root. If omitted, the CLI 
-   * imports from the package's main entry point.
+   * Module path that exports the oclif Command class(es).
+   * Relative to the plugin package root. With oclif, this is typically
+   * auto-discovered from the `commands` directory, but can be specified
+   * for documentation or manifest purposes.
    * 
-   * The module must export one of:
-   * - `export const commands: Command[]`
-   * - `export default Command | Command[]`
-   * 
-   * @example "./dist/cli.js"
-   * @example "./cli"
+   * @example "./dist/commands/marketplace.js"
+   * @example "./dist/commands"
    */
-  module: z.string().optional().describe('Module path exporting Commander.js commands'),
+  module: z.string().optional().describe('Module path exporting oclif Command classes'),
 });
 
 /**
- * Schema for the CLI Extension module contract.
- * Validates the shape of what a plugin module should export for CLI integration.
+ * Schema for oclif plugin configuration in package.json.
+ * Validates the shape of the `oclif` section in a plugin's package.json.
  */
-export const CLIExtensionExportSchema = z.object({
-  /** Named export: array of Commander.js Command instances */
-  commands: z.array(z.unknown()).optional()
-    .describe('Array of Commander.js Command instances'),
+export const OclifPluginConfigSchema = z.object({
+  /** Command discovery configuration */
+  commands: z.object({
+    /** Discovery strategy — typically "pattern" for file-based discovery */
+    strategy: z.enum(['pattern', 'explicit', 'single']).optional()
+      .describe('Command discovery strategy'),
+    /** Directory path containing compiled command files */
+    target: z.string().optional()
+      .describe('Target directory for command files'),
+    /** Glob pattern for matching command files */
+    glob: z.string().optional()
+      .describe('Glob pattern for command file matching'),
+  }).optional().describe('Command discovery configuration'),
 
-  /** Default export: single Command or array of Commands */
-  default: z.union([
-    z.unknown(),
-    z.array(z.unknown()),
-  ]).optional()
-    .describe('Default export: Command or Command[]'),
-});
+  /** Topic separator character (default: space) */
+  topicSeparator: z.string().optional()
+    .describe('Character separating topic and command names'),
+}).describe('oclif plugin configuration section');
 
 // ─── Types ───────────────────────────────────────────────────────────
 
 export type CLICommandContribution = z.infer<typeof CLICommandContributionSchema>;
-export type CLIExtensionExport = z.infer<typeof CLIExtensionExportSchema>;
+export type OclifPluginConfig = z.infer<typeof OclifPluginConfigSchema>;