@optimizely-opal/opal-tool-ocp-sdk 0.0.0-OCP-1487.7 → 0.0.0-OCP-1487.9

package/dist/service/Service.d.ts

@@ -53,6 +53,15 @@ export declare class Tool<TAuthData> {
 export declare class ToolsService {
     private functions;
     private interactions;
+    /**
+     * Set the import context for tools that will be imported
+     * @param context The context type ('global' | 'regular')
+     */
+    setImportContext(context: 'global' | 'regular'): void;
+    /**
+     * Clear the import context after import is complete
+     */
+    clearImportContext(): void;
     /**
      * Enforce OptiID authentication for tools by ensuring OptiID auth requirement is present
      * @param authRequirements Original authentication requirements
@@ -67,6 +76,7 @@ export declare class ToolsService {
      * @param parameters List of parameters for the tool
      * @param endpoint API endpoint for the tool
      * @param authRequirements Authentication requirements (optional)
+     * @param isGlobal Whether the tool is global
      */
     registerTool<TAuthData>(name: string, description: string, handler: (functionContext: ToolFunction | GlobalToolFunction, params: unknown, authData?: TAuthData) => Promise<unknown>, parameters: Parameter[], endpoint: string, authRequirements?: AuthRequirement[], isGlobal?: boolean): void;
     /**
@@ -80,7 +90,7 @@ export declare class ToolsService {
     /**
      * Handle discovery endpoint requests with context-aware filtering
      * @param functionContext The function context making the request
-     * @returns Response with filtered functions based on context type
+     * @returns Response with filtered functions based on where tools are defined/imported
      */
     private handleDiscovery;
 }

package/dist/service/Service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../../src/service/Service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Service.d.ts","sourceRoot":"","sources":["../../src/service/Service.ts"],"names":[],"mappings":"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"}

package/dist/service/Service.js

@@ -122,6 +122,19 @@ exports.Tool = Tool;
 class ToolsService {
     functions = new Map();
     interactions = new Map();
+    /**
+     * Set the import context for tools that will be imported
+     * @param context The context type ('global' | 'regular')
+     */
+    setImportContext(context) {
+        globalThis.__IMPORT_CONTEXT = context;
+    }
+    /**
+     * Clear the import context after import is complete
+     */
+    clearImportContext() {
+        globalThis.__IMPORT_CONTEXT = undefined;
+    }
     /**
      * Enforce OptiID authentication for tools by ensuring OptiID auth requirement is present
      * @param authRequirements Original authentication requirements
@@ -143,6 +156,7 @@ class ToolsService {
      * @param parameters List of parameters for the tool
      * @param endpoint API endpoint for the tool
      * @param authRequirements Authentication requirements (optional)
+     * @param isGlobal Whether the tool is global
      */
     registerTool(name, description, handler, parameters, endpoint, authRequirements, isGlobal = false) {
         // Enforce OptiID authentication for all tools
@@ -211,18 +225,18 @@ class ToolsService {
     /**
      * Handle discovery endpoint requests with context-aware filtering
      * @param functionContext The function context making the request
-     * @returns Response with filtered functions based on context type
+     * @returns Response with filtered functions based on where tools are defined/imported
      */
     handleDiscovery(functionContext) {
-        // Filter tools based on the function context type
-        const isGlobalFunction = functionContext instanceof GlobalToolFunction_1.GlobalToolFunction;
-        const availableFunctions = Array.from(this.functions.values()).filter((f) => {
-            if (isGlobalFunction) {
-                // Global functions can only see global tools
-                return f.isGlobal;
+        const isGlobalContext = functionContext instanceof GlobalToolFunction_1.GlobalToolFunction;
+        const availableFunctions = Array.from(this.functions.values()).filter((tool) => {
+            if (isGlobalContext) {
+                // Global context can only see global tools (defined in or imported into GlobalToolFunction)
+                return tool.isGlobal;
             }
             else {
-                return !f.isGlobal;
+                // Regular context can only see regular tools (defined in or imported into ToolFunction)
+                return !tool.isGlobal;
             }
         });
         return new App.Response(200, { functions: availableFunctions.map((f) => f.toJSON()) });

package/dist/service/Service.js.map

@@ -1 +1 @@
-{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/service/Service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Service.js","sourceRoot":"","sources":["../../src/service/Service.ts"],"names":[],"mappings":"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"}

package/dist/utils/ImportUtils.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Import a module as global tools
+ * @param modulePath The path to the module to import
+ * @param baseUrl The base URL for resolving relative imports (optional)
+ * @returns The imported module
+ */
+export declare function importAsGlobal<T = any>(modulePath: string, baseUrl?: string): Promise<T>;
+/**
+ * Import a module as regular tools
+ * @param modulePath The path to the module to import
+ * @param baseUrl The base URL for resolving relative imports (optional)
+ * @returns The imported module
+ */
+export declare function importAsRegular<T = any>(modulePath: string, baseUrl?: string): Promise<T>;
+//# sourceMappingURL=ImportUtils.d.ts.map

package/dist/utils/ImportUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImportUtils.d.ts","sourceRoot":"","sources":["../../src/utils/ImportUtils.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,wBAAsB,cAAc,CAAC,CAAC,GAAG,GAAG,EAC1C,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,CAAC,CAAC,CAWZ;AAED;;;;;GAKG;AACH,wBAAsB,eAAe,CAAC,CAAC,GAAG,GAAG,EAC3C,UAAU,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,CAAC,CAAC,CAWZ"}

package/dist/utils/ImportUtils.js

@@ -0,0 +1,77 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.importAsGlobal = importAsGlobal;
+exports.importAsRegular = importAsRegular;
+const Service_1 = require("../service/Service");
+/**
+ * Import a module as global tools
+ * @param modulePath The path to the module to import
+ * @param baseUrl The base URL for resolving relative imports (optional)
+ * @returns The imported module
+ */
+async function importAsGlobal(modulePath, baseUrl) {
+    try {
+        Service_1.toolsService.setImportContext('global');
+        // If baseUrl is provided, resolve the module path relative to it
+        // Otherwise, use the modulePath as-is
+        const resolvedPath = baseUrl ? new URL(modulePath, baseUrl).href : modulePath;
+        const module = await Promise.resolve(`${resolvedPath}`).then(s => __importStar(require(s)));
+        return module;
+    }
+    finally {
+        Service_1.toolsService.clearImportContext();
+    }
+}
+/**
+ * Import a module as regular tools
+ * @param modulePath The path to the module to import
+ * @param baseUrl The base URL for resolving relative imports (optional)
+ * @returns The imported module
+ */
+async function importAsRegular(modulePath, baseUrl) {
+    try {
+        Service_1.toolsService.setImportContext('regular');
+        // If baseUrl is provided, resolve the module path relative to it
+        // Otherwise, use the modulePath as-is
+        const resolvedPath = baseUrl ? new URL(modulePath, baseUrl).href : modulePath;
+        const module = await Promise.resolve(`${resolvedPath}`).then(s => __importStar(require(s)));
+        return module;
+    }
+    finally {
+        Service_1.toolsService.clearImportContext();
+    }
+}
+//# sourceMappingURL=ImportUtils.js.map

package/dist/utils/ImportUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ImportUtils.js","sourceRoot":"","sources":["../../src/utils/ImportUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAQA,wCAcC;AAQD,0CAcC;AA5CD,gDAAkD;AAElD;;;;;GAKG;AACI,KAAK,UAAU,cAAc,CAClC,UAAkB,EAClB,OAAgB;IAEhB,IAAI,CAAC;QACH,sBAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACxC,iEAAiE;QACjE,sCAAsC;QACtC,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC;QAC9E,MAAM,MAAM,GAAG,yBAAa,YAAY,uCAAC,CAAC;QAC1C,OAAO,MAAM,CAAC;IAChB,CAAC;YAAS,CAAC;QACT,sBAAY,CAAC,kBAAkB,EAAE,CAAC;IACpC,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,eAAe,CACnC,UAAkB,EAClB,OAAgB;IAEhB,IAAI,CAAC;QACH,sBAAY,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;QACzC,iEAAiE;QACjE,sCAAsC;QACtC,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC;QAC9E,MAAM,MAAM,GAAG,yBAAa,YAAY,uCAAC,CAAC;QAC1C,OAAO,MAAM,CAAC;IAChB,CAAC;YAAS,CAAC;QACT,sBAAY,CAAC,kBAAkB,EAAE,CAAC;IACpC,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimizely-opal/opal-tool-ocp-sdk",
-  "version": "0.0.0-OCP-1487.7",
+  "version": "0.0.0-OCP-1487.9",
   "description": "OCP SDK for Opal tool",
   "scripts": {
     "validate-deps": "node scripts/validate-deps.js",

package/src/auth/AuthUtils.ts

@@ -27,7 +27,7 @@ async function validateAccessToken(accessToken: string | undefined): Promise<boo
  * @param request - The incoming request
  * @returns object with authData and accessToken, or null if invalid
  */
-function extractAuthData(request: any): { authData: OptiIdAuthData; accessToken: string } | null {
+export function extractAuthData(request: any): { authData: OptiIdAuthData; accessToken: string } | null {
   const authData = request?.bodyJSON?.auth as OptiIdAuthData;
   const accessToken = authData?.credentials?.access_token;
   if (!accessToken || authData?.provider?.toLowerCase() !== 'optiid') {
@@ -76,7 +76,7 @@ function shouldSkipAuth(request: any): boolean {
  * @param validateOrg - Whether to validate organization ID
  * @returns true if authentication succeeds
  */
-async function authenticateRequest(request: any, validateOrg: boolean = false): Promise<boolean> {
+async function authenticateRequest(request: any, validateOrg: boolean): Promise<boolean> {
   if (shouldSkipAuth(request)) {
     return true;
   }

package/src/decorator/Decorator.test.ts

@@ -9,6 +9,9 @@ jest.mock('../service/Service', () => ({
     registerInteraction: jest.fn()
   }
 }));
+
+// Mock base class for testing auto-detection
+class GlobalToolFunction {}
 describe('Decorators', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -657,17 +660,15 @@ describe('Decorators', () => {
   });
 
   describe('global tool registration', () => {
-    it('should register a global tool with isGlobal: true', () => {
-      const config = {
-        name: 'globalTool',
-        description: 'A global tool',
+    it('should auto-detect global tools when class extends GlobalToolFunction', () => {
+      const config: ToolConfig = {
+        name: 'autoGlobalTool',
+        description: 'An auto-detected global tool',
         parameters: [],
-        endpoint: '/global-tool',
-        authRequirements: [],
-        isGlobal: true
+        endpoint: '/auto-global-tool'
       };
 
-      class GlobalTestClass {
+      class TestGlobalClass extends GlobalToolFunction {
         @tool(config)
         public async testTool(): Promise<{ result: string }> {
           return { result: 'global-tool-result' };
@@ -675,16 +676,268 @@ describe('Decorators', () => {
       }
 
       expect(toolsService.registerTool).toHaveBeenCalledWith(
-        'globalTool',
-        'A global tool',
+        'autoGlobalTool',
+        'An auto-detected global tool',
+        expect.any(Function),
+        [],
+        '/auto-global-tool',
+        [],
+        true
+      );
+
+      expect(TestGlobalClass).toBeDefined();
+    });
+
+    it('should register regular tools when class does not extend GlobalToolFunction', () => {
+      const config: ToolConfig = {
+        name: 'regularTool',
+        description: 'A regular tool',
+        parameters: [],
+        endpoint: '/regular-tool'
+      };
+
+      class TestRegularClass {
+        @tool(config)
+        public async testTool(): Promise<{ result: string }> {
+          return { result: 'regular-tool-result' };
+        }
+      }
+
+      expect(toolsService.registerTool).toHaveBeenCalledWith(
+        'regularTool',
+        'A regular tool',
+        expect.any(Function),
+        [],
+        '/regular-tool',
+        [],
+        false
+      );
+
+      expect(TestRegularClass).toBeDefined();
+    });
+
+    it('should register tools as global when import context is set', () => {
+      // Set global import context
+      globalThis.__IMPORT_CONTEXT = 'global';
+
+      const config: ToolConfig = {
+        name: 'importedGlobalTool',
+        description: 'A tool imported as global',
+        parameters: [],
+        endpoint: '/imported-global-tool'
+      };
+
+      class TestImportedClass {
+        @tool(config)
+        public async testTool(): Promise<{ result: string }> {
+          return { result: 'imported-global-tool-result' };
+        }
+      }
+
+      expect(toolsService.registerTool).toHaveBeenCalledWith(
+        'importedGlobalTool',
+        'A tool imported as global',
         expect.any(Function),
         [],
-        '/global-tool',
+        '/imported-global-tool',
         [],
         true
       );
 
-      expect(GlobalTestClass).toBeDefined();
+      // Clean up
+      globalThis.__IMPORT_CONTEXT = undefined;
+      expect(TestImportedClass).toBeDefined();
+    });
+
+    it('should register tools as regular when import context is set to regular', () => {
+      // Set regular import context
+      globalThis.__IMPORT_CONTEXT = 'regular';
+
+      const config: ToolConfig = {
+        name: 'importedRegularTool',
+        description: 'A tool imported as regular',
+        parameters: [],
+        endpoint: '/imported-regular-tool'
+      };
+
+      class TestImportedClass {
+        @tool(config)
+        public async testTool(): Promise<{ result: string }> {
+          return { result: 'imported-regular-tool-result' };
+        }
+      }
+
+      expect(toolsService.registerTool).toHaveBeenCalledWith(
+        'importedRegularTool',
+        'A tool imported as regular',
+        expect.any(Function),
+        [],
+        '/imported-regular-tool',
+        [],
+        false
+      );
+
+      // Clean up
+      globalThis.__IMPORT_CONTEXT = undefined;
+      expect(TestImportedClass).toBeDefined();
+    });
+
+    it('should handle mixed imports - both regular and global tools together', () => {
+      // Test importing regular tools first
+      globalThis.__IMPORT_CONTEXT = 'regular';
+
+      const regularConfig: ToolConfig = {
+        name: 'mixedRegularTool',
+        description: 'A regular tool in mixed scenario',
+        parameters: [],
+        endpoint: '/mixed-regular-tool'
+      };
+
+      class RegularToolClass {
+        @tool(regularConfig)
+        public async regularTool(): Promise<{ result: string }> {
+          return { result: 'mixed-regular-result' };
+        }
+      }
+
+      // Switch to global context
+      globalThis.__IMPORT_CONTEXT = 'global';
+
+      const globalConfig: ToolConfig = {
+        name: 'mixedGlobalTool',
+        description: 'A global tool in mixed scenario',
+        parameters: [],
+        endpoint: '/mixed-global-tool'
+      };
+
+      class GlobalToolClass {
+        @tool(globalConfig)
+        public async globalTool(): Promise<{ result: string }> {
+          return { result: 'mixed-global-result' };
+        }
+      }
+
+      // Clear context
+      globalThis.__IMPORT_CONTEXT = undefined;
+
+      // Verify regular tool was registered as regular
+      expect(toolsService.registerTool).toHaveBeenCalledWith(
+        'mixedRegularTool',
+        'A regular tool in mixed scenario',
+        expect.any(Function),
+        [],
+        '/mixed-regular-tool',
+        [],
+        false
+      );
+
+      // Verify global tool was registered as global
+      expect(toolsService.registerTool).toHaveBeenCalledWith(
+        'mixedGlobalTool',
+        'A global tool in mixed scenario',
+        expect.any(Function),
+        [],
+        '/mixed-global-tool',
+        [],
+        true
+      );
+
+      expect(RegularToolClass).toBeDefined();
+      expect(GlobalToolClass).toBeDefined();
+    });
+
+    it('should handle context switching correctly within same test', () => {
+      let callCount = 0;
+      const originalRegisterTool = jest.mocked(toolsService.registerTool);
+
+      // Track call order and contexts
+      originalRegisterTool.mockImplementation(() => {
+        callCount++;
+        // Store the isGlobal flag from each call for verification
+      });
+
+      // First: Import as regular
+      globalThis.__IMPORT_CONTEXT = 'regular';
+
+      class FirstClass {
+        @tool({
+          name: 'contextTest1',
+          description: 'First context test',
+          parameters: [],
+          endpoint: '/context-test-1'
+        })
+        public async tool1() {
+          return { result: 'test1' };
+        }
+      }
+
+      // Second: Switch to global
+      globalThis.__IMPORT_CONTEXT = 'global';
+
+      class SecondClass {
+        @tool({
+          name: 'contextTest2',
+          description: 'Second context test',
+          parameters: [],
+          endpoint: '/context-test-2'
+        })
+        public async tool2() {
+          return { result: 'test2' };
+        }
+      }
+
+      // Third: Clear context (should fallback to class inheritance)
+      globalThis.__IMPORT_CONTEXT = undefined;
+
+      class ThirdClass {
+        @tool({
+          name: 'contextTest3',
+          description: 'Third context test',
+          parameters: [],
+          endpoint: '/context-test-3'
+        })
+        public async tool3() {
+          return { result: 'test3' };
+        }
+      }
+
+      // Verify the sequence of calls
+      expect(toolsService.registerTool).toHaveBeenNthCalledWith(
+        callCount - 2, // First call
+        'contextTest1',
+        'First context test',
+        expect.any(Function),
+        [],
+        '/context-test-1',
+        [],
+        false // Should be regular
+      );
+
+      expect(toolsService.registerTool).toHaveBeenNthCalledWith(
+        callCount - 1, // Second call
+        'contextTest2',
+        'Second context test',
+        expect.any(Function),
+        [],
+        '/context-test-2',
+        [],
+        true // Should be global
+      );
+
+      expect(toolsService.registerTool).toHaveBeenNthCalledWith(
+        callCount, // Third call
+        'contextTest3',
+        'Third context test',
+        expect.any(Function),
+        [],
+        '/context-test-3',
+        [],
+        false // Should be regular (fallback to class check, ThirdClass doesn't extend GlobalToolFunction)
+      );
+
+      expect(FirstClass).toBeDefined();
+      expect(SecondClass).toBeDefined();
+      expect(ThirdClass).toBeDefined();
     });
   });
 });

package/src/decorator/Decorator.ts

@@ -1,6 +1,44 @@
 import { Parameter, AuthRequirement, ParameterType } from '../types/Models';
 import { toolsService } from '../service/Service';
 
+/**
+ * Global context flag to track import context
+ */
+declare global {
+  var __IMPORT_CONTEXT: 'global' | 'regular' | undefined;
+}
+
+/**
+ * Helper function to check if a class extends GlobalToolFunction
+ */
+function isGlobalToolFunction(constructor: any): boolean {
+  // Walk up the prototype chain to check for GlobalToolFunction
+  let currentConstructor = constructor;
+  while (currentConstructor) {
+    if (currentConstructor.name === 'GlobalToolFunction') {
+      return true;
+    }
+    currentConstructor = Object.getPrototypeOf(currentConstructor);
+  }
+  return false;
+}
+
+/**
+ * Determine if tool should be registered as global based on definition context or import context
+ */
+function shouldRegisterAsGlobal(targetConstructor: any): boolean {
+  // First check if there's an active import context
+  if (globalThis.__IMPORT_CONTEXT === 'global') {
+    return true;
+  }
+  if (globalThis.__IMPORT_CONTEXT === 'regular') {
+    return false;
+  }
+
+  // Fallback to checking where the tool is defined
+  return isGlobalToolFunction(targetConstructor);
+}
+
 /**
  * Configuration for @tool decorator
  */
@@ -10,7 +48,6 @@ export interface ToolConfig {
   parameters: ParameterConfig[];
   authRequirements?: AuthRequirementConfig[];
   endpoint: string;
-  isGlobal?: boolean;
 }
 
 /**
@@ -70,7 +107,10 @@ export function tool(config: ToolConfig) {
       return originalMethod.call(instance, params, authData);
     };
 
-    // Immediately register with global ToolsService
+    // Determine if this tool should be registered as global based on definition or import context
+    const isGlobal = shouldRegisterAsGlobal(target.constructor);
+
+    // Register tool with global flag based on where it's defined or imported
     toolsService.registerTool(
       config.name,
       config.description,
@@ -78,7 +118,7 @@ export function tool(config: ToolConfig) {
       parameters,
       config.endpoint,
       authRequirements,
-      config.isGlobal || false
+      isGlobal
     );
   };
 }

package/src/function/GlobalToolFunction.ts

@@ -1,5 +1,5 @@
 import { GlobalFunction, Response, amendLogContext } from '@zaiusinc/app-sdk';
-import { authenticateGlobalRequest } from '../auth/AuthUtils';
+import { authenticateGlobalRequest, extractAuthData } from '../auth/AuthUtils';
 import { toolsService } from '../service/Service';
 
 /**
@@ -24,7 +24,14 @@ export abstract class GlobalToolFunction extends GlobalFunction {
    * @returns Response as the HTTP response
    */
   public async perform(): Promise<Response> {
-    amendLogContext({ opalThreadId: this.request.headers.get('x-opal-thread-id') || '' });
+    // Extract customer_id from auth data for global context attribution
+    const authInfo = extractAuthData(this.request);
+    const customerId = authInfo?.authData?.credentials?.customer_id;
+
+    amendLogContext({
+      opalThreadId: this.request.headers.get('x-opal-thread-id') || '',
+      customerId: customerId || ''
+    });
 
     if (!(await this.authorizeRequest())) {
       return new Response(403, { error: 'Forbidden' });

package/src/index.ts

@@ -3,4 +3,5 @@ export * from './function/GlobalToolFunction';
 export * from './types/Models';
 export * from './decorator/Decorator';
 export * from './auth/TokenVerifier';
+export * from './utils/ImportUtils';
 export { Tool, Interaction, InteractionResult } from './service/Service';