@dot-ai/core 0.9.0 → 0.11.0

package/src/extension-loader.ts

@@ -2,85 +2,205 @@ import { readdir, readFile, stat } from 'node:fs/promises';
 import { join, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import type { ExtensionAPI } from './extension-api.js';
-import type { LoadedExtension, ToolDefinition, CommandDefinition, ExtensionTier } from './extension-types.js';
-import { EVENT_TIERS } from './extension-types.js';
-import type { ExtensionsConfig } from './types.js';
+import type { LoadedExtension, ToolDefinition, CommandDefinition } from './extension-types.js';
+import type { ExtensionsConfig, Skill, Identity } from './types.js';
+
+function isExtensionFile(name: string): boolean {
+  return name.endsWith('.ts') || name.endsWith('.js');
+}
+
+/**
+ * Resolve extension entry points from a directory.
+ *
+ * Checks for:
+ * 1. package.json with "dot-ai.extensions" field -> returns declared paths
+ * 2. index.ts or index.js -> returns the index file
+ *
+ * Returns resolved paths or null if no entry points found.
+ */
+async function resolveExtensionEntries(dir: string): Promise<string[] | null> {
+  // Check for package.json with "dot-ai" field first
+  try {
+    const pkgPath = join(dir, 'package.json');
+    const pkgRaw = await readFile(pkgPath, 'utf-8');
+    const pkg = JSON.parse(pkgRaw) as Record<string, unknown>;
+    const dotAi = pkg['dot-ai'] as { extensions?: string[] } | undefined;
+    if (dotAi?.extensions && Array.isArray(dotAi.extensions)) {
+      const entries: string[] = [];
+      for (const ext of dotAi.extensions) {
+        const resolvedPath = resolve(dir, ext);
+        try {
+          await stat(resolvedPath);
+          entries.push(resolvedPath);
+        } catch { /* entry doesn't exist */ }
+      }
+      if (entries.length > 0) return entries;
+    }
+  } catch { /* no package.json or invalid */ }
+
+  // Check for index.ts or index.js
+  for (const indexName of ['index.ts', 'index.js']) {
+    const indexPath = join(dir, indexName);
+    try {
+      await stat(indexPath);
+      return [indexPath];
+    } catch { /* not found */ }
+  }
+
+  return null;
+}
+
+/**
+ * Scan a directory for extensions.
+ *
+ * Discovery rules:
+ * 1. Direct files: `dir/*.ts` or `*.js` -> load
+ * 2. Subdirectory with package.json: `dir/sub/package.json` with "dot-ai" field -> load what it declares
+ * 3. Subdirectory with index: `dir/sub/index.ts` or `index.js` -> load
+ *
+ * No recursion beyond one level. Complex packages must use package.json manifest.
+ */
+async function discoverExtensionsInDir(dir: string): Promise<string[]> {
+  const discovered: string[] = [];
+
+  try {
+    const entries = await readdir(dir, { withFileTypes: true });
+
+    for (const entry of entries) {
+      const entryPath = join(dir, entry.name);
+
+      // 1. Direct files: *.ts or *.js
+      if (entry.isFile() && isExtensionFile(entry.name)) {
+        discovered.push(entryPath);
+        continue;
+      }
+
+      // 2 & 3. Subdirectories: package.json or index file
+      if (entry.isDirectory()) {
+        const resolved = await resolveExtensionEntries(entryPath);
+        if (resolved) {
+          discovered.push(...resolved);
+        }
+      }
+    }
+  } catch { /* directory doesn't exist — skip */ }
+
+  return discovered;
+}
 
 /**
- * Discover extension file paths from configured locations.
+ * Resolve extensions from installed packages in .ai/packages/.
+ *
+ * Reads the package.json created by `npm --prefix .ai/packages/` and resolves
+ * extension entry points from each installed package's "dot-ai.extensions" field.
+ */
+async function resolveInstalledPackages(workspaceRoot: string): Promise<string[]> {
+  const packagesDir = join(workspaceRoot, '.ai', 'packages');
+  const pkgJsonPath = join(packagesDir, 'package.json');
+
+  try {
+    const raw = await readFile(pkgJsonPath, 'utf-8');
+    const pkg = JSON.parse(raw) as Record<string, unknown>;
+    const deps = pkg.dependencies as Record<string, string> | undefined;
+    if (!deps) return [];
+
+    const paths: string[] = [];
+    for (const name of Object.keys(deps)) {
+      const pkgDir = join(packagesDir, 'node_modules', name);
+      const entries = await resolveExtensionEntries(pkgDir);
+      if (entries) {
+        paths.push(...entries);
+      }
+    }
+    return paths;
+  } catch {
+    return [];
+  }
+}
+
+/**
+ * Discover extension file paths from all sources.
+ *
+ * Sources (in order):
+ * 1. Auto-discovery: .ai/extensions/ (project-local)
+ * 2. Auto-discovery: ~/.ai/extensions/ (global)
+ * 3. Installed packages: .ai/packages/node_modules/ (installed via dot-ai install)
+ * 4. Configured paths: settings.json "extensions" array (explicit paths/dirs)
+ * 5. Configured packages: settings.json "packages" array (npm package names resolved from workspace node_modules)
  */
 export async function discoverExtensions(
   workspaceRoot: string,
   config?: ExtensionsConfig,
 ): Promise<string[]> {
-  const paths = new Set<string>();
+  const seen = new Set<string>();
+  const allPaths: string[] = [];
+
+  const addPaths = (paths: string[]) => {
+    for (const p of paths) {
+      const resolved = resolve(p);
+      if (!seen.has(resolved)) {
+        seen.add(resolved);
+        allPaths.push(resolved);
+      }
+    }
+  };
 
-  // Default discovery paths
-  const searchDirs = [
-    join(workspaceRoot, '.ai', 'extensions'),
-    join(homedir(), '.ai', 'extensions'),
-    ...(config?.paths ?? []).map(p => resolve(workspaceRoot, p)),
-  ];
+  // 1. Project-local extensions: .ai/extensions/
+  addPaths(await discoverExtensionsInDir(join(workspaceRoot, '.ai', 'extensions')));
 
-  for (const dir of searchDirs) {
-    try {
-      const entries = await readdir(dir, { withFileTypes: true });
-      for (const entry of entries) {
-        const fullPath = join(dir, entry.name);
-        if (entry.isFile() && (entry.name.endsWith('.ts') || entry.name.endsWith('.js'))) {
-          paths.add(fullPath);
-        } else if (entry.isDirectory()) {
-          // Check for index.ts or index.js
-          for (const indexName of ['index.ts', 'index.js']) {
-            const indexPath = join(fullPath, indexName);
-            try {
-              await stat(indexPath);
-              paths.add(indexPath);
-              break;
-            } catch { /* not found */ }
+  // 2. Global extensions: ~/.ai/extensions/
+  addPaths(await discoverExtensionsInDir(join(homedir(), '.ai', 'extensions')));
+
+  // 3. Installed packages: .ai/packages/node_modules/
+  addPaths(await resolveInstalledPackages(workspaceRoot));
+
+  // 4. Explicitly configured paths from settings.json "extensions" array
+  if (config?.paths) {
+    for (const p of config.paths) {
+      const resolved = resolve(workspaceRoot, p);
+      try {
+        const s = await stat(resolved);
+        if (s.isDirectory()) {
+          // Check for package.json or index file first
+          const entries = await resolveExtensionEntries(resolved);
+          if (entries) {
+            addPaths(entries);
+          } else {
+            // Discover individual files in directory
+            addPaths(await discoverExtensionsInDir(resolved));
           }
-          // Check for package.json with dot-ai field
-          try {
-            const pkgPath = join(fullPath, 'package.json');
-            const pkgRaw = await readFile(pkgPath, 'utf-8');
-            const pkg = JSON.parse(pkgRaw) as Record<string, unknown>;
-            const dotAi = pkg['dot-ai'] as { extensions?: string[] } | undefined;
-            if (dotAi?.extensions && Array.isArray(dotAi.extensions)) {
-              for (const ext of dotAi.extensions) {
-                paths.add(resolve(fullPath, ext));
-              }
-            }
-          } catch { /* no package.json or no dot-ai field */ }
+        } else if (s.isFile()) {
+          addPaths([resolved]);
         }
+      } catch {
+        // Path doesn't exist — add anyway (will fail at load time with clear error)
+        addPaths([resolved]);
       }
-    } catch { /* directory doesn't exist — skip */ }
+    }
   }
 
-  // Also resolve npm packages from config
+  // 5. Configured npm packages from settings.json "packages" array
+  // These are resolved from the workspace's own node_modules
   if (config?.packages) {
     for (const pkg of config.packages) {
       try {
         const { createRequire } = await import('node:module');
         const require = createRequire(join(workspaceRoot, 'package.json'));
         const pkgJsonPath = require.resolve(`${pkg}/package.json`);
-        const pkgRaw = await readFile(pkgJsonPath, 'utf-8');
-        const pkgJson = JSON.parse(pkgRaw) as Record<string, unknown>;
-        const dotAi = pkgJson['dot-ai'] as { extensions?: string[] } | undefined;
-        if (dotAi?.extensions && Array.isArray(dotAi.extensions)) {
-          const pkgDir = join(pkgJsonPath, '..');
-          for (const ext of dotAi.extensions) {
-            paths.add(resolve(pkgDir, ext));
-          }
+        const pkgDir = join(pkgJsonPath, '..');
+        const entries = await resolveExtensionEntries(pkgDir);
+        if (entries) {
+          addPaths(entries);
         }
       } catch { /* package not found */ }
     }
   }
 
-  return Array.from(paths);
+  return allPaths;
 }
 
 /**
- * Create a v6 ExtensionAPI instance that collects registrations into a LoadedExtension.
+ * Create an ExtensionAPI instance that collects registrations into a LoadedExtension.
  * Extensions communicate via events only — no provider access.
  */
 export function createV6CollectorAPI(
@@ -94,7 +214,9 @@ export function createV6CollectorAPI(
     handlers: new Map(),
     tools: new Map(),
     commands: new Map(),
-    tiers: new Set(),
+    skills: new Map(),
+    identities: new Map(),
+    labels: new Set(),
   };
 
   const api: ExtensionAPI = {
@@ -103,11 +225,6 @@ export function createV6CollectorAPI(
         extension.handlers.set(event, []);
       }
       extension.handlers.get(event)!.push(handler);
-
-      const tier: ExtensionTier | undefined = EVENT_TIERS[event];
-      if (tier) {
-        extension.tiers.add(tier);
-      }
     },
     registerTool(tool: ToolDefinition) {
       extension.tools.set(tool.name, tool);
@@ -115,6 +232,19 @@ export function createV6CollectorAPI(
     registerCommand(command: CommandDefinition) {
       extension.commands.set(command.name, command);
     },
+    registerSkill(skill: Skill) {
+      extension.skills.set(skill.name, skill);
+      // Skills contribute their labels and triggers to vocabulary
+      for (const label of skill.labels) extension.labels.add(label);
+      for (const trigger of skill.triggers ?? []) extension.labels.add(trigger);
+    },
+    registerIdentity(identity: Identity) {
+      const key = `${identity.type}:${identity.node ?? 'root'}`;
+      extension.identities.set(key, identity);
+    },
+    contributeLabels(labels: string[]) {
+      for (const label of labels) extension.labels.add(label);
+    },
     events: eventBus ?? {
       on: () => {},
       emit: () => {},

package/src/extension-runner.ts

@@ -2,7 +2,6 @@ import type { Logger } from './logger.js';
 import type {
   LoadedExtension,
   ToolDefinition,
-  ExtensionTier,
   ToolCallEvent,
   ToolCallResult,
   ExtensionDiagnostic,
@@ -13,6 +12,7 @@ import type {
   CommandDefinition,
   InputResult,
 } from './extension-types.js';
+import type { Skill, Identity } from './types.js';
 
 /**
  * Simple event bus for inter-extension communication.
@@ -111,7 +111,7 @@ export class ExtensionRunner {
     return null;
   }
 
-  // ── v6 Emission Patterns ──
+  // ── Emission Patterns ──
 
   /**
    * Fire an event and collect sections from all handlers.
@@ -184,7 +184,7 @@ export class ExtensionRunner {
 
   /**
    * Fire an event as a transform chain — each handler receives the previous handler's output.
-   * Used for `label_extract`, `input`, `context_modify`.
+   * Used for `label_extract`, `input`, `tool_result`.
    *
    * - Initial value is `data`.
    * - If a handler returns undefined/null, the previous value is kept (no-op).
@@ -255,6 +255,45 @@ export class ExtensionRunner {
     return Array.from(cmdMap.values());
   }
 
+  /** Get all registered skills across extensions (last-wins for overrides) */
+  get skills(): Skill[] {
+    const skillMap = new Map<string, Skill>();
+
+    for (const ext of this.extensions) {
+      for (const [name, skill] of ext.skills) {
+        skillMap.set(name, skill);
+      }
+    }
+
+    return Array.from(skillMap.values());
+  }
+
+  /** Get all registered identities across extensions */
+  get identities(): Identity[] {
+    const identityMap = new Map<string, Identity>();
+
+    for (const ext of this.extensions) {
+      for (const [key, identity] of ext.identities) {
+        identityMap.set(key, identity);
+      }
+    }
+
+    return Array.from(identityMap.values());
+  }
+
+  /** Get all vocabulary labels contributed by extensions */
+  get vocabularyLabels(): string[] {
+    const labels = new Set<string>();
+
+    for (const ext of this.extensions) {
+      for (const label of ext.labels) {
+        labels.add(label);
+      }
+    }
+
+    return Array.from(labels);
+  }
+
   /** Get diagnostic info */
   get diagnostics(): ExtensionDiagnostic[] {
     return this.extensions.map(ext => ({
@@ -264,21 +303,11 @@ export class ExtensionRunner {
       ),
       toolNames: Array.from(ext.tools.keys()),
       commandNames: ext.commands ? Array.from(ext.commands.keys()) : [],
-      tiers: Array.from(ext.tiers),
+      skillNames: Array.from(ext.skills.keys()),
+      identityNames: Array.from(ext.identities.keys()),
     }));
   }
 
-  /** Which tiers are used by loaded extensions */
-  get usedTiers(): Set<ExtensionTier> {
-    const tiers = new Set<ExtensionTier>();
-    for (const ext of this.extensions) {
-      for (const tier of ext.tiers) {
-        tiers.add(tier);
-      }
-    }
-    return tiers;
-  }
-
   // ── Private Helpers ──
 
   private logHandlerError(extPath: string, event: string, err: unknown): void {