@looopy-ai/core 1.1.1 → 1.1.2

package/dist/core/loop.d.ts

@@ -1,5 +1,4 @@
-import { type Observable } from 'rxjs';
 import type { AnyEvent } from '../types/event';
 import type { Message } from '../types/message';
 import type { LoopConfig, TurnContext } from './types';
-export declare const runLoop: (context: TurnContext, config: LoopConfig, history: Message[]) => Observable<AnyEvent>;
+export declare const runLoop: (context: TurnContext, config: LoopConfig, history: Message[]) => import("rxjs").Observable<AnyEvent>;

package/dist/core/loop.js

@@ -1,6 +1,7 @@
-import { concat, EMPTY, expand, map, mergeMap, of, reduce, share, shareReplay, } from 'rxjs';
+import { concat, EMPTY, mergeMap, of, reduce, shareReplay } from 'rxjs';
 import { createTaskCompleteEvent, createTaskCreatedEvent, createTaskStatusEvent } from '../events';
 import { startAgentLoopSpan } from '../observability/spans';
+import { recursiveMerge } from '../utils/recursive-merge';
 import { runIteration } from './iteration';
 export const runLoop = (context, config, history) => {
     const logger = context.logger.child({ component: 'loop' });
@@ -49,34 +50,6 @@ export const runLoop = (context, config, history) => {
     }));
     return concat(of(taskEvent, workingEvent), merged$, finalSummary$).pipe(tapFinish);
 };
-function recursiveMerge(initial, eventsFor, next, isStop) {
-    const seed = {
-        state: initial,
-        iteration: 0,
-        events$: eventsFor({ ...initial, iteration: 0 }).pipe(shareReplay()),
-    };
-    const iterations$ = of(seed).pipe(expand(({ state, iteration, events$ }) => events$.pipe(reduce((acc, e) => {
-        acc.events.push(e);
-        if (isStop(e))
-            acc.sawStop = true;
-        return acc;
-    }, { events: [], sawStop: false }), mergeMap(({ events, sawStop }) => {
-        if (sawStop)
-            return EMPTY;
-        return of(next(state, { iteration, events })).pipe(map((nextState) => {
-            const nextIter = iteration + 1;
-            return {
-                state: nextState,
-                iteration: nextIter,
-                events$: eventsFor({
-                    ...nextState,
-                    iteration: nextIter,
-                }).pipe(share()),
-            };
-        }));
-    }))));
-    return iterations$.pipe(mergeMap(({ events$ }) => events$));
-}
 const eventsToMessages = (events) => {
     const messages = [];
     for (const event of events) {
@@ -88,22 +61,13 @@ const eventsToMessages = (events) => {
                         content: event.content,
                     });
                 }
-                break;
-            case 'tool-call':
-                messages.push({
-                    role: 'assistant',
-                    content: '',
-                    toolCalls: [
-                        {
-                            id: event.toolCallId,
-                            type: 'function',
-                            function: {
-                                name: event.toolName,
-                                arguments: event.arguments,
-                            },
-                        },
-                    ],
-                });
+                if (event.finishReason === 'tool_calls' && (event.toolCalls?.length ?? 0) > 0) {
+                    messages.push({
+                        role: 'assistant',
+                        content: '',
+                        toolCalls: event.toolCalls,
+                    });
+                }
                 break;
             case 'tool-complete':
                 messages.push({

package/dist/core/tools.js

@@ -43,7 +43,9 @@ export const runToolCall = (context, toolCall) => {
                 logger.trace({
                     success: result.success,
                 }, 'Tool execution complete');
-                return createToolCompleteEvent(context, toolCall, result.result);
+                return result.success
+                    ? createToolCompleteEvent(context, toolCall, result.result)
+                    : createToolErrorEvent(context, toolCall, result.error || 'Unknown error');
             }
             catch (error) {
                 const err = error instanceof Error ? error : new Error(String(error));

package/dist/utils/recursive-merge.d.ts

@@ -0,0 +1,7 @@
+import { type Observable } from 'rxjs';
+export declare function recursiveMerge<S, E>(initial: S, eventsFor: (state: S & {
+    iteration: number;
+}) => Observable<E>, next: (state: S, info: {
+    iteration: number;
+    events: E[];
+}) => S, isStop: (e: E) => boolean): Observable<E>;

package/dist/utils/recursive-merge.js

@@ -0,0 +1,29 @@
+import { EMPTY, expand, map, mergeMap, of, reduce, share, shareReplay, } from 'rxjs';
+export function recursiveMerge(initial, eventsFor, next, isStop) {
+    const seed = {
+        state: initial,
+        iteration: 0,
+        events$: eventsFor({ ...initial, iteration: 0 }).pipe(shareReplay()),
+    };
+    const iterations$ = of(seed).pipe(expand(({ state, iteration, events$ }) => events$.pipe(reduce((acc, e) => {
+        acc.events.push(e);
+        if (isStop(e))
+            acc.sawStop = true;
+        return acc;
+    }, { events: [], sawStop: false }), mergeMap(({ events, sawStop }) => {
+        if (sawStop)
+            return EMPTY;
+        return of(next(state, { iteration, events })).pipe(map((nextState) => {
+            const nextIter = iteration + 1;
+            return {
+                state: nextState,
+                iteration: nextIter,
+                events$: eventsFor({
+                    ...nextState,
+                    iteration: nextIter,
+                }).pipe(share()),
+            };
+        }));
+    }))));
+    return iterations$.pipe(mergeMap(({ events$ }) => events$));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@looopy-ai/core",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "RxJS-based AI agent framework",
   "keywords": [
     "agent",