openbot 0.3.5 → 0.4.0

package/src/{registry/plugins.ts → services/plugins/registry.ts}

@@ -1,32 +1,31 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { pathToFileURL } from 'node:url';
-import type { Plugin } from '../bus/plugin.js';
-import { aiSdkPlugin } from '../plugins/ai-sdk/index.js';
-import { shellPlugin } from '../plugins/shell/index.js';
-import { mcpPlugin } from '../plugins/mcp/index.js';
-import { delegationPlugin } from '../plugins/delegation/index.js';
-import { storageToolsPlugin } from '../plugins/storage-tools/index.js';
-import { uiPlugin } from '../plugins/ui/index.js';
-import { approvalPlugin } from '../plugins/approval/index.js';
-import { memoryPlugin } from '../plugins/memory/index.js';
-import { todoPlugin } from '../plugins/todo/index.js';
-import { DEFAULT_PLUGINS_DIR, DEFAULT_BASE_DIR, loadConfig, resolvePath } from '../app/config.js';
+import type { Plugin } from './types.js';
+import { openbotPlugin } from '../../plugins/openbot/index.js';
+import { shellPlugin } from '../../plugins/shell/index.js';
+import { storagePlugin } from '../../plugins/storage/index.js';
+import { approvalPlugin } from '../../plugins/approval/index.js';
+import { memoryPlugin } from '../../plugins/memory/index.js';
+import { delegationPlugin } from '../../plugins/delegation/index.js';
+import { pluginManagerPlugin } from '../../plugins/plugin-manager/index.js';
+import { DEFAULT_PLUGINS_DIR, DEFAULT_BASE_DIR, loadConfig, resolvePath } from '../../app/config.js';
+import {
+  invalidatePlugin as clearResolvedPluginEntry,
+  loadedCommunityPlugins,
+  resolvedPluginCache,
+} from './plugin-cache.js';
 
 let pluginsDir: string | null = null;
