@neutrome/lilsdk-ts 0.2.1 → 0.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neutrome/lilsdk-ts",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "type": "module",
   "exports": {
     ".": "./src/index.ts",
@@ -13,7 +13,7 @@
     "./managed": "./src/managed/index.ts"
   },
   "dependencies": {
-    "@neutrome/lil-engine": "0.2.0"
+    "@neutrome/lil-engine": "0.2.1"
   },
   "devDependencies": {
     "@types/node": "^25.9.3",

package/src/loops/index.ts

@@ -37,14 +37,24 @@ export function retry(executor: Executor, options: RetryOptions = {}): Executor
       );
     },
 
-    stream(request, ctx) {
-      return streamBuffered(() =>
-        runRetry(
-          (attempt) => collect(executor.stream(request, childContext(ctx, attempt))),
-          attempts,
-          options,
-        ),
-      );
+    async *stream(request, ctx) {
+      let lastError: unknown;
+
+      for (let attempt = 1; attempt <= attempts; attempt += 1) {
+        try {
+          yield* executor.stream(request, childContext(ctx, attempt));
+          return;
+        } catch (error) {
+          lastError = error;
+          const canRetry = attempt < attempts && (await shouldContinue(error, attempt, options.shouldRetry));
+          if (!canRetry) {
+            throw error;
+          }
+          await options.onRetry?.(error, attempt);
+        }
+      }
+
+      throw lastError;
     },
   };
 }
@@ -63,14 +73,26 @@ export function fallback(executors: readonly Executor[], options: FallbackOption
       );
     },
 
-    stream(request, ctx) {
-      return streamBuffered(() =>
-        runFallback(
-          (executor, index) => collect(executor.stream(request, childContext(ctx, index + 1))),
-          executors,
-          options,
-        ),
-      );
+    async *stream(request, ctx) {
+      let lastError: unknown;
+
+      for (const [index, executor] of executors.entries()) {
+        try {
+          yield* executor.stream(request, childContext(ctx, index + 1));
+          return;
+        } catch (error) {
+          lastError = error;
+          const canFallback =
+            index < executors.length - 1 &&
+            (await shouldContinue(error, index, options.shouldFallback));
+          if (!canFallback) {
+            throw error;
+          }
+          await options.onFallback?.(error, index);
+        }
+      }
+
+      throw lastError;
     },
   };
 }
@@ -98,8 +120,9 @@ export function goal(options: GoalOptions): Executor {
   return {
     execute: executeGoal,
 
-    stream(request, ctx) {
-      return streamBuffered(async () => [await executeGoal(request, ctx)]);
+    async *stream(request, ctx) {
+      const result = await executeGoal(request, ctx);
+      yield result;
     },
   };
 }
@@ -160,20 +183,6 @@ async function shouldContinue(
   return predicate ? predicate(error, attempt) : true;
 }
 
-async function collect(stream: AsyncIterable<Program>): Promise<Program[]> {
-  const chunks: Program[] = [];
-  for await (const chunk of stream) {
-    chunks.push(chunk);
-  }
-  return chunks;
-}
-
-async function* streamBuffered(load: () => Promise<Program[]>): AsyncIterable<Program> {
-  for (const chunk of await load()) {
-    yield chunk;
-  }
-}
-
 function childContext(ctx: ExecutorContext, attempt: number): ExecutorContext {
   return {
     ...ctx,

package/src/tools.ts

@@ -75,6 +75,7 @@ function buildCallExecutor(toolMap: Map<string, Tool>) {
         } catch {
           parsed = {};
         }
+        const startedMs = Date.now();
         const result = await tool.execute(parsed, ctx);
         ctx.observe(createSdkEvent({
           kind: "tool.executed",
@@ -84,6 +85,7 @@ function buildCallExecutor(toolMap: Map<string, Tool>) {
           data: {
             toolName: call.name,
             toolCallId: call.id,
+            durationMs: Date.now() - startedMs,
             lilText: buildToolTrace(call, result),
           },
         }));