@olane/o-lane 0.7.12-alpha.66 → 0.7.12-alpha.68

package/dist/src/capabilities/interfaces/o-capability.config.d.ts

@@ -1,8 +1,8 @@
 import { oIntent } from '../../intent/o-intent.js';
 import { oLaneConfig } from '../../interfaces/o-lane.config.js';
-import type { oLaneTool } from '../../o-lane.tool.js';
+import { oToolBase } from '@olane/o-tool';
 export interface oCapabilityConfig {
-    node: oLaneTool;
+    node: oToolBase;
     intent: oIntent;
     laneConfig: oLaneConfig;
     history: string;

package/dist/src/capabilities/interfaces/o-capability.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-capability.config.d.ts","sourceRoot":"","sources":["../../../../src/capabilities/interfaces/o-capability.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,WAAW,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC"}
+{"version":3,"file":"o-capability.config.d.ts","sourceRoot":"","sources":["../../../../src/capabilities/interfaces/o-capability.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,MAAM,WAAW,iBAAiB;IAEhC,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,OAAO,CAAC;IAChB,UAAU,EAAE,WAAW,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC"}

package/dist/src/capabilities/o-capability.d.ts

@@ -1,13 +1,13 @@
 import { oObject } from '@olane/o-core';
+import { oToolBase } from '@olane/o-tool';
 import { oCapabilityConfig } from './interfaces/o-capability.config.js';
 import { oCapabilityType } from './enums/o-capability.type-enum.js';
 import { oCapabilityResult } from './o-capability.result.js';
-import type { oLaneTool } from '../o-lane.tool.js';
 import { oIntent } from '../intent/o-intent.js';
 export declare abstract class oCapability extends oObject {
     config: oCapabilityConfig;
     abstract run(): Promise<oCapabilityResult>;
-    get node(): oLaneTool;
+    get node(): oToolBase;
     execute(config: oCapabilityConfig): Promise<oCapabilityResult>;
     get intent(): oIntent;
     get type(): oCapabilityType;

package/dist/src/capabilities/o-capability.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-capability.d.ts","sourceRoot":"","sources":["../../../src/capabilities/o-capability.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,8BAAsB,WAAY,SAAQ,OAAO;IACxC,MAAM,EAAG,iBAAiB,CAAC;IAClC,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAE1C,IAAI,IAAI,IAAI,SAAS,CAEpB;IAEK,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAKpE,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,IAAI,oBAEP;IAED,MAAM,KAAK,IAAI,oBAEd;IAED,MAAM;CAGP"}
+{"version":3,"file":"o-capability.d.ts","sourceRoot":"","sources":["../../../src/capabilities/o-capability.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,8BAAsB,WAAY,SAAQ,OAAO;IACxC,MAAM,EAAG,iBAAiB,CAAC;IAClC,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAE1C,IAAI,IAAI,IAAI,SAAS,CAEpB;IAEK,OAAO,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAKpE,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,IAAI,IAAI,oBAEP;IAED,MAAM,KAAK,IAAI,oBAEd;IAED,MAAM;CAGP"}

package/dist/src/index.d.ts

@@ -2,6 +2,7 @@ export * from './o-lane.js';
 export * from './interfaces/index.js';
 export * from './manager/o-lane.manager.js';
 export * from './o-lane.context.js';
+export * from './o-lane.mixin.js';
 export * from './o-lane.tool.js';
 export * from './capabilities/index.js';
 export * from './intent/index.js';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,wCAAwC,CAAC;AACvD,cAAc,oDAAoD,CAAC;AACnE,cAAc,kDAAkD,CAAC;AACjE,cAAc,4DAA4D,CAAC;AAC3E,cAAc,8CAA8C,CAAC;AAC7D,cAAc,0CAA0C,CAAC;AACzD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,wCAAwC,CAAC;AACvD,cAAc,oDAAoD,CAAC;AACnE,cAAc,kDAAkD,CAAC;AACjE,cAAc,4DAA4D,CAAC;AAC3E,cAAc,8CAA8C,CAAC;AAC7D,cAAc,0CAA0C,CAAC;AACzD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,8BAA8B,CAAC"}

package/dist/src/index.js

@@ -2,6 +2,7 @@ export * from './o-lane.js';
 export * from './interfaces/index.js';
 export * from './manager/o-lane.manager.js';
 export * from './o-lane.context.js';
+export * from './o-lane.mixin.js';
 export * from './o-lane.tool.js';
 export * from './capabilities/index.js';
 export * from './intent/index.js';

package/dist/src/interfaces/o-lane.config.d.ts

@@ -1,8 +1,8 @@
 import { oAddress } from '@olane/o-core';
+import { oToolBase } from '@olane/o-tool';
 import { oLaneContext } from '../o-lane.context.js';
 import { oCapability } from '../capabilities/o-capability.js';
 import { oIntent } from '../intent/o-intent.js';
-import { oLaneTool } from '../o-lane.tool.js';
 export interface oLaneConfig {
     intent: oIntent;
     caller: oAddress;
@@ -10,12 +10,13 @@ export interface oLaneConfig {
     sequence?: any[];
     streamTo?: oAddress;
     capabilities?: oCapability[];
-    currentNode: oLaneTool;
+    currentNode: oToolBase;
     extraInstructions?: string;
     parentLaneId?: string;
     maxCycles?: number;
     persistToConfig?: boolean;
     onChunk?: (chunk: any) => void;
     useStream?: boolean;
+    requestId?: string | number;
 }
 //# sourceMappingURL=o-lane.config.d.ts.map

package/dist/src/interfaces/o-lane.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-lane.config.d.ts","sourceRoot":"","sources":["../../../src/interfaces/o-lane.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAS,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,MAAM,WAAW,WAAW;IAE1B,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,QAAQ,CAAC;IAEjB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;IAEjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;IAG7B,WAAW,EAAE,SAAS,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,SAAS,CAAC,EAAE,MAAM,CAAC;IAGnB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB"}
+{"version":3,"file":"o-lane.config.d.ts","sourceRoot":"","sources":["../../../src/interfaces/o-lane.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAS,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,MAAM,WAAW,WAAW;IAE1B,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,QAAQ,CAAC;IAEjB,OAAO,CAAC,EAAE,YAAY,CAAC;IACvB,QAAQ,CAAC,EAAE,GAAG,EAAE,CAAC;IAEjB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;IAI7B,WAAW,EAAE,SAAS,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,SAAS,CAAC,EAAE,MAAM,CAAC;IAGnB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC7B"}

package/dist/src/o-lane.d.ts

@@ -53,6 +53,6 @@ export declare class oLane extends oObject {
      * Other capabilities use cached results
      */
     private shouldReplayCapability;
-    get node(): import("./o-lane.tool.js").oLaneTool;
+    get node(): import("@olane/o-tool").oToolBase;
 }
 //# sourceMappingURL=o-lane.d.ts.map

package/dist/src/o-lane.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-lane.d.ts","sourceRoot":"","sources":["../../src/o-lane.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,OAAO,EAGR,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAInC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EAElB,MAAM,yBAAyB,CAAC;AAIjC,qBAAa,KAAM,SAAQ,OAAO;IAWpB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW;IAV3C,QAAQ,EAAE,iBAAiB,EAAE,CAAM;IACnC,GAAG,EAAE,GAAG,GAAG,SAAS,CAAC;IACrB,EAAE,EAAE,MAAM,CAAY;IACtB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,aAAa,EAAE,cAAc,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAM;IACxB,MAAM,EAAE,WAAW,CAAuB;IAC1C,MAAM,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACtC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;gBAEP,MAAM,EAAE,WAAW;IAalD,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,UAAU,IAAI,GAAG;IAQjB,MAAM;;;;;IAQN,WAAW,CAAC,MAAM,EAAE,iBAAiB;IAgB/B,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAUrB,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAuB3B,IAAI,YAAY,WA8Df;IAED;;;OAGG;IACH,iBAAiB,IAAI,MAAM;IA+DrB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1B,OAAO,IAAI,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IA4BvD,IAAI,YAAY,2DAEf;IAED,cAAc,CAAC,MAAM,EAAE,GAAG,GAAG,iBAAiB;IAcxC,YAAY,CAChB,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC,iBAAiB,CAAC;IA0BvB,IAAI,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAsDlC,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG;IAezD,UAAU,CACd,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAsDzC,MAAM;IASN;;;OAGG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAwEjE;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAS9B,IAAI,IAAI,yCAEP;CACF"}
+{"version":3,"file":"o-lane.d.ts","sourceRoot":"","sources":["../../src/o-lane.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,OAAO,EAGR,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAInC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EAElB,MAAM,yBAAyB,CAAC;AAIjC,qBAAa,KAAM,SAAQ,OAAO;IAWpB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,WAAW;IAV3C,QAAQ,EAAE,iBAAiB,EAAE,CAAM;IACnC,GAAG,EAAE,GAAG,GAAG,SAAS,CAAC;IACrB,EAAE,EAAE,MAAM,CAAY;IACtB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,aAAa,EAAE,cAAc,CAAC;IAC9B,UAAU,EAAE,MAAM,CAAM;IACxB,MAAM,EAAE,WAAW,CAAuB;IAC1C,MAAM,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACtC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;gBAEP,MAAM,EAAE,WAAW;IAalD,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED,UAAU,IAAI,GAAG;IAQjB,MAAM;;;;;IAQN,WAAW,CAAC,MAAM,EAAE,iBAAiB;IAgB/B,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAUrB,KAAK,IAAI,OAAO,CAAC,GAAG,CAAC;IAuB3B,IAAI,YAAY,WA8Df;IAED;;;OAGG;IACH,iBAAiB,IAAI,MAAM;IA+DrB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1B,OAAO,IAAI,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IA4BvD,IAAI,YAAY,2DAEf;IAED,cAAc,CAAC,MAAM,EAAE,GAAG,GAAG,iBAAiB;IAcxC,YAAY,CAChB,WAAW,EAAE,iBAAiB,GAC7B,OAAO,CAAC,iBAAiB,CAAC;IA0BvB,IAAI,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAsDlC,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG;IAezD,UAAU,CACd,QAAQ,CAAC,EAAE,iBAAiB,GAC3B,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAsDzC,MAAM;IASN;;;OAGG;IACG,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAwEjE;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAS9B,IAAI,IAAI,sCAEP;CACF"}

package/dist/src/o-lane.js

@@ -318,7 +318,7 @@ export class oLane extends oObject {
                 _isStreaming: true,
                 _connectionId: this.node.address.toString(),
                 _requestMethod: 'unknown',
-                id: uuidv4(),
+                id: this.config.requestId ?? uuidv4(), // Use request ID for proper correlation, fallback to UUID
             }));
         }
     }

package/dist/src/o-lane.mixin.d.ts

@@ -0,0 +1,17 @@
+import { oToolBase } from '@olane/o-tool';
+/**
+ * withLane mixin - adds lane execution capabilities to any tool base class
+ * This mixin pattern allows lane functionality to be composed with different
+ * base classes (e.g., node-based, browser-based, or other implementations)
+ *
+ * @example
+ * ```typescript
+ * // Apply to node-based tool
+ * export class oLaneTool extends withLane(oNodeTool) {}
+ *
+ * // Future: Apply to browser-based tool
+ * export class oBrowserLaneTool extends withLane(oBrowserTool) {}
+ * ```
+ */
+export declare function withLane<T extends new (...args: any[]) => oToolBase>(Base: T): T;
+//# sourceMappingURL=o-lane.mixin.d.ts.map

package/dist/src/o-lane.mixin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"o-lane.mixin.d.ts","sourceRoot":"","sources":["../../src/o-lane.mixin.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAQ1C;;;;;;;;;;;;;GAaG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,SAAS,EAClE,IAAI,EAAE,CAAC,GACN,CAAC,CAiJH"}

package/dist/src/o-lane.mixin.js

@@ -0,0 +1,136 @@
+import { CoreUtils, oAddress, oError, oErrorCodes, oResponse, } from '@olane/o-core';
+import { oCapabilityType } from './capabilities/index.js';
+import { oIntent } from './intent/index.js';
+import { oLaneContext } from './o-lane.context.js';
+import { oLaneManager } from './manager/o-lane.manager.js';
+import { oCapabilityResult } from './capabilities/o-capability.result.js';
+/**
+ * withLane mixin - adds lane execution capabilities to any tool base class
+ * This mixin pattern allows lane functionality to be composed with different
+ * base classes (e.g., node-based, browser-based, or other implementations)
+ *
+ * @example
+ * ```typescript
+ * // Apply to node-based tool
+ * export class oLaneTool extends withLane(oNodeTool) {}
+ *
+ * // Future: Apply to browser-based tool
+ * export class oBrowserLaneTool extends withLane(oBrowserTool) {}
+ * ```
+ */
+export function withLane(Base) {
+    return class extends Base {
+        constructor(...args) {
+            super(...args);
+            this.manager = new oLaneManager();
+        }
+        async _tool_handshake(handshake) {
+            this.logger.debug('Performing handshake with intent: ', handshake.params.intent);
+            let tools = await this.myTools();
+            let methods = this.methods;
+            const { tool } = handshake.params;
+            if (tool) {
+                tools = tools.filter((t) => t === tool);
+                methods = { tool: this.methods[tool] };
+            }
+            return new oCapabilityResult({
+                result: {
+                    tools: tools.filter((t) => t !== 'handshake' && t !== 'intent'),
+                    methods: methods,
+                },
+                type: oCapabilityType.HANDSHAKE,
+            });
+        }
+        /**
+         * Where all intents go to be resolved.
+         * @param request
+         * @returns
+         */
+        async _tool_intent(request) {
+            this.logger.debug('Intent resolution called: ', request.params);
+            const { intent, context, streamTo, _isStreaming = false } = request.params;
+            const pc = await this.manager.createLane({
+                intent: new oIntent({ intent: intent }),
+                currentNode: this,
+                caller: this.address,
+                streamTo: streamTo ? new oAddress(streamTo) : undefined,
+                useStream: _isStreaming,
+                requestId: request.id, // Pass request ID for proper response correlation
+                onChunk: _isStreaming
+                    ? async (chunk) => {
+                        if (chunk?._last ||
+                            chunk?.result?._last ||
+                            chunk?.result?.data?._last) {
+                            this.logger.error('UNEXPECTED LAST CHUNK RECEIVED', JSON.stringify(chunk, null, 2));
+                            throw new oError(oErrorCodes.INVALID_ACTION, 'Misbehaving client sent unexpected last chunk');
+                        }
+                        await CoreUtils.sendStreamResponse(oResponse.fromJSON(chunk), request.stream);
+                    }
+                    : undefined,
+                context: context
+                    ? new oLaneContext([
+                        `[Chat History Context Begin]\n${context}\n[Chat History Context End]`,
+                    ])
+                    : undefined,
+            });
+            // TODO: brendon experiment review
+            // stream.addEventListener('close', () => {
+            //   this.logger.debug('Stream closed, cancelling lane for intent:', intent);
+            //   pc.cancel();
+            // });
+            let response;
+            response = await pc.execute();
+            const completeResponse = {
+                result: response?.result,
+                humanResult: response?.humanResult, // Full human-readable formatted result (AI-generated markdown)
+                summary: response?.config?.params?.summary, // Short 1-2 sentence summary
+                error: response?.error,
+                cycles: pc.sequence.length,
+                cid: pc.cid?.toString(),
+                sequence: pc.sequence.map((s) => {
+                    return s.result;
+                }),
+            };
+            await new Promise((resolve) => setTimeout(resolve, 3000)); // TODO: fix this: wait for 3 seconds to let the stream send 2 messages lol
+            console.log('completeResponse', completeResponse);
+            return completeResponse;
+        }
+        /**
+         * Replay a stored lane from storage by CID
+         * This restores network state from a previously executed lane
+         * @param request - Request containing the CID of the lane to replay
+         * @returns The result of the replayed lane
+         */
+        async _tool_replay(request) {
+            this.logger.debug('Lane replay called: ', request.params);
+            const { cid } = request.params;
+            if (!cid || typeof cid !== 'string') {
+                throw new Error('CID parameter is required and must be a string');
+            }
+            // Create a lane instance for replay
+            const lane = await this.manager.createLane({
+                intent: new oIntent({ intent: 'replay' }),
+                currentNode: this,
+                caller: this.address,
+            });
+            try {
+                const response = await lane.replay(cid);
+                this.logger.debug('Lane replay response: ', response);
+                return {
+                    result: response?.result,
+                    error: response?.error,
+                    cycles: lane.sequence.length,
+                    cid: cid,
+                };
+            }
+            catch (error) {
+                this.logger.error('Lane replay failed: ', error);
+                throw error;
+            }
+        }
+        async teardown() {
+            await this.manager.teardown();
+            await super.teardown();
+        }
+    };
+}

package/dist/src/o-lane.tool.d.ts

@@ -1,23 +1,16 @@
-import { oRequest } from '@olane/o-core';
-import { oNodeConfig, oNodeTool, oStreamRequest } from '@olane/o-node';
-import { oHandshakeResult } from './interfaces/index.js';
-export declare class oLaneTool extends oNodeTool {
-    private manager;
+import { oNodeConfig, oNodeTool } from '@olane/o-node';
+declare const oLaneTool_base: typeof oNodeTool;
+/**
+ * oLaneTool - Node-based tool with lane execution capabilities
+ * This class composes the withLane mixin with oNodeTool to provide
+ * a concrete implementation for node-based lane execution.
+ *
+ * All lane-specific functionality is provided by the withLane mixin,
+ * making this implementation backward compatible while enabling
+ * future flexibility to apply lane capabilities to other base classes.
+ */
+export declare class oLaneTool extends oLaneTool_base {
     constructor(config: oNodeConfig);
-    _tool_handshake(handshake: oRequest): Promise<oHandshakeResult>;
-    /**
-     * Where all intents go to be resolved.
-     * @param request
-     * @returns
-     */
-    _tool_intent(request: oStreamRequest): Promise<any>;
-    /**
-     * Replay a stored lane from storage by CID
-     * This restores network state from a previously executed lane
-     * @param request - Request containing the CID of the lane to replay
-     * @returns The result of the replayed lane
-     */
-    _tool_replay(request: oRequest): Promise<any>;
-    teardown(): Promise<void>;
 }
+export {};
 //# sourceMappingURL=o-lane.tool.d.ts.map

package/dist/src/o-lane.tool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"o-lane.tool.d.ts","sourceRoot":"","sources":["../../src/o-lane.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,QAAQ,EAET,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,WAAW,EACX,SAAS,EACT,cAAc,EAEf,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAQzD,qBAAa,SAAU,SAAQ,SAAS;IACtC,OAAO,CAAC,OAAO,CAAe;gBAElB,MAAM,EAAE,WAAW;IAKzB,eAAe,CAAC,SAAS,EAAE,QAAQ,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAyBrE;;;;OAIG;IACG,YAAY,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC;IA4DzD;;;;;OAKG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC;IA8B7C,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAIhC"}
+{"version":3,"file":"o-lane.tool.d.ts","sourceRoot":"","sources":["../../src/o-lane.tool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;;AAGvD;;;;;;;;GAQG;AACH,qBAAa,SAAU,SAAQ,cAAmB;gBACpC,MAAM,EAAE,WAAW;CAGhC"}

package/dist/src/o-lane.tool.js

@@ -1,118 +1,16 @@
-import { CoreUtils, oAddress, oError, oErrorCodes, oResponse, } from '@olane/o-core';
-import { oNodeTool, } from '@olane/o-node';
-import { oCapabilityType } from './capabilities/index.js';
-import { oIntent } from './intent/index.js';
-import { oLaneContext } from './o-lane.context.js';
-import { oLaneManager } from './manager/o-lane.manager.js';
-import { oCapabilityResult } from './capabilities/o-capability.result.js';
-export class oLaneTool extends oNodeTool {
+import { oNodeTool } from '@olane/o-node';
+import { withLane } from './o-lane.mixin.js';
+/**
+ * oLaneTool - Node-based tool with lane execution capabilities
+ * This class composes the withLane mixin with oNodeTool to provide
+ * a concrete implementation for node-based lane execution.
+ *
+ * All lane-specific functionality is provided by the withLane mixin,
+ * making this implementation backward compatible while enabling
+ * future flexibility to apply lane capabilities to other base classes.
+ */
+export class oLaneTool extends withLane(oNodeTool) {
     constructor(config) {
         super(config);
-        this.manager = new oLaneManager();
-    }
-    async _tool_handshake(handshake) {
-        this.logger.debug('Performing handshake with intent: ', handshake.params.intent);
-        let tools = await this.myTools();
-        let methods = this.methods;
-        const { tool } = handshake.params;
-        if (tool) {
-            tools = tools.filter((t) => t === tool);
-            methods = { tool: this.methods[tool] };
-        }
-        return new oCapabilityResult({
-            result: {
-                tools: tools.filter((t) => t !== 'handshake' && t !== 'intent'),
-                methods: methods,
-            },
-            type: oCapabilityType.HANDSHAKE,
-        });
-    }
-    /**
-     * Where all intents go to be resolved.
-     * @param request
-     * @returns
-     */
-    async _tool_intent(request) {
-        this.logger.debug('Intent resolution called: ', request.params);
-        const { intent, context, streamTo, _isStreaming = false } = request.params;
-        const pc = await this.manager.createLane({
-            intent: new oIntent({ intent: intent }),
-            currentNode: this,
-            caller: this.address,
-            streamTo: streamTo ? new oAddress(streamTo) : undefined,
-            useStream: _isStreaming,
-            onChunk: _isStreaming
-                ? async (chunk) => {
-                    if (chunk?._last || chunk?.result?._last) {
-                        this.logger.error('UNEXPECTED LAST CHUNK RECEIVED', JSON.stringify(chunk, null, 2));
-                        throw new oError(oErrorCodes.INVALID_ACTION, 'Misbehaving client sent unexpected last chunk');
-                    }
-                    await CoreUtils.sendStreamResponse(oResponse.fromJSON(chunk), request.stream);
-                }
-                : undefined,
-            context: context
-                ? new oLaneContext([
-                    `[Chat History Context Begin]\n${context}\n[Chat History Context End]`,
-                ])
-                : undefined,
-        });
-        // TODO: brendon experiment review
-        // stream.addEventListener('close', () => {
-        //   this.logger.debug('Stream closed, cancelling lane for intent:', intent);
-        //   pc.cancel();
-        // });
-        let response;
-        response = await pc.execute();
-        const completeResponse = {
-            result: response?.result,
-            humanResult: response?.humanResult, // Full human-readable formatted result (AI-generated markdown)
-            summary: response?.config?.params?.summary, // Short 1-2 sentence summary
-            error: response?.error,
-            cycles: pc.sequence.length,
-            cid: pc.cid?.toString(),
-            sequence: pc.sequence.map((s) => {
-                return s.result;
-            }),
-        };
-        await new Promise((resolve) => setTimeout(resolve, 3000)); // TODO: fix this: wait for 3 seconds to let the stream send 2 messages lol
-        console.log('completeResponse', completeResponse);
-        return completeResponse;
-    }
-    /**
-     * Replay a stored lane from storage by CID
-     * This restores network state from a previously executed lane
-     * @param request - Request containing the CID of the lane to replay
-     * @returns The result of the replayed lane
-     */
-    async _tool_replay(request) {
-        this.logger.debug('Lane replay called: ', request.params);
-        const { cid } = request.params;
-        if (!cid || typeof cid !== 'string') {
-            throw new Error('CID parameter is required and must be a string');
-        }
-        // Create a lane instance for replay
-        const lane = await this.manager.createLane({
-            intent: new oIntent({ intent: 'replay' }),
-            currentNode: this,
-            caller: this.address,
-        });
-        try {
-            const response = await lane.replay(cid);
-            this.logger.debug('Lane replay response: ', response);
-            return {
-                result: response?.result,
-                error: response?.error,
-                cycles: lane.sequence.length,
-                cid: cid,
-            };
-        }
-        catch (error) {
-            this.logger.error('Lane replay failed: ', error);
-            throw error;
-        }
-    }
-    async teardown() {
-        await this.manager.teardown();
-        await super.teardown();
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olane/o-lane",
-  "version": "0.7.12-alpha.66",
+  "version": "0.7.12-alpha.68",
   "type": "module",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -54,13 +54,13 @@
     "typescript": "5.4.5"
   },
   "dependencies": {
-    "@olane/o-config": "0.7.12-alpha.66",
-    "@olane/o-core": "0.7.12-alpha.66",
-    "@olane/o-node": "0.7.12-alpha.66",
-    "@olane/o-protocol": "0.7.12-alpha.66",
-    "@olane/o-tool": "0.7.12-alpha.66",
+    "@olane/o-config": "0.7.12-alpha.68",
+    "@olane/o-core": "0.7.12-alpha.68",
+    "@olane/o-node": "0.7.12-alpha.68",
+    "@olane/o-protocol": "0.7.12-alpha.68",
+    "@olane/o-tool": "0.7.12-alpha.68",
     "debug": "^4.4.1",
     "dotenv": "^16.5.0"
   },
-  "gitHead": "879cb37d1e93b54a1e5d804987daf478fcc2722f"
+  "gitHead": "3ffe39de1430bed3673c13adc1b144f9016967dc"
 }