fix: various bugfixes

examples/ui/chat-monitor/chat-monitor.ts

@@ -1,7 +1,7 @@
-import { ChatMonitor } from "../../../src/ui/chat-monitor/chat-monitor.js";
-import { getLogger } from "../helpers/log.js";
+// import { ChatMonitor } from "../../../src/ui/chat-monitor/chat-monitor.js";
+// import { getLogger } from "../helpers/log.js";
 
-new ChatMonitor(
-  { kind: "screen", title: "Runtime Chat Interface" },
-  getLogger(true),
-);
+// new ChatMonitor(
+//   { kind: "screen", title: "Runtime Chat Interface" },
+//   getLogger(true),
+// );

package.json

@@ -57,7 +57,7 @@
     "monitor": "cross-env NODE_ENV=production BEE_FRAMEWORK_LOG_LEVEL=error node --no-warnings dist/ui/main.js",
     "monitor:dev": "tsx --inspect --no-warnings src/ui/main.js",
     "ui:test:chat": "tsx --inspect --no-warnings examples/ui/chat-monitor/chat-monitor.js",
-    "ui:test": "tsx --inspect --no-warnings examples/ui/chat-monitor/input/input.js",
+    "ui:test": "tsx --inspect --no-warnings examples/ui/chat-monitor/workflow-popup/workflow-popup.js",
     "ts:check": "tsc --noEmit --project tsconfig.json",
     "clean": "rimraf dist",
     "build": "npm run clean && tsc -b tsconfig.build.json && tsc-alias -p tsconfig.build.json",

src/agents/agent-factory.ts

@@ -6,7 +6,7 @@ import { ReActAgent } from "beeai-framework/agents/react/agent";
 import { AssistantMessage, ToolMessage } from "beeai-framework/backend/message";
 import { TokenMemory } from "beeai-framework/memory/tokenMemory";
 import { BaseAgentFactory, CreateAgentInput } from "./base/agent-factory.js";
-import { SupervisorWorkflow } from "./supervisor-workflow/supervisor-workflow.js";
+import { SupervisorWorkflow } from "./supervisor/workflow/supervisor-workflow.js";
 
 export type AgentUpdateCallback = (key: string, value: string) => void;
 
@@ -64,7 +64,7 @@ export class AgentFactory extends BaseAgentFactory<
               }),
           },
           execution: {
-            maxIterations: 8,
+            maxIterations: 20,
             maxRetriesPerStep: 2,
             totalMaxRetries: 10,
           },

src/agents/index.ts

@@ -1,6 +1,6 @@
 import * as agentRegistry from "./registry/index.js";
 import * as stateLogger from "./state/logger.js";
-import * as supervisor from "./supervisor.js";
+import * as supervisor from "./supervisor/react-agent/supervisor.js";
 import * as operator from "./operator.js";
 
 export { agentRegistry, stateLogger, supervisor, operator };

src/agents/state/dto.ts

@@ -13,7 +13,7 @@ import {
 } from "../registry/dto.js";
 
 // Base schemas
