openbot 0.5.8 → 0.5.10

package/src/harness/index.ts

@@ -9,6 +9,7 @@ import { abortRegistry, abortKey } from '../services/abort.js';
 import { loadConfig } from '../app/config.js';
 import { getPublicBaseUrl } from '../plugins/storage/files.js';
 import { createPluginHost } from '../services/plugins/host.js';
+import { getInvokeConfigOverrides, mergePluginConfig } from './merge-plugin-config.js';
 
 export { STATE_AGENT_ID, ORCHESTRATOR_AGENT_ID };
 
@@ -16,8 +17,6 @@ export interface RunAgentOptions {
   runId: string;
   agentId: string;
   event: OpenBotEvent;
-  channelId: string;
-  threadId?: string;
   persistEvents?: boolean;
   /** Resolved public base URL for the server. */
   publicBaseUrl?: string;
@@ -29,15 +28,11 @@ async function emitEvent(
   state: OpenBotState | undefined,
   {
     persistEvents,
-    channelId,
-    threadId,
     onEvent,
     parentAgentId,
     parentToolCallId,
   }: {
     persistEvents: boolean;
-    channelId: string;
-    threadId?: string;
     onEvent: RunAgentOptions['onEvent'];
     parentAgentId?: string;
     parentToolCallId?: string;
@@ -54,10 +49,11 @@ async function emitEvent(
     };
   }
 
-  if (persistEvents) {
+  const channelId = state?.channelId;
+  if (persistEvents && channelId) {
     await storageService.storeEvent({
-      channelId: state?.channelId || channelId,
-      threadId: state?.threadId || threadId,
+      channelId,
+      threadId: state?.threadId,
       event: chunk,
     });
   }
@@ -70,7 +66,7 @@ async function emitEvent(
  * Fire and forget.
  */
 export async function runAgent(options: RunAgentOptions): Promise<void> {
-  const { runId, agentId, event, channelId, threadId, onEvent } = options;
+  const { runId, agentId, event, onEvent } = options;
   const persistEvents = options.persistEvents !== false;
 
   let publicBaseUrl = options.publicBaseUrl;
@@ -88,23 +84,21 @@ export async function runAgent(options: RunAgentOptions): Promise<void> {
   const state = await storageService.getOpenBotState({
     runId,
     agentId,
-    channelId,
-    threadId,
     event,
   });
 
   // Shared per-thread abort signal so a stop request cancels this run and any
   // delegated sub-agent runs (which execute in the same channel/thread).
-  const runKey = abortKey(channelId, threadId);
+  const runKey = state.channelId ? abortKey(state.channelId, state.threadId) : runId;
   const abortSignal = abortRegistry.acquire(runKey);
 
   await emitEvent(
     {
       type: 'agent:run:start',
-      data: { runId, agentId, channelId, threadId },
+      data: { runId, agentId, channelId: state.channelId, threadId: state.threadId },
     } as OpenBotEvent,
     state,
-    { persistEvents, channelId, threadId, onEvent, parentAgentId, parentToolCallId },
+    { persistEvents, onEvent, parentAgentId, parentToolCallId },
   );
 
   try {
@@ -121,6 +115,13 @@ export async function runAgent(options: RunAgentOptions): Promise<void> {
     const builder = melony<OpenBotState, OpenBotEvent>().initialState(state);
 
     const pluginHost = createPluginHost(runAgent);
+    const invokeConfigOverrides = getInvokeConfigOverrides(event);
+    const pluginConfigs = Object.fromEntries(
+      pluginRefs.map((ref) => [
+        ref.id,
+        mergePluginConfig(ref.config, invokeConfigOverrides, ref.id),
+      ]),
+    );
 
     for (const ref of pluginRefs) {
       const plugin = await resolvePlugin(ref.id);
@@ -130,7 +131,7 @@ export async function runAgent(options: RunAgentOptions): Promise<void> {
         plugin.factory({
           agentId,
           agentDetails,
-          config: ref.config ?? {},
+          config: pluginConfigs[ref.id],
           storage: storageService,
           tools,
           publicBaseUrl,
@@ -147,8 +148,6 @@ export async function runAgent(options: RunAgentOptions): Promise<void> {
       if (abortSignal.aborted) break;
       await emitEvent(outputEvent, state, {
         persistEvents,
-        channelId,
-        threadId,
         onEvent,
         parentAgentId,
         parentToolCallId,
@@ -161,10 +160,10 @@ export async function runAgent(options: RunAgentOptions): Promise<void> {
     await emitEvent(
       {
         type: 'agent:run:end',
-        data: { runId, agentId, channelId, threadId },
+        data: { runId, agentId, channelId: state.channelId, threadId: state.threadId },
       } as OpenBotEvent,
       state,
-      { persistEvents, channelId, threadId, onEvent, parentAgentId, parentToolCallId },
+      { persistEvents, onEvent, parentAgentId, parentToolCallId },
     );
   }
 }

package/src/harness/merge-plugin-config.ts

@@ -0,0 +1,35 @@
+import { OpenBotEvent } from '../app/types.js';
+
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+function isPluginKeyedConfig(config: Record<string, unknown>): boolean {
+  return Object.values(config).every(isPlainObject);
+}
+
+export function getInvokeConfigOverrides(event: OpenBotEvent): Record<string, unknown> | undefined {
+  if (event.type !== 'agent:invoke') return undefined;
+
+  const config = event.data?.config;
+  if (!isPlainObject(config) || Object.keys(config).length === 0) return undefined;
+
+  return config;
+}
+
+export function mergePluginConfig(
+  base: Record<string, unknown> | undefined,
+  overrides: Record<string, unknown> | undefined,
+  pluginId: string,
+): Record<string, unknown> {
+  const baseConfig = base ?? {};
+  if (!overrides) return baseConfig;
+
+  if (isPluginKeyedConfig(overrides)) {
+    const pluginOverride = overrides[pluginId];
+    if (!isPlainObject(pluginOverride)) return baseConfig;
+    return { ...baseConfig, ...pluginOverride };
+  }
+
+  return { ...baseConfig, ...overrides };
+}