@looopy-ai/core 2.1.0 → 2.1.2

package/dist/core/agent.js

@@ -1,5 +1,6 @@
 import { catchError, concat, filter, Observable, of, tap } from 'rxjs';
 import { createTaskStatusEvent } from '../events';
+import { isChildTaskEvent } from '../events/utils';
 import { addMessagesCompactedEvent, addMessagesLoadedEvent, completeAgentInitializeSpan, completeAgentTurnSpan, failAgentInitializeSpan, failAgentTurnSpan, setResumeAttributes, setTurnCountAttribute, startAgentInitializeSpan, startAgentTurnSpan, } from '../observability/spans';
 import { serializeError } from '../utils/error';
 import { getLogger } from './logger';
@@ -178,6 +179,8 @@ export class Agent {
                         maxIterations: 5,
                         stopOnToolError: false,
                     }, messages).pipe(tap(async (event) => {
+                        if (isChildTaskEvent(event))
+                            return;
                         switch (event.kind) {
                             case 'content-complete':
                                 if (event.content || event.toolCalls) {

package/dist/core/loop.js

@@ -1,5 +1,6 @@
 import { concat, EMPTY, mergeMap, of, reduce, shareReplay } from 'rxjs';
 import { createTaskCompleteEvent, createTaskCreatedEvent, createTaskStatusEvent } from '../events';
+import { isChildTaskEvent } from '../events/utils';
 import { startAgentLoopSpan } from '../observability/spans';
 import { recursiveMerge } from '../utils/recursive-merge';
 import { runIteration } from './iteration';
@@ -37,8 +38,8 @@ export const runLoop = (context, config, history) => {
     }, state.messages), (state, { events }) => ({
         ...state,
         messages: [...state.messages, ...eventsToMessages(events)],
-    }), (e) => e.kind === 'content-complete' && e.finishReason !== 'tool_calls').pipe(shareReplay({ refCount: true }));
-    const finalSummary$ = merged$.pipe(reduce((last, e) => (e.kind === 'content-complete' ? e : last), null), mergeMap((last) => {
+    }), (e) => !isChildTaskEvent(e) && e.kind === 'content-complete' && e.finishReason !== 'tool_calls').pipe(shareReplay({ refCount: true }));
+    const finalSummary$ = merged$.pipe(reduce((last, e) => (!isChildTaskEvent(e) && e.kind === 'content-complete' ? e : last), null), mergeMap((last) => {
         if (!last)
             return EMPTY;
         return of(createTaskCompleteEvent({

package/dist/core/tools.js

@@ -1,4 +1,5 @@
 import { catchError, concat, defer, mergeMap, of, tap } from 'rxjs';
+import { isChildTaskEvent } from '../events/utils';
 import { startToolExecuteSpan } from '../observability/spans';
 import { toolErrorEvent } from '../tools/tool-result-events';
 export const runToolCall = (context, toolCall) => {
@@ -42,6 +43,8 @@ export const runToolCall = (context, toolCall) => {
             try {
                 logger.trace({ providerName: provider.name }, 'Executing tool');
                 return provider.execute(toolCallInput, context).pipe(tap((event) => {
+                    if (isChildTaskEvent(event))
+                        return;
                     if (event.kind !== 'tool-complete') {
                         return;
                     }

package/dist/events/utils.d.ts

@@ -1,4 +1,4 @@
-import type { AuthCompletedEvent, AuthRequiredEvent, AuthType, ContentCompleteEvent, ContentDeltaEvent, ContextAnyEvent, ContextEvent, DatasetWriteEvent, DataWriteEvent, FileWriteEvent, FinishReason, InputProvider, InputReceivedEvent, InputRequiredEvent, InputType, InternalCheckpointEvent, InternalLLMCallEvent, InternalThoughtProcessEvent, JSONSchema, SubtaskCreatedEvent, TaskCompleteEvent, TaskCreatedEvent, TaskInitiator, TaskStatus, TaskStatusEvent, ThoughtStreamEvent, ThoughtType, ThoughtVerbosity, ToolCompleteEvent, ToolProgressEvent, ToolStartEvent } from '../types/event';
+import type { AnyEvent, AuthCompletedEvent, AuthRequiredEvent, AuthType, ContentCompleteEvent, ContentDeltaEvent, ContextAnyEvent, ContextEvent, DatasetWriteEvent, DataWriteEvent, FileWriteEvent, FinishReason, InputProvider, InputReceivedEvent, InputRequiredEvent, InputType, InternalCheckpointEvent, InternalLLMCallEvent, InternalThoughtProcessEvent, JSONSchema, SubtaskCreatedEvent, TaskCompleteEvent, TaskCreatedEvent, TaskInitiator, TaskStatus, TaskStatusEvent, ThoughtStreamEvent, ThoughtType, ThoughtVerbosity, ToolCompleteEvent, ToolProgressEvent, ToolStartEvent } from '../types/event';
 export declare function generateEventId(): string;
 export interface CreateTaskCreatedEventOptions {
     contextId: string;
@@ -248,3 +248,4 @@ export declare function filterByContextId(events: ContextAnyEvent[], contextId:
 export declare function filterByKind<K extends ContextAnyEvent['kind']>(events: ContextAnyEvent[], kind: K): Extract<ContextAnyEvent, {
     kind: K;
 }>[];
+export declare const isChildTaskEvent: (event: AnyEvent) => boolean;

package/dist/events/utils.js

@@ -261,3 +261,6 @@ export function filterByContextId(events, contextId) {
 export function filterByKind(events, kind) {
     return events.filter((event) => event.kind === kind);
 }
+export const isChildTaskEvent = (event) => {
+    return !!event.parentTaskId;
+};

package/dist/observability/spans/agent-turn.js

@@ -1,5 +1,6 @@
 import { context, SpanStatusCode, trace } from '@opentelemetry/api';
 import { tap } from 'rxjs/internal/operators/tap';
+import { isChildTaskEvent } from '../../events/utils';
 import { SpanAttributes } from '../tracing';
 const safeName = (name) => name.replace(/[^a-zA-Z0-9_-]+/g, '-');
 export const startAgentTurnSpan = (params) => {
@@ -20,6 +21,8 @@ export const startAgentTurnSpan = (params) => {
         traceContext,
         tapFinish: tap({
             next: (event) => {
+                if (isChildTaskEvent(event))
+                    return;
                 switch (event.kind) {
                     case 'task-complete':
                         if (event.content) {

package/dist/observability/spans/iteration.js

@@ -1,5 +1,6 @@
 import { SpanStatusCode, trace } from '@opentelemetry/api';
 import { tap } from 'rxjs/internal/operators/tap';
+import { isChildTaskEvent } from '../../events/utils';
 import { SpanAttributes, SpanNames } from '../tracing';
 export const startLoopIterationSpan = (context, iteration) => {
     const logger = context.logger;
@@ -20,6 +21,8 @@ export const startLoopIterationSpan = (context, iteration) => {
         traceContext,
         tapFinish: tap({
             next: (event) => {
+                if (isChildTaskEvent(event))
+                    return;
                 if (event.kind === 'content-complete') {
                     if (event.content) {
                         span.setAttribute(SpanAttributes.OUTPUT, event.content);

package/dist/observability/spans/llm-call.js

@@ -1,5 +1,6 @@
 import { SpanStatusCode, trace } from '@opentelemetry/api';
 import { tap } from 'rxjs/internal/operators/tap';
+import { isChildTaskEvent } from '../../events/utils';
 import { SpanAttributes, SpanNames } from '../tracing';
 export const startLLMCallSpan = (context, systemPrompt, messages, tools) => {
     const tracer = trace.getTracer('looopy');
@@ -20,6 +21,8 @@ export const startLLMCallSpan = (context, systemPrompt, messages, tools) => {
         traceContext,
         tapFinish: tap({
             next: (event) => {
+                if (isChildTaskEvent(event))
+                    return;
                 switch (event.kind) {
                     case 'content-complete':
                         if (event.content) {

package/dist/observability/spans/loop.js

@@ -1,5 +1,6 @@
 import { SpanStatusCode, trace } from '@opentelemetry/api';
 import { tap } from 'rxjs/internal/operators/tap';
+import { isChildTaskEvent } from '../../events/utils';
 import { SpanAttributes, SpanNames } from '../tracing';
 export const startAgentLoopSpan = (params) => {
     const tracer = trace.getTracer('looopy');
@@ -18,6 +19,8 @@ export const startAgentLoopSpan = (params) => {
         traceContext,
         tapFinish: tap({
             next: (event) => {
+                if (isChildTaskEvent(event))
+                    return;
                 switch (event.kind) {
                     case 'content-complete':
                         if (event.content) {

package/dist/observability/spans/tool.js

@@ -1,5 +1,6 @@
 import { context as otelContext, SpanStatusCode, trace } from '@opentelemetry/api';
 import { tap } from 'rxjs';
+import { isChildTaskEvent } from '../../events/utils';
 import { SpanAttributes, SpanNames } from '../tracing';
 export const startToolExecuteSpan = (context, toolStart) => {
     const tracer = trace.getTracer('looopy');
@@ -19,7 +20,7 @@ export const startToolExecuteSpan = (context, toolStart) => {
         traceContext,
         tapFinish: tap({
             next: (event) => {
-                if (!isToolCompleteEvent(event)) {
+                if (isChildTaskEvent(event) || !isToolCompleteEvent(event)) {
                     return;
                 }
                 try {

package/dist/tools/agent-tool-provider.js

@@ -74,20 +74,24 @@ export class AgentToolProvider {
         return Promise.resolve(this.tools);
     }
     execute(toolCall, context) {
-        this.logger.debug({ toolCallId: toolCall.id, toolName: toolCall.function.name }, 'Executing agent tool call');
+        const logger = this.logger.child({
+            taskId: context.taskId,
+            toolCallId: toolCall.id,
+        });
+        logger.debug({ toolCallId: toolCall.id }, 'Executing agent tool call');
         return new Observable((subscriber) => {
             const abortController = new AbortController();
             const run = async () => {
                 const tool = await this.getTool(toolCall.function.name);
                 if (!tool) {
-                    this.logger.error({ toolName: toolCall.function.name }, 'Tool not found');
+                    logger.error({ toolName: toolCall.function.name }, 'Tool not found');
                     subscriber.next(toolErrorEvent(context, toolCall, `Tool not found: ${toolCall.function.name}`));
                     subscriber.complete();
                     return;
                 }
                 const prompt = toolCall.function.arguments.prompt;
                 if (!prompt || typeof prompt !== 'string') {
-                    this.logger.error('Invalid tool call arguments');
+                    logger.error('Invalid tool call arguments');
                     subscriber.next(toolErrorEvent(context, toolCall, 'Tool argument must include "prompt" and it must be a string'));
                     subscriber.complete();
                     return;
@@ -103,47 +107,51 @@ export class AgentToolProvider {
                     signal: abortController.signal,
                 });
                 if (!res.ok) {
-                    this.logger.error({ status: res.status, statusText: res.statusText }, 'Agent call failed');
+                    logger.error({ status: res.status, statusText: res.statusText }, 'Agent call failed');
                     subscriber.next(toolErrorEvent(context, toolCall, `Agent endpoint responded with ${res.status} ${res.statusText}`));
                     subscriber.complete();
                     return;
                 }
                 const body = res.body;
                 if (!body) {
-                    this.logger.error('Agent response has no body');
+                    logger.error('Agent response has no body');
                     subscriber.next(toolErrorEvent(context, toolCall, 'Agent returned no response body'));
                     subscriber.complete();
                     return;
                 }
+                let content = '';
                 await consumeSSEStream(body, (e) => {
                     if (subscriber.closed)
                         return;
+                    const data = JSON.parse(e.data);
                     subscriber.next({
                         kind: e.event,
                         parentTaskId: context.taskId,
-                        ...JSON.parse(e.data),
+                        ...data,
                     });
-                    this.logger.debug({ event: e.event }, 'Received SSE event');
-                }, () => {
-                    if (!subscriber.closed) {
-                        const toolCompleteEvent = {
-                            kind: 'tool-complete',
-                            contextId: context.contextId,
-                            taskId: context.taskId,
-                            toolCallId: toolCall.id,
-                            toolName: toolCall.function.name,
-                            success: true,
-                            result: 'Complete',
-                            timestamp: new Date().toISOString(),
-                        };
-                        subscriber.next(toolCompleteEvent);
-                        subscriber.complete();
-                        this.logger.debug('Tool execution complete');
+                    if (e.event === 'task-complete') {
+                        content = data.content;
                     }
+                    logger.debug({ event: e.event }, 'Received SSE event');
                 });
+                if (!subscriber.closed) {
+                    const toolCompleteEvent = {
+                        kind: 'tool-complete',
+                        contextId: context.contextId,
+                        taskId: context.taskId,
+                        toolCallId: toolCall.id,
+                        toolName: toolCall.function.name,
+                        success: true,
+                        result: content || 'Complete',
+                        timestamp: new Date().toISOString(),
+                    };
+                    subscriber.next(toolCompleteEvent);
+                    subscriber.complete();
+                    logger.debug('Tool execution complete');
+                }
             };
             run().catch((err) => {
-                this.logger.error({ err }, 'Tool execution error');
+                logger.error({ err }, 'Tool execution error');
                 if (!subscriber.closed) {
                     subscriber.error(err);
                 }

package/dist/types/event.d.ts

@@ -315,6 +315,9 @@ export type ContextEvent<T> = T & {
     contextId: string;
     taskId: string;
 };
+export type ChildTaskEvent<T> = T & {
+    parentTaskId: string;
+};
 export type ContextAnyEvent = ContextEvent<AnyEvent>;
 export type ExternalEvent = Exclude<AnyEvent, InternalDebugEvent>;
 export type DebugEvent = InternalDebugEvent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@looopy-ai/core",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "RxJS-based AI agent framework",
   "keywords": [
     "agent",
@@ -27,7 +27,7 @@
     "dist"
   ],
   "dependencies": {
-    "@geee-be/sse-stream-parser": "^1.0.1",
+    "@geee-be/sse-stream-parser": "^1.0.2",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/exporter-metrics-otlp-http": "^0.207.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.207.0",