-const loadedPlugins = new Set<string>();
-const cache = new Map<string, Plugin>();
 
 const BUILT_IN: Record<string, Plugin> = {
-  [aiSdkPlugin.id]: aiSdkPlugin,
+  [openbotPlugin.id]: openbotPlugin,
   [shellPlugin.id]: shellPlugin,
-  [mcpPlugin.id]: mcpPlugin,
-  [delegationPlugin.id]: delegationPlugin,
-  [storageToolsPlugin.id]: storageToolsPlugin,
-  [uiPlugin.id]: uiPlugin,
+  [storagePlugin.id]: storagePlugin,
   [approvalPlugin.id]: approvalPlugin,
   [memoryPlugin.id]: memoryPlugin,
-  [todoPlugin.id]: todoPlugin,
+  [delegationPlugin.id]: delegationPlugin,
+  [pluginManagerPlugin.id]: pluginManagerPlugin,
 };
 
 /**
@@ -78,14 +77,14 @@ export function initPlugins(dir?: string) {
 
 /**
  * Resolve a Plugin by id. The id is either:
- *   - a built-in id (e.g. "ai-sdk", "shell"), or
+ *   - a built-in id (e.g. "openbot", "shell"), or
  *   - an npm package name (e.g. "openbot-plugin-foo" or "@scope/foo"),
  *     in which case the folder layout is `plugins/<id>/dist/index.js`.
  */
 export async function resolvePlugin(id: string): Promise<Plugin | null> {
-  if (cache.has(id)) return cache.get(id)!;
+  if (resolvedPluginCache.has(id)) return resolvedPluginCache.get(id)!;
   if (BUILT_IN[id]) {
-    cache.set(id, BUILT_IN[id]);
+    resolvedPluginCache.set(id, BUILT_IN[id]);
     return BUILT_IN[id];
   }
 
@@ -109,10 +108,10 @@ export async function resolvePlugin(id: string): Promise<Plugin | null> {
       return null;
     }
     const plugin: Plugin = { id, ...parsed, name: parsed.name || id };
-    cache.set(id, plugin);
-    if (!loadedPlugins.has(id)) {
+    resolvedPluginCache.set(id, plugin);
+    if (!loadedCommunityPlugins.has(id)) {
       console.log(`[plugins] Loaded community plugin "${id}" from ${distPath}`);
-      loadedPlugins.add(id);
+      loadedCommunityPlugins.add(id);
     }
     return plugin;
   } catch (e) {
@@ -123,8 +122,7 @@ export async function resolvePlugin(id: string): Promise<Plugin | null> {
 
 /** Drop a single id from the in-memory cache (e.g. after fresh install). */
 export function invalidatePlugin(id: string): void {
-  cache.delete(id);
-  loadedPlugins.delete(id);
+  clearResolvedPluginEntry(id);
 }
 
 /** List built-in plugins (for marketplace/registry views). */

package/src/services/{plugins.ts → plugins/service.ts}

@@ -6,10 +6,12 @@ import { promisify } from 'node:util';
 import {
   DEFAULT_PLUGINS_DIR,
   DEFAULT_BASE_DIR,
+  DEFAULT_MARKETPLACE_REGISTRY_URL,
   loadConfig,
   resolvePath,
-} from '../app/config.js';
-import { invalidatePlugin } from '../registry/plugins.js';
+} from '../../app/config.js';
+import { invalidatePlugin } from './plugin-cache.js';
+import { PluginRef } from './types.js';
 
 const execAsync = promisify(exec);
 
@@ -24,6 +26,97 @@ export interface InstalledPlugin {
   version: string;
 }
 
+/** One marketplace entry; matches `action:marketplace:list:result` agent shape. */
+export type MarketplaceAgentListing = {
+  id: string;
+  name: string;
+  description: string;
+  image?: string;
+  instructions: string;
+  plugins: PluginRef[];
+};
+
+const DEFAULT_MARKETPLACE_AGENTS: MarketplaceAgentListing[] = [];
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+/**
+ * Parses JSON from a remote registry file. Supports either
+ * `{ "agents": [ ... ] }` or a top-level array.
+ */
+export function parseMarketplaceRegistryJson(data: unknown): MarketplaceAgentListing[] {
+  const rawAgents: unknown =
+    Array.isArray(data) ? data : isRecord(data) && Array.isArray(data.agents) ? data.agents : null;
+  if (!Array.isArray(rawAgents)) {
+    throw new Error('Registry JSON must be an array or an object with an "agents" array');
+  }
+  return rawAgents.map((item, i) => {
+    if (!isRecord(item)) {
+      throw new Error(`agents[${i}]: expected object`);
+    }
+    const id = item.id;
+    const name = item.name;
+    const description = item.description;
+    const instructions = item.instructions;
+    const pluginsRaw = item.plugins;
+    if (typeof id !== 'string' || !id) throw new Error(`agents[${i}].id must be a non-empty string`);
+    if (typeof name !== 'string') throw new Error(`agents[${i}].name must be a string`);
+    if (typeof description !== 'string') throw new Error(`agents[${i}].description must be a string`);
+    if (typeof instructions !== 'string') {
+      throw new Error(`agents[${i}].instructions must be a string`);
+    }
+    if (!Array.isArray(pluginsRaw)) throw new Error(`agents[${i}].plugins must be an array`);
+    const plugins: PluginRef[] = pluginsRaw.map((p, j) => {
+      if (!isRecord(p) || typeof p.id !== 'string' || !p.id) {
+        throw new Error(`agents[${i}].plugins[${j}]: expected { "id": string, "config"?: object }`);
+      }
+      const ref: PluginRef = { id: p.id };
+      if (p.config !== undefined) {
+        if (!isRecord(p.config)) throw new Error(`agents[${i}].plugins[${j}].config must be an object`);
+        ref.config = p.config;
+      }
+      return ref;
+    });
+    const listing: MarketplaceAgentListing = { id, name, description, instructions, plugins };
+    if (item.image !== undefined) {
+      if (typeof item.image !== 'string') throw new Error(`agents[${i}].image must be a string`);
+      listing.image = item.image;
+    }
+    return listing;
+  });
+}
+
+async function fetchMarketplaceAgentsFromUrl(url: string): Promise<MarketplaceAgentListing[]> {
+  const res = await fetch(url, {
+    headers: { Accept: 'application/json' },
+    signal: AbortSignal.timeout(15_000),
+  });
+  if (!res.ok) {
+    throw new Error(`Registry HTTP ${res.status} ${res.statusText}`);
+  }
+  const json: unknown = await res.json();
+  return parseMarketplaceRegistryJson(json);
+}
+
+/**
+ * Resolves marketplace agent listings from configured registry URL, or falls back to an empty list.
+ */
+export async function resolveMarketplaceAgentList(): Promise<MarketplaceAgentListing[]> {
+  const { marketplaceRegistryUrl } = loadConfig();
+  const registryUrl = marketplaceRegistryUrl?.trim() || DEFAULT_MARKETPLACE_REGISTRY_URL;
+  try {
+    return await fetchMarketplaceAgentsFromUrl(registryUrl);
+  } catch (err) {
+    console.warn(
+      `[plugins] marketplace registry fetch failed (${registryUrl}), using built-in list:`,
+      err instanceof Error ? err.message : err,
+    );
+    return DEFAULT_MARKETPLACE_AGENTS;
+  }
+}
+
 const getPluginsDir = (): string => {
   const config = loadConfig();
   const baseDir = resolvePath(config.baseDir || DEFAULT_BASE_DIR);
@@ -131,3 +224,4 @@ export const pluginService = {
     }
   },
 };
+

package/src/{bus/plugin.ts → services/plugins/types.ts}

@@ -1,11 +1,11 @@
 import { MelonyPlugin } from 'melony';
-import { OpenBotEvent, OpenBotState } from '../app/types.js';
-import { AgentDetails, ConfigSchema, Storage } from './types.js';
+import { OpenBotEvent, OpenBotState } from '../../app/types.js';
+import { AgentDetails, ConfigSchema, Storage } from './domain.js';
 
 /**
  * Reference to a plugin from an agent's AGENT.md frontmatter.
  *
- * The `id` is either a built-in plugin id (e.g. `ai-sdk`, `shell`) or an npm
+ * The `id` is either a built-in plugin id (e.g. `openbot`, `shell`) or an npm
  * package name (e.g. `openbot-plugin-codex`, `@scope/openbot-plugin-foo`).
  * Each entry may carry plugin-specific `config`.
  */