openbot 0.5.8 → 0.5.10

package/src/plugins/storage/service.ts

@@ -33,10 +33,7 @@ import {
 import type { PluginRef } from '../../services/plugins/types.js';
 import { OPENBOT_PLUGIN_ID } from '../../app/openbot-plugin.js';
 import { listBuiltInPlugins, parsePluginModule } from '../../services/plugins/registry.js';
-import {
-  enrichOpenbotPluginDescriptor,
-  listRegistryModelOptions,
-} from '../../services/plugins/model-registry.js';
+import { enrichOpenbotPluginDescriptor } from '../../services/plugins/enrich-openbot-plugin.js';
 import { OpenBotEvent, OpenBotState } from '../../app/types.js';
 import { processService } from '../../services/process.js';
 import { memoryService } from '../memory/service.js';
@@ -1056,17 +1053,14 @@ export const storageService = {
     return Array.from(deduped.values()).filter((agent) => !agent.hidden);
   },
   getPlugins: async (): Promise<PluginDescriptor[]> => {
-    const [builtIn, fromDisk, modelOptions] = await Promise.all([
+    const [builtIn, fromDisk] = await Promise.all([
       listBuiltInPluginDescriptors(),
       listPluginsFromDisk(),
-      listRegistryModelOptions(),
     ]);
 
-    const enrichedBuiltIn = builtIn.map((plugin) =>
-      enrichOpenbotPluginDescriptor(plugin, modelOptions),
-    );
+    const enrichPlugin = (plugin: PluginDescriptor) => enrichOpenbotPluginDescriptor(plugin);
 
-    const merged = [...enrichedBuiltIn, ...fromDisk];
+    const merged = [...builtIn.map(enrichPlugin), ...fromDisk.map(enrichPlugin)];
     const deduped = new Map<string, PluginDescriptor>();
     for (const plugin of merged) {
       if (!deduped.has(plugin.id)) {
@@ -1756,11 +1750,17 @@ export const storageService = {
   getOpenBotState: async (options: {
     runId: string;
     agentId: string;
-    channelId: string;
-    threadId?: string;
     event: OpenBotEvent;
   }): Promise<OpenBotState> => {
-    const { runId, agentId, channelId, threadId, event } = options;
+    const { runId, agentId, event } = options;
+    const channelId =
+      typeof event.meta?.channelId === 'string'
+        ? event.meta.channelId.trim() || undefined
+        : undefined;
+    const threadId =
+      typeof event.meta?.threadId === 'string'
+        ? event.meta.threadId.trim() || undefined
+        : undefined;
 
     let agentDetails: AgentDetails;
     try {

package/src/services/plugins/enrich-openbot-plugin.ts

@@ -0,0 +1,41 @@
+import { OPENBOT_PLUGIN_ID } from '../../app/openbot-plugin.js';
+import { DEFAULT_CLOUD_OPENBOT_AUTH_MODE, isCloudMode } from '../../app/cloud-mode.js';
+import type { ConfigSchema, PluginDescriptor } from './domain.js';
+
+/** Injects cloud platform fields into the openbot plugin descriptor for settings UI. */
+export function enrichOpenbotPluginDescriptor(descriptor: PluginDescriptor): PluginDescriptor {
+  if (descriptor.id !== OPENBOT_PLUGIN_ID || !descriptor.configSchema) return descriptor;
+  if (!isCloudMode()) return descriptor;
+
+  const { authMode: _authMode, ...otherProperties } = descriptor.configSchema.properties;
+
+  const cloudAuthModeProperty: ConfigSchema['properties'][string] = {
+    type: 'string',
+    description: 'Credits uses OpenBot platform billing. BYOK uses your own API keys.',
+    enum: ['credits', 'byok'],
+    default: DEFAULT_CLOUD_OPENBOT_AUTH_MODE,
+    options: [
+      {
+        label: 'Credits',
+        value: 'credits',
+        description: 'Use OpenBot platform credits.',
+      },
+      {
+        label: 'Bring your own key',
+        value: 'byok',
+        description: 'Use your own provider API keys.',
+      },
+    ],
+  };
+
+  return {
+    ...descriptor,
+    configSchema: {
+      ...descriptor.configSchema,
+      properties: {
+        authMode: cloudAuthModeProperty,
+        ...otherProperties,
+      },
+    },
+  };
+}

package/src/services/plugins/host.ts

@@ -8,10 +8,6 @@ import {
 import { ORCHESTRATOR_AGENT_ID } from '../../app/agent-ids.js';
 import { OPENBOT_PLUGIN_ID } from '../../app/openbot-plugin.js';
 import { getBaseDir, resolvePath, saveConfig } from '../../app/config.js';
-import {
-  listApiKeyProvidersFromRegistry,
-  resolveModelRegistry,
-} from './model-registry.js';
 import type { PluginHost, RunAgentHostOptions } from './types.js';
 
 export function createPluginHost(
@@ -22,8 +18,6 @@ export function createPluginHost(
     isCloudSystemAgent,
     isCloudMode,
     parseOpenbotAuthMode,
-    resolveModelRegistry,
-    listApiKeyProvidersFromRegistry,
     saveConfig,
     getBaseDir,
     resolvePath,

package/src/services/plugins/types.ts

@@ -25,8 +25,6 @@ export interface RunAgentHostOptions {
   runId: string;
   agentId: string;
   event: OpenBotEvent;
-  channelId: string;
-  threadId?: string;
   persistEvents?: boolean;
   publicBaseUrl?: string;
   onEvent: (event: OpenBotEvent, state?: OpenBotState) => Promise<void>;
@@ -38,12 +36,6 @@ export interface PluginHost {
   isCloudSystemAgent: (agentId: string) => boolean;
   isCloudMode: () => boolean;
   parseOpenbotAuthMode: (value: unknown) => 'credits' | 'byok';
-  resolveModelRegistry: () => ReturnType<
-    typeof import('./model-registry.js').resolveModelRegistry
-  >;
-  listApiKeyProvidersFromRegistry: (
-    registry: Awaited<ReturnType<PluginHost['resolveModelRegistry']>>,
-  ) => Array<{ id: string; label: string }>;
   saveConfig: (patch: Record<string, unknown>) => void;
   getBaseDir: () => string;
   resolvePath: (p: string) => string;

package/src/services/plugins/model-registry.ts

@@ -1,178 +0,0 @@
-import {
-  DEFAULT_MARKETPLACE_REGISTRY_URL,
-  loadConfig,
-} from '../../app/config.js';
-import { OPENBOT_PLUGIN_ID } from '../../app/openbot-plugin.js';
-import {
-  DEFAULT_CLOUD_OPENBOT_AUTH_MODE,
-  isCloudMode,
-} from '../../app/cloud-mode.js';
-import type { ConfigSchema, PluginDescriptor } from './domain.js';
-
-export type RegistryProviderCatalog = Record<
-  string,
-  {
-    label: string;
-    models: Array<{ id: string; label: string; description: string }>;
-  }
->;
-
-export type ModelRegistry = {
-  providers?: RegistryProviderCatalog;
-};
-
-export type RegistryModelOption = {
-  value: string;
-  label: string;
-  description?: string;
-  provider: string;
-};
-
-let cachedRegistry: ModelRegistry | null = null;
-let cacheUrl: string | null = null;
-
-function getRegistryUrl(): string {
-  const { marketplaceRegistryUrl } = loadConfig();
-  return marketplaceRegistryUrl?.trim() || DEFAULT_MARKETPLACE_REGISTRY_URL;
-}
-
-export async function resolveModelRegistry(): Promise<ModelRegistry> {
-  const url = getRegistryUrl();
-  if (cachedRegistry && cacheUrl === url) return cachedRegistry;
-
-  try {
-    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}`);
-    }
-    cachedRegistry = (await res.json()) as ModelRegistry;
-    cacheUrl = url;
-    return cachedRegistry;
-  } catch (err) {
-    console.warn(
-      '[model-registry] fetch failed:',
-      err instanceof Error ? err.message : err,
-    );
-    return { providers: {} };
-  }
-}
-
-export function listModelOptionsFromRegistry(registry: ModelRegistry): RegistryModelOption[] {
-  const providers = registry.providers ?? {};
-  const out: RegistryModelOption[] = [];
-
-  for (const [providerId, provider] of Object.entries(providers)) {
-    for (const model of provider.models ?? []) {
-      out.push({
-        value: `${providerId}/${model.id}`,
-        label: `${provider.label} — ${model.label}`,
-        description: model.description,
-        provider: providerId,
-      });
-    }
-  }
-
-  return out;
-}
-
-export async function listRegistryModelOptions(): Promise<RegistryModelOption[]> {
-  const registry = await resolveModelRegistry();
-  return listModelOptionsFromRegistry(registry);
-}
-
-export function listApiKeyProvidersFromRegistry(
-  registry: ModelRegistry,
-): Array<{ id: string; label: string }> {
-  const providers = registry.providers ?? {};
-  return Object.entries(providers).map(([id, provider]) => ({
-    id,
-    label: provider.label,
-  }));
-}
-
-function pickDefaultModelValue(options: RegistryModelOption[]): string | undefined {
-  if (options.length === 0) return undefined;
-  const values = options.map((option) => option.value);
-  const preferred = values.find((value) => value.startsWith('openai/'));
-  return preferred ?? values[0];
-}
-
-export function enrichOpenbotPluginDescriptor(
-  descriptor: PluginDescriptor,
-  modelOptions: RegistryModelOption[],
-): PluginDescriptor {
-  if (descriptor.id !== OPENBOT_PLUGIN_ID || !descriptor.configSchema) return descriptor;
-
-  const modelProperty = descriptor.configSchema.properties.model;
-  if (!modelProperty) return descriptor;
-
-  const values = modelOptions.map((option) => option.value);
-  const staticDefault =
-    typeof modelProperty.default === 'string' ? modelProperty.default : undefined;
-  const defaultModel =
-    staticDefault && values.includes(staticDefault)
-      ? staticDefault
-      : pickDefaultModelValue(modelOptions) ?? staticDefault;
-
-  const nextModelProperty: ConfigSchema['properties'][string] = {
-    ...modelProperty,
-    description: 'Model from the hosted marketplace registry.',
-  };
-
-  if (values.length > 0) {
-    nextModelProperty.enum = values;
-    nextModelProperty.options = modelOptions.map((option) => ({
-      label: option.label,
-      value: option.value,
-      description: option.description,
-    }));
-  }
-
-  if (defaultModel) {
-    nextModelProperty.default = defaultModel;
-  }
-
-  const { model: _model, authMode: _authMode, ...otherProperties } =
-    descriptor.configSchema.properties;
-
-  const cloudAuthModeProperty: ConfigSchema['properties'][string] = {
-    type: 'string',
-    description: 'Credits uses OpenBot platform billing. BYOK uses your own API keys.',
-    enum: ['credits', 'byok'],
-    default: DEFAULT_CLOUD_OPENBOT_AUTH_MODE,
-    options: [
-      {
-        label: 'Credits',
-        value: 'credits',
-        description: 'Use OpenBot platform credits.',
-      },
-      {
-        label: 'Bring your own key',
-        value: 'byok',
-        description: 'Use your own provider API keys.',
-      },
-    ],
-  };
-
-  const nextProperties: ConfigSchema['properties'] = isCloudMode()
-    ? {
-        authMode: cloudAuthModeProperty,
-        model: nextModelProperty,
-        ...otherProperties,
-      }
-    : {
-        model: nextModelProperty,
-        ...otherProperties,
-      };
-
-  return {
-    ...descriptor,
-    configSchema: {
-      ...descriptor.configSchema,
-      properties: nextProperties,
-    },
-  };
-}