@pogodisco/zephyr 1.3.4 → 1.3.6

package/dist/workflow-executor.d.ts

@@ -1,6 +1,6 @@
-import { ActionRegistry, WorkflowMiddleware } from "./types.js";
-import { WorkflowDef } from "./workflow-composer.js";
-export declare function executeWorkflow<Reg extends ActionRegistry, I, R, O = R>(workflow: WorkflowDef<Reg, I, R, any, O>, registry: Reg, input: I, middleware?: WorkflowMiddleware<Reg>[]): Promise<{
+import { ActionRegistry, WorkflowObserver } from "./types.js";
+import { StepDef, WorkflowDef } from "./workflow-composer.js";
+export declare function executeWorkflow<Reg extends ActionRegistry, I, R, O = R, Steps extends StepDef<Reg, any, any>[] = StepDef<Reg, any, any>[]>(workflow: WorkflowDef<Reg, I, R, Steps, O>, registry: Reg, input: I, observers?: WorkflowObserver<Reg>[]): Promise<{
     results: R;
     output: O;
     extras: Record<string, any>;

package/dist/workflow-executor.js

@@ -1,215 +1,23 @@
-// import { composeMiddleware } from "../middleware/index.js";
-// import { ActionRegistry } from "../registry/types.js";
-// import { WorkflowDef } from "./main.js";
-// import { ExecutionFrame, WorkflowMiddleware } from "./types.js";
-//
-// export async function executeWorkflow<Reg extends ActionRegistry, I, R>(
-//   workflow: WorkflowDef<Reg, I, R>,
-//   registry: Reg,
-//   input: I,
-//   middleware: WorkflowMiddleware<Reg>[] = [],
-// ): Promise<{ results: R; extras: Record<string, any> }> {
-//   const results: Record<string, any> = {};
-//   const extras: Record<string, any> = {};
-//   extras.frames = {} as Record<string, ExecutionFrame>; // <-- store execution frames per step
-//
-//   const stepById = new Map(workflow.steps.map((s) => [s.id, s]));
-//   const remainingDeps = new Map<string, number>();
-//   const dependents = new Map<string, string[]>();
-//   const ready: string[] = [];
-//
-//   // Build dependency graph
-//   for (const step of workflow.steps) {
-//     remainingDeps.set(step.id, step.dependsOn.length);
-//     if (step.dependsOn.length === 0) ready.push(step.id);
-//
-//     for (const dep of step.dependsOn) {
-//       if (!dependents.has(dep)) dependents.set(dep, []);
-//       dependents.get(dep)!.push(step.id);
-//     }
-//   }
-//
-//   let completed = 0;
-//
-//   // Scheduler loop
-//   while (ready.length > 0) {
-//     const batch = ready.splice(0);
-//
-//     await Promise.all(
-//       batch.map(async (stepId) => {
-//         const step = stepById.get(stepId)!;
-//
-//         const frame: ExecutionFrame = {
-//           stepId,
-//           attempts: 0,
-//           start: Date.now(),
-//         };
-//         extras.frames[stepId] = frame;
-//
-//         const ctx = {
-//           stepId,
-//           input,
-//           results,
-//           registry,
-//           extras,
-//           frame,
-//         };
-//
-//         const core = async () => {
-//           frame.attempts++;
-//           frame.input = step.resolve({ input, results });
-//
-//           try {
-//             const action = registry[step.action];
-//
-//             const result = await action(frame.input);
-//             frame.output = result;
-//             frame.end = Date.now();
-//
-//             results[step.id] = result;
-//             return result;
-//           } catch (err) {
-//             frame.error = err;
-//             frame.end = Date.now();
-//             throw err;
-//           }
-//         };
-//
-//         const composed = composeMiddleware(middleware, ctx, core);
-//         await composed();
-//
-//         // Activate dependents
-//         for (const childId of dependents.get(stepId) ?? []) {
-//           const remaining = remainingDeps.get(childId)! - 1;
-//           remainingDeps.set(childId, remaining);
-//           if (remaining === 0) ready.push(childId);
-//         }
-//
-//         completed++;
-//       }),
-//     );
-//   }
-//
-//   // Deadlock detection
-//   if (completed !== workflow.steps.length) {
-//     throw new Error("Workflow execution failed (cycle or missing dependency)");
-//   }
-//
-//   return { results: results as R, extras };
-// }
-// import { composeMiddleware } from "./middleware.js";
-// import { ActionRegistry, ExecutionFrame, WorkflowMiddleware } from "./types.js";
-// import { StepDef, WorkflowDef } from "./workflow-composer.js";
-//
-// export async function executeWorkflow<Reg extends ActionRegistry, I, R, O = R>(
-//   workflow: WorkflowDef<Reg, I, R, any, O>,
-//   registry: Reg,
-//   input: I,
-//   middleware: WorkflowMiddleware<Reg>[] = [],
-// ): Promise<{ results: R; output: O; extras: Record<string, any> }> {
-//   const results: Record<string, any> = {};
-//   const extras: Record<string, any> = {};
-//   extras.frames = {} as Record<string, ExecutionFrame>;
-//
-//   // --- strongly type steps ---
-//
-//   const stepById = new Map<string, StepDef<Reg, any, any>>(
-//     workflow.steps.map((s: StepDef<Reg, any, any>) => [s.id, s]),
-//   );
-//   const remainingDeps = new Map<string, number>();
-//   const dependents = new Map<string, string[]>();
-//   const ready: string[] = [];
-//
-//   // Build dependency graph
-//   for (const step of workflow.steps) {
-//     remainingDeps.set(step.id, step.dependsOn.length);
-//     if (step.dependsOn.length === 0) ready.push(step.id);
-//
-//     for (const dep of step.dependsOn) {
-//       if (!dependents.has(dep)) dependents.set(dep, []);
-//       dependents.get(dep)!.push(step.id);
-//     }
-//   }
-//
-//   let completed = 0;
-//
-//   while (ready.length > 0) {
-//     const batch = ready.splice(0);
-//
-//     await Promise.all(
-//       batch.map(async (stepId) => {
-//         const step = stepById.get(stepId)!;
-//
-//         const frame: ExecutionFrame = {
-//           stepId,
-//           attempts: 0,
-//           start: Date.now(),
-//         };
-//         extras.frames[stepId] = frame;
-//
-//         const ctx = { stepId, input, results, registry, extras, frame };
-//
-//         const core = async () => {
-//           frame.attempts++;
-//           frame.input = step.resolve?.({ input, results }) ?? undefined;
-//
-//           try {
-//             const action = registry[step.action];
-//             const result =
-//               frame.input === undefined
-//                 ? await (action as () => Promise<any>)()
-//                 : await action(frame.input);
-//             // const result = await action(frame.input);
-//             frame.output = result;
-//             frame.end = Date.now();
-//
-//             results[step.id] = result;
-//             return result;
-//           } catch (err) {
-//             frame.error = err;
-//             frame.end = Date.now();
-//             throw err;
-//           }
-//         };
-//
-//         const composed = composeMiddleware(middleware, ctx, core);
-//         await composed();
-//
-//         for (const childId of dependents.get(stepId) ?? []) {
-//           const remaining = remainingDeps.get(childId)! - 1;
-//           remainingDeps.set(childId, remaining);
-//           if (remaining === 0) ready.push(childId);
-//         }
-//
-//         completed++;
-//       }),
-//     );
-//   }
-//
-//   if (completed !== workflow.steps.length) {
-//     throw new Error("Workflow execution failed (cycle or missing dependency)");
-//   }
-//
-//   // Resolve output
-//   const output: O = workflow.outputResolver
-//     ? workflow.outputResolver({ input, results: results as R })
-//     : (results as unknown as O);
-//
-//   return { results: results as R, output, extras };
-// }
-//
-//
-///// with any fn shape
-import { composeMiddleware } from "./middleware.js";
-export async function executeWorkflow(workflow, registry, input, middleware = []) {
+import { composeObserver } from "./observer.js";
+function createCallHelpers() {
+    return {
+        args: (...args) => ({ kind: "positional", args }),
+        obj: (arg) => ({ kind: "object", args: arg }),
+        none: () => ({ kind: "none" }),
+        loop: (items) => ({ kind: "loop", items }),
+    };
+}
+export async function executeWorkflow(workflow, registry, input, observers = []) {
     const results = {};
     const extras = {};
     extras.frames = {};
+    // -----------------------------
+    // Fully typed step map
+    // -----------------------------
     const stepById = new Map(workflow.steps.map((s) => [s.id, s]));
     const remainingDeps = new Map();
     const dependents = new Map();
     const ready = [];
-    // Build dependency graph
     for (const step of workflow.steps) {
         remainingDeps.set(step.id, step.dependsOn.length);
         if (step.dependsOn.length === 0)
@@ -221,6 +29,28 @@ export async function executeWorkflow(workflow, registry, input, middleware = []
         }
     }
     let completed = 0;
+    // -----------------------------
+    // Normalized runner
+    // -----------------------------
+    const runAction = async (input, action) => {
+        if (!input)
+            return await action();
+        switch (input.kind) {
+            case "none":
+                return await action();
+            case "positional":
+                return await action(...input.args);
+            case "object":
+                return await action(input.args);
+            case "loop":
+                return await Promise.all(input.items.map((item) => runAction(item, action)));
+            default:
+                throw new Error(`Unknown ResolvedStepInput kind: ${input.kind}`);
+        }
+    };
+    // -----------------------------
+    // Execution loop
+    // -----------------------------
     while (ready.length > 0) {
         const batch = ready.splice(0);
         await Promise.all(batch.map(async (stepId) => {
@@ -243,7 +73,8 @@ export async function executeWorkflow(workflow, registry, input, middleware = []
             };
             const core = async () => {
                 frame.attempts++;
-                const stepCtx = { input, results, context };
+                const stepCtx = { input, results, context, ...createCallHelpers() };
+                // Conditional skip
                 if (step.when && !step.when(stepCtx)) {
                     frame.output = undefined;
                     frame.end = Date.now();
@@ -251,25 +82,11 @@ export async function executeWorkflow(workflow, registry, input, middleware = []
                     results[step.id] = undefined;
                     return undefined;
                 }
-                // 👇 Get the resolved arguments (should be a tuple or undefined)
-                // const resolvedArgs = step.resolve?.({ input, results, context });
                 const resolvedArgs = step.resolve?.(stepCtx);
                 frame.input = resolvedArgs;
                 try {
                     const action = registry[step.action];
-                    let result;
-                    if (resolvedArgs === undefined) {
-                        // No arguments - call with nothing
-                        result = await action();
-                    }
-                    else if (Array.isArray(resolvedArgs)) {
-                        // Tuple arguments - spread as positional params
-                        result = await action(...resolvedArgs);
-                    }
-                    else {
-                        // Single object argument (backward compatibility)
-                        result = await action(resolvedArgs);
-                    }
+                    const result = await runAction(resolvedArgs, action);
                     frame.output = result;
                     frame.end = Date.now();
                     results[step.id] = result;
@@ -281,7 +98,7 @@ export async function executeWorkflow(workflow, registry, input, middleware = []
                     throw err;
                 }
             };
-            const composed = composeMiddleware(middleware, ctx, core);
+            const composed = composeObserver(observers, ctx, core);
             await composed();
             for (const childId of dependents.get(stepId) ?? []) {
                 const remaining = remainingDeps.get(childId) - 1;
@@ -295,9 +112,12 @@ export async function executeWorkflow(workflow, registry, input, middleware = []
     if (completed !== workflow.steps.length) {
         throw new Error("Workflow execution failed (cycle or missing dependency)");
     }
-    // Resolve output
     const output = workflow.outputResolver
-        ? workflow.outputResolver({ input, results: results })
+        ? workflow.outputResolver({
+            input,
+            results: results,
+            context: workflow.__context,
+        })
         : results;
     return { results: results, output, extras };
 }

package/dist/workflow-module.d.ts

@@ -1,18 +1,23 @@
 import { ActionRegistry } from "./types.js";
 import { createWorkflow, WorkflowDef } from "./workflow-composer.js";
-export declare function workflowModule<Reg extends ActionRegistry, Context extends Record<string, any>, Flows extends Record<string, any>>(registry: Reg, context: Context, factory: (wf: ReturnType<typeof createWorkflow<Reg, Context>>) => Flows): {
-    wf: <Input = unknown>(name: string) => import("./workflow-composer.js").WorkflowBuilder<Reg, Input, Context, [], {}, undefined>;
-} & Flows & {
-    extend<Extra extends Record<string, any>>(overrides: Extra): Flows & Extra;
-};
 type AnyWorkflow = WorkflowDef<any, any, any, any, any>;
 type ModuleShape = Record<string, AnyWorkflow>;
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 type UnionToIntersectionOrEmpty<U> = [U] extends [never] ? {} : UnionToIntersection<U>;
+export type ModuleContext<Reg extends ActionRegistry, Context extends Record<string, any>, Deps extends ModuleShape> = {
+    wf: ReturnType<typeof createWorkflow<Reg, Context>>;
+    deps: Deps;
+    context: Context;
+    tools: <T>(factory: (ctx: {
+        wf: ModuleContext<Reg, Context, Deps>["wf"];
+        deps: Deps;
+        context: Context;
+    }) => T) => T;
+};
 export declare function createModule<Reg extends ActionRegistry, Context extends Record<string, any>, Use extends ModuleShape[] = [], Deps extends ModuleShape = UnionToIntersectionOrEmpty<Use[number]> & ModuleShape, Own extends ModuleShape = {}>({ registry, context, use, define, }: {
     registry: Reg;
     context: Context;
     use?: [...Use];
-    define: (wf: ReturnType<typeof createWorkflow<Reg, Context>>, deps: Deps) => Own;
+    define: (ctx: ModuleContext<Reg, Context, Deps>) => Own;
 }): Deps & Own;
 export {};

package/dist/workflow-module.js

@@ -1,44 +1,14 @@
-import { createWorkflow } from "./workflow-composer.js";
-// export function workflowModule<
-//   Reg extends ActionRegistry,
-//   Context extends Record<string, any>,
-//   Flows extends Record<string, any>,
-// >(
-//   registry: Reg,
-//   context: Context,
-//   factory: (wf: ReturnType<typeof createWorkflow<Reg, Context>>) => Flows,
-// ) {
-//   const wf = createWorkflow(registry, context);
-//   const flows = factory(wf);
-//
-//   return {
-//     ...flows,
-//     extend(overrides: Partial<Flows>): Flows {
-//       return {
-//         ...flows,
-//         ...overrides,
-//       };
-//     },
-//   };
-// }
-export function workflowModule(registry, context, factory) {
-    const wf = createWorkflow(registry, context);
-    const flows = factory(wf);
-    return {
-        wf,
-        ...flows,
-        extend(overrides) {
-            return {
-                ...flows,
-                ...overrides,
-            };
-        },
-    };
-}
+import { createWorkflow, } from "./workflow-composer.js";
 export function createModule({ registry, context, use, define, }) {
     const wf = createWorkflow(registry, context);
     const deps = (use ? Object.assign({}, ...use) : {});
-    const own = define(wf, deps);
+    const moduleCtx = {
+        wf,
+        deps,
+        context,
+        tools: (factory) => factory({ wf, deps, context }),
+    };
+    const own = define(moduleCtx);
     return {
         ...deps,
         ...own,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pogodisco/zephyr",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "publishConfig": {
     "access": "public"
   },