-export const AgentEventKindEnum = z.enum([
+export const AgentEventKindEnumSchema = z.enum([
   "available_tools_register",
   "agent_config_create",
   "agent_config_update",
@@ -29,7 +29,7 @@ export const AgentEventKindEnum = z.enum([
 ]);
 
 export const BaseAgentEventSchema = z.object({
-  kind: AgentEventKindEnum,
+  kind: AgentEventKindEnumSchema,
 });
 
 // Agent Config Events
@@ -43,7 +43,7 @@ export type AgentConfigLifecycleEvent = z.infer<
 
 export const AgentConfigCreateEventSchema =
   BaseAgentConfigLifecycleEventSchema.extend({
-    kind: z.literal(AgentEventKindEnum.enum.agent_config_create),
+    kind: z.literal(AgentEventKindEnumSchema.enum.agent_config_create),
     config: AgentConfigSchema,
   });
 export type AgentConfigCreateEvent = z.infer<
@@ -52,7 +52,7 @@ export type AgentConfigCreateEvent = z.infer<
 
 export const AgentConfigUpdateEventSchema =
   BaseAgentConfigLifecycleEventSchema.extend({
-    kind: z.literal(AgentEventKindEnum.enum.agent_config_update),
+    kind: z.literal(AgentEventKindEnumSchema.enum.agent_config_update),
     config: AgentConfigSchema,
   });
 export type AgentConfigUpdateEvent = z.infer<
@@ -61,7 +61,7 @@ export type AgentConfigUpdateEvent = z.infer<
 
 export const AgentConfigDestroyEventSchema =
   BaseAgentConfigLifecycleEventSchema.extend({
-    kind: z.literal(AgentEventKindEnum.enum.agent_config_destroy),
+    kind: z.literal(AgentEventKindEnumSchema.enum.agent_config_destroy),
   });
 export type AgentConfigDestroyEvent = z.infer<
   typeof AgentConfigDestroyEventSchema
@@ -74,23 +74,23 @@ export const BaseAgentLifecycleEventSchema = BaseAgentEventSchema.extend({
 export type AgentLifecycleEvent = z.infer<typeof BaseAgentLifecycleEventSchema>;
 
 export const AgentCreateEventSchema = BaseAgentLifecycleEventSchema.extend({
-  kind: z.literal(AgentEventKindEnum.enum.agent_create),
+  kind: z.literal(AgentEventKindEnumSchema.enum.agent_create),
   agentConfigId: z.string(),
 });
 export type AgentCreateEvent = z.infer<typeof AgentCreateEventSchema>;
 
 export const AgentAcquireEventSchema = BaseAgentLifecycleEventSchema.extend({
-  kind: z.literal(AgentEventKindEnum.enum.agent_acquire),
+  kind: z.literal(AgentEventKindEnumSchema.enum.agent_acquire),
 });
 export type AgentAcquireEvent = z.infer<typeof AgentAcquireEventSchema>;
 
 export const AgentReleaseEventSchema = BaseAgentLifecycleEventSchema.extend({
-  kind: z.literal(AgentEventKindEnum.enum.agent_release),
+  kind: z.literal(AgentEventKindEnumSchema.enum.agent_release),
 });
 export type AgentReleaseEvent = z.infer<typeof AgentReleaseEventSchema>;
 
 export const AgentDestroyEventSchema = BaseAgentLifecycleEventSchema.extend({
-  kind: z.literal(AgentEventKindEnum.enum.agent_destroy),
+  kind: z.literal(AgentEventKindEnumSchema.enum.agent_destroy),
 });
 export type AgentDestroyEvent = z.infer<typeof AgentDestroyEventSchema>;
 
@@ -108,7 +108,7 @@ export const AssignedEventSchema = <TAssignment extends z.ZodType>(
   assignmentSchema: TAssignment,
 ) =>
   BaseAssignmentEventSchema.extend({
-    kind: z.literal(AgentEventKindEnum.enum.assignment_assign),
+    kind: z.literal(AgentEventKindEnumSchema.enum.assignment_assign),
     assignedSince: DateStringSchema,
     assignment: assignmentSchema,
   });
@@ -117,7 +117,7 @@ export type AssignedEvent<TAssignment extends z.ZodType> = z.infer<
 >;
 
 export const UnassignedEventSchema = BaseAssignmentEventSchema.extend({
-  kind: z.literal(AgentEventKindEnum.enum.assignment_unassign),
+  kind: z.literal(AgentEventKindEnumSchema.enum.assignment_unassign),
   unassignedAt: DateStringSchema,
 });
 export type UnassignedEvent = z.infer<typeof UnassignedEventSchema>;
@@ -126,7 +126,7 @@ export const HistoryEntryCreateEventSchema = <THistoryEntry extends z.ZodType>(
   historyEntrySchema: THistoryEntry,
 ) =>
   BaseAssignmentEventSchema.extend({
-    kind: z.literal(AgentEventKindEnum.enum.assignment_history_entry),
+    kind: z.literal(AgentEventKindEnumSchema.enum.assignment_history_entry),
     entry: historyEntrySchema,
   });
 export type HistoryEntryCreateEvent<THistoryEntry extends z.ZodType> = z.infer<
@@ -155,15 +155,15 @@ export type TaskHistoryEntryEvent = z.infer<typeof TaskHistoryEntryEventSchema>;
 
 // Available Tools Events
 export const AvailableToolsEventSchema = BaseAgentEventSchema.extend({
-  kind: z.literal(AgentEventKindEnum.enum.available_tools_register),
+  kind: z.literal(AgentEventKindEnumSchema.enum.available_tools_register),
   agentKindId: z.string(),
   availableTools: z.array(AvailableToolSchema),
 });
 export type AvailableToolsEvent = z.infer<typeof AvailableToolsEventSchema>;
 
 // Pool Events
 export const AgentPoolChangeEventSchema = BaseAgentEventSchema.extend({
-  kind: z.literal(AgentEventKindEnum.enum.pool_change),
+  kind: z.literal(AgentEventKindEnumSchema.enum.pool_change),
   agentTypeId: z.string(),
   poolStats: AgentConfigPoolStatsSchema,
   versions: z.array(z.tuple([z.number(), AgentConfigPoolStatsSchema])),

src/agents/state/logger.ts

@@ -6,7 +6,7 @@ import {
   AgentConfigUpdateEvent,
   AgentCreateEvent,
   AgentDestroyEvent,
-  AgentEventKindEnum,
+  AgentEventKindEnumSchema,
   AgentPoolChangeEvent,
   AgentReleaseEvent,
   AgentStateDataTypeSchema,
@@ -56,7 +56,7 @@ export class AgentStateLogger extends BaseStateLogger<
   public logAvailableTools(data: Omit<AvailableToolsEvent, "kind">) {
     this.logUpdate({
       data: {
-        kind: AgentEventKindEnum.enum.available_tools_register,
+        kind: AgentEventKindEnumSchema.enum.available_tools_register,
         ...data,
       },
     });
@@ -65,7 +65,7 @@ export class AgentStateLogger extends BaseStateLogger<
   public logAgentConfigCreate(data: Omit<AgentConfigCreateEvent, "kind">) {
     this.logUpdate({
       data: {
-        kind: AgentEventKindEnum.Values.agent_config_create,
+        kind: AgentEventKindEnumSchema.Values.agent_config_create,
         ...data,
       },
     });
@@ -74,7 +74,7 @@ export class AgentStateLogger extends BaseStateLogger<
   public logAgentConfigUpdate(data: Omit<AgentConfigUpdateEvent, "kind">) {
     this.logUpdate({
       data: {
-        kind: AgentEventKindEnum.Values.agent_config_update,
+        kind: AgentEventKindEnumSchema.Values.agent_config_update,
         ...data,
       },
     });
@@ -83,7 +83,7 @@ export class AgentStateLogger extends BaseStateLogger<
   public logAgentConfigDestroy(data: Omit<AgentConfigDestroyEvent, "kind">) {
     this.logUpdate({
       data: {
-        kind: AgentEventKindEnum.Values.agent_config_destroy,
+        kind: AgentEventKindEnumSchema.Values.agent_config_destroy,
         ...data,
       },
     });
@@ -92,7 +92,7 @@ export class AgentStateLogger extends BaseStateLogger<
   public logAgentCreate(data: Omit<AgentCreateEvent, "kind">) {
     this.logUpdate({
       data: {
-        kind: AgentEventKindEnum.enum.agent_create,
+        kind: AgentEventKindEnumSchema.enum.agent_create,
         ...data,
       },
     });
@@ -101,7 +101,7 @@ export class AgentStateLogger extends BaseStateLogger<
   public logAgentAcquire(data: Omit<AgentAcquireEvent, "kind">) {
     this.logUpdate({
       data: {
-        kind: AgentEventKindEnum.enum.agent_acquire,
+        kind: AgentEventKindEnumSchema.enum.agent_acquire,
         ...data,
       },
     });
@@ -110,7 +110,7 @@ export class AgentStateLogger extends BaseStateLogger<
   public logAgentRelease(data: Omit<AgentReleaseEvent, "kind">) {
     this.logUpdate({
       data: {
-        kind: AgentEventKindEnum.enum.agent_release,
+        kind: AgentEventKindEnumSchema.enum.agent_release,
         ...data,
       },
     });
@@ -119,7 +119,7 @@ export class AgentStateLogger extends BaseStateLogger<
   public logAgentDestroy(data: Omit<AgentDestroyEvent, "kind">) {
     this.logUpdate({
       data: {
-        kind: AgentEventKindEnum.enum.agent_destroy,
+        kind: AgentEventKindEnumSchema.enum.agent_destroy,
         ...data,
       },
     });
@@ -128,7 +128,7 @@ export class AgentStateLogger extends BaseStateLogger<
   public logPoolChange(data: Omit<AgentPoolChangeEvent, "kind">) {
     this.logUpdate({
       data: {
-        kind: AgentEventKindEnum.Values.pool_change,
+        kind: AgentEventKindEnumSchema.Values.pool_change,
         ...data,
       },
     });
@@ -139,7 +139,7 @@ export class AgentStateLogger extends BaseStateLogger<
   ) {
     this.logUpdate({
       data: {
-        kind: AgentEventKindEnum.Values.assignment_assign,
+        kind: AgentEventKindEnumSchema.Values.assignment_assign,
         assignmentKind: AssignmentKindEnum.enum.task,
         ...data,
       },
@@ -151,7 +151,7 @@ export class AgentStateLogger extends BaseStateLogger<
   ) {
     this.logUpdate({
       data: {
-        kind: AgentEventKindEnum.enum.assignment_unassign,
+        kind: AgentEventKindEnumSchema.enum.assignment_unassign,
         assignmentKind: AssignmentKindEnum.enum.task,
         ...data,
       },
@@ -163,7 +163,7 @@ export class AgentStateLogger extends BaseStateLogger<
   ) {
     this.logUpdate({
       data: {
-        kind: AgentEventKindEnum.enum.assignment_history_entry,
+        kind: AgentEventKindEnumSchema.enum.assignment_history_entry,
         assignmentKind: AssignmentKindEnum.Values.task,
         ...data,
       },