@olane/o-core 0.4.4 → 0.6.1

package/dist/src/core/core.node.d.ts

@@ -52,7 +52,7 @@ export declare abstract class oCoreNode {
      * @param config
      * @returns
      */
-    use(addressWithLeaderTransports: oAddress, data: {
+    use(addressWithLeaderTransports: oAddress, data?: {
         method?: string;
         params?: {
             [key: string]: any;

package/dist/src/core/core.node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"core.node.d.ts","sourceRoot":"","sources":["../../../src/core/core.node.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"core.node.d.ts","sourceRoot":"","sources":["../../../src/core/core.node.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EACN,YAAY,EACZ,SAAS,EAET,MAAM,EACP,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIhD,8BAAsB,SAAS;IAmBjB,QAAQ,CAAC,MAAM,EAAE,UAAU;IAlBhC,OAAO,EAAG,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,YAAY,CAAC;IAC5B,OAAO,EAAE,QAAQ,CAAC;IACzB,SAAgB,aAAa,EAAE,QAAQ,CAAC;IACjC,MAAM,EAAG,MAAM,CAAC;IAChB,KAAK,EAAE,SAAS,CAAqB;IACrC,MAAM,EAAE,KAAK,EAAE,CAAM;IACrB,iBAAiB,EAAG,kBAAkB,CAAC;IACvC,OAAO,EAAE,SAAS,EAAE,CAAM;IAC1B,iBAAiB,EAAE,kBAAkB,CAAC;IAC7C,SAAgB,WAAW,EAAE,MAAM,CAAC;IAC7B,YAAY,EAAE,WAAW,EAAE,CAAC;IAC5B,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAEpC,YAAY,EAAE,MAAM,CAAK;IACzB,UAAU,EAAE,MAAM,CAAK;gBAET,MAAM,EAAE,UAAU;IAiBvC,IAAI,IAAI,aAEP;IAED,IAAI,UAAU,IAAI,MAAM,EAAE,CAIzB;IAEK,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAE3B,MAAM,IAAI,OAAO,CAAC,GAAG,CAAC;IAW5B,IAAI,MAAM,IAAI,QAAQ,GAAG,IAAI,CAE5B;IAED,IAAI,YAAY,IAAI,MAAM,GAAG,IAAI,CAOhC;IAED,IAAI,gBAAgB,IAAI,SAAS,EAAE,CAElC;IAED,aAAa,CAAC,OAAO,EAAE,QAAQ,GAAG,SAAS,EAAE;IAsCvC,8BAA8B,CAClC,YAAY,EAAE,QAAQ,GACrB,OAAO,CAAC,QAAQ,CAAC;IAgCd,gBAAgB,CAAC,2BAA2B,EAAE,QAAQ,GAAG,OAAO,CAAC;QACrE,cAAc,EAAE,QAAQ,CAAC;QACzB,aAAa,EAAE,QAAQ,CAAC;KACzB,CAAC;IAiCF,iBAAiB,CAAC,2BAA2B,EAAE,QAAQ,GAAG,OAAO;IAuBjE;;;;;;OAMG;IACG,GAAG,CACP,2BAA2B,EAAE,QAAQ,EACrC,IAAI,CAAC,EAAE;QACL,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE;YAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;SAAE,CAAC;KACjC,GACA,OAAO,CAAC,SAAS,CAAC;IA4Bf,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB3B,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAgCzB,OAAO,CACX,cAAc,EAAE,QAAQ,EACxB,aAAa,EAAE,QAAQ,GACtB,OAAO,CAAC,WAAW,CAAC;IA2BV,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAQtC;;;OAGG;IACU,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBnC;;OAEG;IACU,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAanC"}

package/dist/src/core/core.node.js

@@ -5,6 +5,7 @@ import { Logger } from './utils/logger.js';
 import { NodeType } from './interfaces/node-type.enum.js';
 import { oAddressResolution } from './lib/o-address-resolution.js';
 import { oDependency } from './o-dependency.js';
+import { oToolError } from '../error/tool.error.js';
 export class oCoreNode {
     constructor(config) {
         this.config = config;
@@ -165,14 +166,17 @@ export class oCoreNode {
             throw new Error('Invalid address');
         }
         const { nextHopAddress, targetAddress } = await this.translateAddress(addressWithLeaderTransports);
-        this.logger.debug('Using address, target: ', targetAddress.toString(), 'nextHop: ', nextHopAddress.toString(), 'with transports: ', nextHopAddress.libp2pTransports);
         const connection = await this.connect(nextHopAddress, targetAddress);
-        this.logger.debug('Connected to: ', targetAddress.toString(), ' sending data: ', data);
         // communicate the payload to the target node
         const response = await connection.send({
             address: targetAddress?.toString() || '',
-            payload: data,
+            payload: data || {},
         });
+        // if there is an error, throw it to continue to bubble up
+        if (response.result.error) {
+            console.log('response.result.error', JSON.stringify(response.result.error, null, 2));
+            throw oToolError.fromJSON(response.result.error);
+        }
         return response;
     }
     async unregister() {

package/dist/src/core/lib/o-address-resolution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-address-resolution.d.ts","sourceRoot":"","sources":["../../../../src/core/lib/o-address-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA0B;IAEpD,WAAW,CAAC,QAAQ,EAAE,gBAAgB;IAItC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAQvC,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;CAWpD"}
+{"version":3,"file":"o-address-resolution.d.ts","sourceRoot":"","sources":["../../../../src/core/lib/o-address-resolution.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAE3D,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA0B;IAEpD,WAAW,CAAC,QAAQ,EAAE,gBAAgB;IAItC,iBAAiB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAWvC,OAAO,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;CAOpD"}

package/dist/src/core/lib/o-address-resolution.js

@@ -7,6 +7,9 @@ export class oAddressResolution {
         this.resolvers.push(resolver);
     }
     supportsTransport(address) {
+        if (address.libp2pTransports.length > 0) {
+            return false;
+        }
         return this.resolvers.some((r) => address.customTransports.some((t) => {
             return r.transports.includes(t);
         }));
@@ -16,10 +19,6 @@ export class oAddressResolution {
         for (const resolver of this.resolvers) {
             resolvedAddress = await resolver.resolve(resolvedAddress);
         }
-        // // ensure we have the transports from the original address
-        // if (address.transports.length > 0) {
-        //   resolvedAddress.setTransports(address.transports as Multiaddr[]);
-        // }
         return resolvedAddress;
     }
 }

package/dist/src/core/lib/o-request.d.ts

@@ -10,6 +10,8 @@ export declare class oRequest implements JSONRPCRequest {
     get connectionId(): string;
     toJSON(): JSONRPCRequest;
     toString(): string;
+    static hasOlaneAddress(value: string): boolean;
+    static extractAddresses(value: string): string[];
     static fromJSON(json: Request & {
         id: RequestId;
     }): oRequest;

package/dist/src/core/lib/o-request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-request.d.ts","sourceRoot":"","sources":["../../../../src/core/lib/o-request.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,cAAc,EACd,OAAO,EACP,SAAS,EACT,aAAa,EACd,MAAM,mBAAmB,CAAC;AAE3B,qBAAa,QAAS,YAAW,cAAc;IAC7C,OAAO,EAAE,OAAO,eAAe,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,aAAa,CAAC;IACtB,EAAE,EAAE,SAAS,CAAC;gBAEF,MAAM,EAAE,OAAO,GAAG;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE;IAO/C,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,MAAM,IAAI,cAAc;IASxB,QAAQ;IAIR,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE,GAAG,QAAQ;CAG7D"}
+{"version":3,"file":"o-request.d.ts","sourceRoot":"","sources":["../../../../src/core/lib/o-request.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,cAAc,EACd,OAAO,EACP,SAAS,EACT,aAAa,EACd,MAAM,mBAAmB,CAAC;AAE3B,qBAAa,QAAS,YAAW,cAAc;IAC7C,OAAO,EAAE,OAAO,eAAe,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,aAAa,CAAC;IACtB,EAAE,EAAE,SAAS,CAAC;gBAEF,MAAM,EAAE,OAAO,GAAG;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE;IAO/C,IAAI,YAAY,IAAI,MAAM,CAEzB;IAED,MAAM,IAAI,cAAc;IASxB,QAAQ;IAIR,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAQ9C,MAAM,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE;IAKhD,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG;QAAE,EAAE,EAAE,SAAS,CAAA;KAAE,GAAG,QAAQ;CAG7D"}

package/dist/src/core/lib/o-request.js

@@ -20,6 +20,15 @@ export class oRequest {
     toString() {
         return JSON.stringify(this.toJSON());
     }
+    static hasOlaneAddress(value) {
+        return (!!value &&
+            typeof value === 'string' &&
+            !!value?.match(/o:\/\/.*(placeholder)+(?:\/[\w.-]+)+/g));
+    }
+    static extractAddresses(value) {
+        const matches = value.matchAll(/o:\/\/.*(placeholder)+(?:\/[\w.-]+)+/g);
+        return Array.from(matches, (match) => match[0]);
+    }
     static fromJSON(json) {
         return new oRequest(json);
     }

package/dist/src/core/lib/resolvers/anything.resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anything.resolver.d.ts","sourceRoot":"","sources":["../../../../../src/core/lib/resolvers/anything.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,8BAAsB,iBAAkB,SAAQ,gBAAgB;IAC9D,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAEK,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;CAUjE"}
+{"version":3,"file":"anything.resolver.d.ts","sourceRoot":"","sources":["../../../../../src/core/lib/resolvers/anything.resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,8BAAsB,iBAAkB,SAAQ,gBAAgB;IAC9D,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAEK,OAAO,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;CAYjE"}

package/dist/src/core/lib/resolvers/anything.resolver.js

@@ -8,7 +8,8 @@ export class oAnythingResolver extends oAddressResolver {
         const nextHopAddress = this.determineNextHopAddress(address);
         // at this point, the next-hop resolver did not work so we can trust that the
         // next hop should be contained within the current node as an abstraction
-        this.logger.debug('Resolving anything address: ', address);
+        this.logger.debug('Resolving anything address: ', address, this.transports);
+        // this ADDS the transport from the custom resolver to the address
         return new oAddress(nextHopAddress.toString(), (address.transports || []).concat(this.transports));
     }
 }

package/dist/src/core/utils/network.utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"network.utils.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/network.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,qBAAa,YAAY;WACH,QAAQ,CAC1B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC;QACT,UAAU,EAAE,SAAS,EAAE,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;QACtB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;CA0CH"}
+{"version":3,"file":"network.utils.d.ts","sourceRoot":"","sources":["../../../../src/core/utils/network.utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,qBAAa,YAAY;WACH,QAAQ,CAC1B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC;QACT,UAAU,EAAE,SAAS,EAAE,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;QACtB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;CAyCH"}

package/dist/src/core/utils/network.utils.js

@@ -28,7 +28,6 @@ export class NetworkUtils {
             };
         }
         catch (timeoutError) {
-            console.log('Timeout error: ', timeoutError);
             if (timeoutError.message === 'Content routing provide timeout') {
                 return { transports: [], staticAddress: '', absoluteAddress: '' };
             }

package/dist/src/error/tool.error.d.ts

@@ -13,5 +13,7 @@ export declare class oToolError extends Error implements oToolErrorInterface {
         message: string;
         details: any;
     };
+    static fromJSON(json: any): oToolError;
+    toString(): string;
 }
 //# sourceMappingURL=tool.error.d.ts.map

package/dist/src/error/tool.error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool.error.d.ts","sourceRoot":"","sources":["../../../src/error/tool.error.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,GAAG,CAAC;CACf;AAED,qBAAa,UAAW,SAAQ,KAAM,YAAW,mBAAmB;IAClE,IAAI,EAAE,MAAM,CAAK;IACjB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,OAAO,EAAE,MAAM,CAAM;gBAET,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG;IAOxD,MAAM;;;;;CAOP"}
+{"version":3,"file":"tool.error.d.ts","sourceRoot":"","sources":["../../../src/error/tool.error.ts"],"names":[],"mappings":"AACA,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,GAAG,CAAC;CACf;AAED,qBAAa,UAAW,SAAQ,KAAM,YAAW,mBAAmB;IAClE,IAAI,EAAE,MAAM,CAAK;IACjB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,OAAO,EAAE,MAAM,CAAM;gBAET,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG;IAOxD,MAAM;;;;;IAQN,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG;IAOzB,QAAQ;CAGT"}

package/dist/src/error/tool.error.js

@@ -1,3 +1,4 @@
+import { oToolErrorCodes } from './enums/codes.error.js';
 export class oToolError extends Error {
     constructor(code, message, details) {
         super(message);
@@ -14,4 +15,13 @@ export class oToolError extends Error {
             details: this.details,
         };
     }
+    static fromJSON(json) {
+        if (json?.code && json?.message) {
+            return new oToolError(json.code, json.message, json.details);
+        }
+        return new oToolError(oToolErrorCodes.TOOL_ERROR, json, json?.details);
+    }
+    toString() {
+        return `OLANE ERROR CODE: ${this.code}\nMESSAGE: ${this.message}\n-----\nDETAILS: ${this.details}`;
+    }
 }

package/dist/src/index.d.ts

@@ -3,4 +3,5 @@ export * from './node/index.js';
 export * from './error/index.js';
 export * from './plan/index.js';
 export * from './node-virtual/index.js';
+export * from './utils/index.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC"}

package/dist/src/index.js

@@ -3,3 +3,4 @@ export * from './node/index.js';
 export * from './error/index.js';
 export * from './plan/index.js';
 export * from './node-virtual/index.js';
+export * from './utils/index.js';

package/dist/src/node/node.d.ts

@@ -1,18 +1,18 @@
 import { Libp2pConfig, Stream } from '@olane/o-config';
 import { oAddress, oCoreNode, oRequest, oResponse } from '../core/index.js';
 import { NetworkActivity } from './lib/network-activity.lib.js';
-import { oPlanResult } from '../plan/interfaces/plan.result.js';
 import { CID } from 'multiformats';
+import { oHandshakeResult } from '../plan/interfaces/handshake.result.js';
 export declare abstract class oNode extends oCoreNode {
     networkActivity: NetworkActivity;
     childNodes: oNode[];
     childAddresses: oAddress[];
     validate(): void;
-    _tool_handshake(handshake: oRequest): Promise<oPlanResult>;
+    _tool_handshake(handshake: oRequest): Promise<oHandshakeResult>;
     abstract configureTransports(): any[];
-    myTools(): string[];
+    myTools(obj?: any): string[];
     applyBridgeTransports(address: oAddress, request: oRequest): Promise<oResponse>;
-    matchAgainstMethods(address: oAddress): boolean;
+    matchAgainstMethods(address: oAddress): Promise<boolean>;
     extractMethod(address: oAddress): string;
     _tool_route(request: oRequest & {
         stream: Stream;

package/dist/src/node/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/node/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,YAAY,EAKZ,MAAM,EACP,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAIL,QAAQ,EAER,SAAS,EACT,QAAQ,EACR,SAAS,EACV,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAKhE,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAGhE,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAKnC,8BAAsB,KAAM,SAAQ,SAAS;IACpC,eAAe,EAAG,eAAe,CAAC;IAClC,UAAU,EAAE,KAAK,EAAE,CAAM;IACzB,cAAc,EAAE,QAAQ,EAAE,CAAM;IAEvC,QAAQ,IAAI,IAAI;IASV,eAAe,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC;IAyBhE,QAAQ,CAAC,mBAAmB,IAAI,GAAG,EAAE;IAErC,OAAO,IAAI,MAAM,EAAE;IAMb,qBAAqB,CACzB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,SAAS,CAAC;IAOrB,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO;IAQ/C,aAAa,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM;IAIlC,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAyEvE;;;;OAIG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IA2B7C,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IASrD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAOtB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA2C9B,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAIpD,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAYtD,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAK/B,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAIlC;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;IA4ElC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB3B,uBAAuB,CAAC,KAAK,EAAE,GAAG;IAexC,IAAI,QAAQ,IAAI,OAAO,CAItB;IAEK,kBAAkB;IAgCxB,sBAAsB;IAIhB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAOhC"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/node/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,YAAY,EAKZ,MAAM,EACP,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAIL,QAAQ,EAER,SAAS,EACT,QAAQ,EACR,SAAS,EACV,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAMhE,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAK1E,8BAAsB,KAAM,SAAQ,SAAS;IACpC,eAAe,EAAG,eAAe,CAAC;IAClC,UAAU,EAAE,KAAK,EAAE,CAAM;IACzB,cAAc,EAAE,QAAQ,EAAE,CAAM;IAEvC,QAAQ,IAAI,IAAI;IASV,eAAe,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAkBrE,QAAQ,CAAC,mBAAmB,IAAI,GAAG,EAAE;IAErC,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,MAAM,EAAE;IAOtB,qBAAqB,CACzB,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,SAAS,CAAC;IAOf,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAS9D,aAAa,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM;IAIlC,WAAW,CAAC,OAAO,EAAE,QAAQ,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IA4EvE;;;;OAIG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IA4B7C,oBAAoB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IASrD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAOtB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA2C9B,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAIpD,eAAe,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IAYtD,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAK/B,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAIlC;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,YAAY,CAAC;IA4ElC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB3B,uBAAuB,CAAC,KAAK,EAAE,GAAG;IAexC,IAAI,QAAQ,IAAI,OAAO,CAItB;IAEK,kBAAkB;IAgCxB,sBAAsB;IAIhB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAOhC"}

package/dist/src/node/node.js

@@ -6,7 +6,6 @@ import { oToolError } from '../error/tool.error.js';
 import { oToolErrorCodes } from '../error/enums/codes.error.js';
 import { oAgentPlan } from '../plan/agent.plan.js';
 import { oPlanContext } from '../plan/plan.context.js';
-import { oConfigurePlan } from '../plan/configure/configure.plan.js';
 import { v4 as uuidv4 } from 'uuid';
 // Enable default Node.js metrics
 // collectDefaultMetrics({ register: sharedRegistry });
@@ -26,33 +25,28 @@ export class oNode extends oCoreNode {
     }
     async _tool_handshake(handshake) {
         this.logger.debug('Performing handshake with intent: ', handshake.params.intent);
-        const pc = new oConfigurePlan({
-            intent: `This is a handshake request. You have already found the tool to resolve the user's intent: ${this.address.toString()}. Configure the handshake for the request to use the tool with user intent: ${handshake.params.intent}`,
-            currentNode: this,
-            caller: this.address,
-            context: new oPlanContext([
-                `[Method Metadata Begin]\n${JSON.stringify(this.methods)}\n[Method Metadata End]`,
-                `[Method Options Begin]\n${this.myTools().join(', ')}\n[Method Options End]`,
-            ]),
-        });
-        const result = await pc.execute();
-        this.logger.debug('Handshake result: ', result);
-        if (result.error) {
-            return result;
-        }
-        this.logger.debug('Handshake json: ', result.handshake);
-        return result;
+        const mytools = await this.myTools();
+        return {
+            tools: mytools.filter((t) => t !== 'handshake' && t !== 'intent'),
+            methods: this.methods,
+            successes: [],
+            failures: [],
+            task: undefined,
+            type: 'handshake',
+        };
     }
-    myTools() {
-        return Object.getOwnPropertyNames(oNode.prototype)
+    myTools(obj) {
+        return Object.getOwnPropertyNames(obj || this.constructor.prototype)
             .filter((key) => key.startsWith('_tool_'))
+            .filter((key) => !!key)
             .map((key) => key.replace('_tool_', ''));
     }
     async applyBridgeTransports(address, request) {
         throw new oToolError(oToolErrorCodes.TOOL_TRANSPORT_NOT_SUPPORTED, 'Bridge transports not implemented');
     }
-    matchAgainstMethods(address) {
-        const methods = this.myTools();
+    async matchAgainstMethods(address) {
+        const methods = await this.myTools();
+        this.logger.debug('Matching against methods: ', methods);
         const method = address
             .toString()
             .replace(this.address.toString() + '/', '');
@@ -64,11 +58,11 @@ export class oNode extends oCoreNode {
     async _tool_route(request) {
         const { payload } = request.params;
         const { address } = request.params;
-        this.logger.debug('Routing request to: ', address, ' with payload: ', payload);
+        this.logger.debug('Routing request to: ', address);
         const destinationAddress = new oAddress(address);
         // determine the next hop address from the encapsulated address
         const nextHopAddress = await this.addressResolution.resolve(destinationAddress);
-        this.logger.debug('Next hop address: ', nextHopAddress.toString());
+        this.logger.debug('Next hop address: ', nextHopAddress.toString(), nextHopAddress.customTransports);
         // prepare the request for the destination receiver
         let forwardRequest = new oRequest({
             params: payload.params,
@@ -77,6 +71,7 @@ export class oNode extends oCoreNode {
         });
         // if the next hop is not a libp2p address, we need to communicate to it another way
         if (this.addressResolution.supportsTransport(nextHopAddress)) {
+            this.logger.debug('Bridge transports supported, applying custom transports...');
             return this.applyBridgeTransports(nextHopAddress, forwardRequest);
         }
         // assume the next hop is a libp2p address, so we need to set the transports and dial it
@@ -84,20 +79,21 @@ export class oNode extends oCoreNode {
         const isAtDestination = nextHopAddress.value === destinationAddress.value;
         // if we are at the destination, let's look for the closest tool that can service the request
         const transports = nextHopAddress.transports.filter((t) => typeof t !== 'string');
-        const isMethodMatch = this.matchAgainstMethods(destinationAddress);
+        const isMethodMatch = await this.matchAgainstMethods(destinationAddress);
         // handle address -> method resolution
         if (isMethodMatch) {
             this.logger.debug('Method match found, forwarding to self...');
             const extractedMethod = this.extractMethod(destinationAddress);
-            const response = await this.use(this.address, {
-                method: payload.method || extractedMethod,
-                params: payload.params,
-            });
-            if (response.result.error) {
-                const error = response.result.error;
-                throw new oToolError(error.code, error.message);
+            try {
+                const response = await this.use(this.address, {
+                    method: payload.method || extractedMethod,
+                    params: payload.params,
+                });
+                return response.result.data;
+            }
+            catch (error) {
+                return error;
             }
-            return response.result.data;
         }
         const targetStream = await this.p2pNode.dialProtocol(transports, nextHopAddress.protocol);
         // if not at destination, we need to forward the request to the target
@@ -134,6 +130,7 @@ export class oNode extends oCoreNode {
         const response = await pc.execute();
         return {
             ...response,
+            cycles: pc.sequence.length,
             sequence: pc.sequence.map((s) => {
                 return {
                     reasoning: s.result?.reasoning,

package/dist/src/plan/agent.plan.d.ts

@@ -2,6 +2,7 @@ import { oPlanResult } from './interfaces/plan.result.js';
 import { oPlanConfig } from './interfaces/plan-config.interface.js';
 import { oPlan } from './o-plan.js';
 import { oQueryConfig } from './interfaces/query.config.js';
+import { oTaskConfig } from './interfaces/task.config.js';
 /**
  * oAgentPlan is responsible for managing the execution of plans.
  * General execution flow:
@@ -14,9 +15,9 @@ export declare class oAgentPlan extends oPlan {
     private MAX_ITERATIONS;
     private contextIdHash;
     constructor(config: oPlanConfig);
+    doTask(task: oTaskConfig, config: oPlanConfig): Promise<oPlanResult>;
     handleTasks(results: oPlanResult, config: oPlanConfig): Promise<oPlanResult[]>;
     handleSearch(queries: oQueryConfig[], config: oPlanConfig): Promise<any[]>;
-    handleError(error: any, config: oPlanConfig): Promise<oPlanResult>;
     /**
      * The analysis of the intent results in a list of steps and queries to complete the intent.
      */

package/dist/src/plan/agent.plan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent.plan.d.ts","sourceRoot":"","sources":["../../../src/plan/agent.plan.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAG5D;;;;;;;GAOG;AACH,qBAAa,UAAW,SAAQ,KAAK;IACnC,OAAO,CAAC,cAAc,CAAM;IAC5B,OAAO,CAAC,aAAa,CAAkC;gBAE3C,MAAM,EAAE,WAAW;IAIzB,WAAW,CACf,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,WAAW,EAAE,CAAC;IA4BnB,YAAY,CAChB,OAAO,EAAE,YAAY,EAAE,EACvB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,GAAG,EAAE,CAAC;IAqBX,WAAW,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAWxE;;OAEG;IACG,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAsB7D,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC;IAwF5B,GAAG,IAAI,OAAO,CAAC,WAAW,CAAC;CAGlC"}
+{"version":3,"file":"agent.plan.d.ts","sourceRoot":"","sources":["../../../src/plan/agent.plan.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAGpC,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D;;;;;;;GAOG;AACH,qBAAa,UAAW,SAAQ,KAAK;IACnC,OAAO,CAAC,cAAc,CAAM;IAC5B,OAAO,CAAC,aAAa,CAAkC;gBAE3C,MAAM,EAAE,WAAW;IAIzB,MAAM,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAuBpE,WAAW,CACf,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,WAAW,EAAE,CAAC;IAmBnB,YAAY,CAChB,OAAO,EAAE,YAAY,EAAE,EACvB,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,GAAG,EAAE,CAAC;IAmCjB;;OAEG;IACG,kBAAkB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAmB7D,IAAI,IAAI,OAAO,CAAC,WAAW,CAAC;IA6F5B,GAAG,IAAI,OAAO,CAAC,WAAW,CAAC;CAGlC"}

package/dist/src/plan/agent.plan.js

@@ -2,7 +2,6 @@ import { oAddress } from '../core/index.js';
 import { oPlan } from './o-plan.js';
 import { oUsePlan } from './use/use.plan.js';
 import { oSearchPlan } from './search/search.plan.js';
-import { oErrorPlan } from './error/error.plan.js';
 /**
  * oAgentPlan is responsible for managing the execution of plans.
  * General execution flow:
@@ -17,6 +16,28 @@ export class oAgentPlan extends oPlan {
         this.MAX_ITERATIONS = 20;
         this.contextIdHash = {};
     }
+    async doTask(task, config) {
+        this.logger.debug('Doing task...', task);
+        const taskPlan = new oUsePlan({
+            ...config,
+            intent: this.config.intent,
+            context: this.config.context,
+            receiver: new oAddress(task.address),
+            sequence: this.sequence,
+        });
+        const taskResult = await taskPlan.execute();
+        this.addSequencePlan(taskPlan);
+        this.logger.debug('Pushed task plan to sequence: ', taskResult.result);
+        if (taskResult.error) {
+            this.logger.debug('Task error: ', taskResult.error);
+            // const errorResult = await this.handleError(taskResult.error, config);
+            // if (errorResult.type === 'result') {
+            //   return errorResult;
+            // }
+            // return this.doTask(task, config);
+        }
+        return taskResult;
+    }
     async handleTasks(results, config) {
         this.logger.debug('Handling task...', results);
         const tasks = results.tasks;
@@ -29,17 +50,8 @@ export class oAgentPlan extends oPlan {
                 throw new Error('Invalid address passed to handleTask');
             }
             // perform task if necessary
-            const taskPlan = new oUsePlan({
-                ...config,
-                intent: this.config.intent,
-                context: this.config.context,
-                receiver: new oAddress(task.address),
-            });
-            const taskResult = await taskPlan.execute();
-            this.sequence.push(taskPlan);
-            this.logger.debug('Pushed task plan to sequence: ', taskPlan.result);
-            taskResults.push(taskResult);
-            await this.handleError(taskResult.error, config);
+            const result = await this.doTask(task, config);
+            taskResults.push(result);
         }
         return taskResults;
     }
@@ -57,35 +69,39 @@ export class oAgentPlan extends oPlan {
                 external: query?.provider === 'external',
             });
             const result = await searchPlan.execute();
-            this.sequence.push(searchPlan);
+            this.addSequencePlan(searchPlan);
             this.logger.debug('Search result: ', result.result);
             results.push(result.result);
         }
         return results.flat();
     }
-    async handleError(error, config) {
-        this.logger.debug('Handling error...', error);
-        const errorPlan = new oErrorPlan({
-            ...config,
-            error: error,
-        });
-        this.sequence.push(errorPlan);
-        const result = await errorPlan.execute();
-        return result;
-    }
+    // async handleError(error: any, config: oPlanConfig): Promise<oPlanResult> {
+    //   this.logger.debug('Handling error...', error);
+    //   const errorPlan = new oAgentPlan({
+    //     ...config,
+    //     intent: `If this error is already indicating that the user intent is solved, return a result otherwise solve it. The error is: ${error}`,
+    //     context: this.config.context,
+    //     sequence: this.sequence,
+    //     parentId: this.id,
+    //   });
+    //   const result = await errorPlan.execute();
+    //   this.addSequencePlan(errorPlan);
+    //   return result;
+    // }
     /**
      * The analysis of the intent results in a list of steps and queries to complete the intent.
      */
     async handleMultipleStep(output) {
-        this.logger.debug('Handling analysis...', output);
         const results = [];
         for (const intent of output?.intents || []) {
             const subPlan = new oAgentPlan({
                 ...this.config,
-                intent: intent.intent,
+                intent: intent,
+                sequence: this.sequence,
+                parentId: this.id,
             });
             const response = await subPlan.execute();
-            this.logger.debug('Handled multiple step intent: ', intent.intent, response);
+            this.addSequencePlan(subPlan);
             results.push(JSON.stringify(response));
         }
         return {
@@ -102,10 +118,9 @@ export class oAgentPlan extends oPlan {
             this.logger.debug('Plan context size: ', this.config.context?.toString()?.length);
             // setup the plan config
             const planConfig = {
-                intent: this.config.intent,
+                ...this.config,
                 currentNode: this.node,
                 caller: this.node?.address,
-                context: this.config.context,
                 sequence: this.sequence,
             };
             // search or resolve the intent with tool usage
@@ -115,13 +130,14 @@ export class oAgentPlan extends oPlan {
             const planResult = response;
             const { error, result, type } = planResult;
             // update the sequence to reflect state change
-            this.sequence.push(plan);
+            this.addSequencePlan(plan);
             // handle the various result types
             const resultType = type;
             // if there is an answer, return it
             if (resultType === 'result' ||
                 resultType === 'error' ||
-                resultType === 'handshake') {
+                resultType === 'handshake' ||
+                resultType === 'configure') {
                 return planResult;
             }
             // if there are intents, handle them
@@ -140,9 +156,15 @@ export class oAgentPlan extends oPlan {
                 }
                 // update the context with the search results
                 for (const searchResult of filteredSearchResults) {
-                    // add the context data
-                    this.contextIdHash[searchResult.metadata.id] = true;
-                    searchResultContext += `Tool Address: ${searchResult.metadata.address}\nTool Data: ${searchResult.pageContent}\n\n`;
+                    // internal search results
+                    if (searchResult?.metadata) {
+                        // add the context data
+                        this.contextIdHash[searchResult?.metadata?.id || '0'] = true;
+                        searchResultContext += `Tool Address: ${searchResult?.metadata?.address || 'unknown'}\nTool Data: ${searchResult?.pageContent || 'unknown'}\n\n`;
+                    }
+                    else {
+                        searchResultContext += `External Search Result: ${searchResult?.message || 'unknown'}\n\n`;
+                    }
                 }
                 searchResultContext += `[Search Results End]`;
                 if (filteredSearchResults.length > 0) {

package/dist/src/plan/interfaces/configure.result.d.ts

@@ -0,0 +1,6 @@
+import { oTaskConfig } from './task.config';
+export interface oConfigureResult {
+    task: oTaskConfig;
+    type: 'configure';
+}
+//# sourceMappingURL=configure.result.d.ts.map

package/dist/src/plan/interfaces/configure.result.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"configure.result.d.ts","sourceRoot":"","sources":["../../../../src/plan/interfaces/configure.result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,WAAW,CAAC;CACnB"}

package/dist/src/plan/interfaces/configure.result.js

@@ -0,0 +1 @@
+export {};

package/dist/src/plan/interfaces/handshake.result.d.ts

@@ -0,0 +1,14 @@
+import { oMethod } from '@olane/o-protocol';
+import { oPlanResult } from './plan.result';
+import { oTaskConfig } from './task.config';
+export interface oHandshakeResult {
+    tools: string[];
+    methods: {
+        [key: string]: oMethod;
+    };
+    successes: oPlanResult[];
+    failures: oPlanResult[];
+    task?: oTaskConfig;
+    type: 'handshake';
+}
+//# sourceMappingURL=handshake.result.d.ts.map

package/dist/src/plan/interfaces/handshake.result.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handshake.result.d.ts","sourceRoot":"","sources":["../../../../src/plan/interfaces/handshake.result.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IACpC,SAAS,EAAE,WAAW,EAAE,CAAC;IACzB,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,IAAI,EAAE,WAAW,CAAC;CACnB"}

package/dist/src/plan/interfaces/handshake.result.js

@@ -0,0 +1 @@
+export {};

package/dist/src/plan/interfaces/plan-config.interface.d.ts

@@ -7,6 +7,8 @@ export interface oPlanConfig {
     currentNode: oCoreNode;
     caller: oAddress;
     receiver?: oAddress;
-    promptFunction?: (intent: string, context: string, agentHistory: string) => string;
+    promptFunction?: (intent: string, context: string, agentHistory: string, extraInstructions: string) => string;
+    extraInstructions?: string;
+    parentId?: string;
 }
 //# sourceMappingURL=plan-config.interface.d.ts.map

package/dist/src/plan/interfaces/plan-config.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plan-config.interface.d.ts","sourceRoot":"","sources":["../../../../src/plan/interfaces/plan-config.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,WAAW,WAAW;IAE1B,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;IAGjB,WAAW,EAAE,SAAS,CAAC;IACvB,MAAM,EAAE,QAAQ,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,CACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,KACjB,MAAM,CAAC;CACb"}
+{"version":3,"file":"plan-config.interface.d.ts","sourceRoot":"","sources":["../../../../src/plan/interfaces/plan-config.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,WAAW,WAAW;IAE1B,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;IAGjB,WAAW,EAAE,SAAS,CAAC;IACvB,MAAM,EAAE,QAAQ,CAAC;IACjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,cAAc,CAAC,EAAE,CACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,MAAM,KACtB,MAAM,CAAC;IACZ,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB"}

package/dist/src/plan/interfaces/plan-type.enum.d.ts

@@ -2,6 +2,7 @@ export declare enum oPlanType {
     ANALYSIS = "analysis",
     SEARCH = "search",
     CONFIGURE = "configure",
-    USE = "use"
+    USE = "use",
+    ERROR = "error"
 }
 //# sourceMappingURL=plan-type.enum.d.ts.map

package/dist/src/plan/interfaces/plan-type.enum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plan-type.enum.d.ts","sourceRoot":"","sources":["../../../../src/plan/interfaces/plan-type.enum.ts"],"names":[],"mappings":"AAAA,oBAAY,SAAS;IACnB,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,GAAG,QAAQ;CACZ"}
+{"version":3,"file":"plan-type.enum.d.ts","sourceRoot":"","sources":["../../../../src/plan/interfaces/plan-type.enum.ts"],"names":[],"mappings":"AAAA,oBAAY,SAAS;IACnB,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,SAAS,cAAc;IACvB,GAAG,QAAQ;IACX,KAAK,UAAU;CAChB"}

package/dist/src/plan/interfaces/plan-type.enum.js

@@ -4,4 +4,5 @@ export var oPlanType;
     oPlanType["SEARCH"] = "search";
     oPlanType["CONFIGURE"] = "configure";
     oPlanType["USE"] = "use";
+    oPlanType["ERROR"] = "error";
 })(oPlanType || (oPlanType = {}));