openclaw-cascade-plugin 1.0.2 → 1.0.4

package/src/tools/api-tools.ts

@@ -9,7 +9,7 @@ import { CascadeMcpClient } from '../cascade-client';
 import { ToolResponse } from '../types';
 import { errorResponse, formatSuccess } from './response-helpers';
 
-export function registerApiTools(registry: ToolRegistry, client: CascadeMcpClient): void {
+export function registerApiTools(registry: ToolRegistry, getClient: () => Promise<CascadeMcpClient>): void {
   // 1. cascade_web_search
   registry.register({
     name: 'cascade_web_search',
@@ -35,7 +35,7 @@ export function registerApiTools(registry: ToolRegistry, client: CascadeMcpClien
           return errorResponse('query is required');
         }
 
-        const result = await client.callTool('web_search', {
+        const result = await await (await getClient()).callTool('web_search', {
           query: args.query,
           top_k: args.top_k || 5
         });
@@ -91,7 +91,7 @@ export function registerApiTools(registry: ToolRegistry, client: CascadeMcpClien
           return errorResponse('url is required');
         }
 
-        const result = await client.callTool('call_http_api', {
+        const result = await await (await getClient()).callTool('call_http_api', {
           method: args.method,
           url: args.url,
           headers: args.headers,

package/src/tools/desktop-automation.test.ts

@@ -13,7 +13,7 @@ describe('Desktop Automation Tools', () => {
   beforeEach(() => {
     registry = new ToolRegistry();
     mockClient = new MockCascadeMcpClient();
-    registerDesktopTools(registry, mockClient as any);
+    registerDesktopTools(registry, async () => mockClient as any);
   });
 
   describe('cascade_click_element', () => {
@@ -174,7 +174,7 @@ describe('Desktop Automation Tools', () => {
       // Arrange
       const largeImage = 'A'.repeat(5000000); // 5MB base64 = ~3.75MB actual
       const diskRegistry = new ToolRegistry();
-      registerDesktopTools(diskRegistry, mockClient as any, { screenshotMode: 'disk' } as any);
+      registerDesktopTools(diskRegistry, async () => mockClient as any, { screenshotMode: 'disk' } as any);
 
       mockClient.registerMockTool('get_screenshot', () => ({
         image: largeImage,

package/src/tools/desktop-automation.ts

@@ -17,7 +17,7 @@ const MAX_EMBED_SIZE = 4 * 1024 * 1024;
 
 export function registerDesktopTools(
   registry: ToolRegistry,
-  client: CascadeMcpClient,
+  getClient: () => Promise<CascadeMcpClient>,
   config?: CascadePluginConfig
 ): void {
   const screenshotMode = config?.screenshotMode || 'auto';
@@ -58,7 +58,7 @@ export function registerDesktopTools(
           return errorResponse('platform_source is required');
         }
 
-        const result = await client.callTool('click_element', args);
+        const result = await await (await getClient()).callTool('click_element', args);
         return formatSuccess(result);
       } catch (error) {
         return errorResponse(
@@ -112,7 +112,7 @@ export function registerDesktopTools(
           return errorResponse('text is required');
         }
 
-        const result = await client.callTool('type_text', args);
+        const result = await await (await getClient()).callTool('type_text', args);
         return formatSuccess(result);
       } catch (error) {
         return errorResponse(
@@ -132,7 +132,7 @@ export function registerDesktopTools(
     },
     handler: async (): Promise<ToolResponse> => {
       try {
-        const result = await client.callTool('get_semantic_tree', {});
+        const result = await await (await getClient()).callTool('get_semantic_tree', {});
         return formatSuccess(result);
       } catch (error) {
         return errorResponse(
@@ -152,7 +152,7 @@ export function registerDesktopTools(
     },
     handler: async (): Promise<ToolResponse> => {
       try {
-        const result = await client.callTool('get_screenshot', {});
+        const result = await await (await getClient()).callTool('get_screenshot', {});
         
         if (!result.image) {
           return errorResponse('No image data received');
@@ -209,7 +209,7 @@ export function registerDesktopTools(
           return errorResponse('app_name is required');
         }
 
-        const result = await client.callTool('start_app', args);
+        const result = await await (await getClient()).callTool('start_app', args);
         return formatSuccess(result);
       } catch (error) {
         return errorResponse(
@@ -246,7 +246,7 @@ export function registerDesktopTools(
     },
     handler: async (args): Promise<ToolResponse> => {
       try {
-        const result = await client.callTool('hover_element', args);
+        const result = await await (await getClient()).callTool('hover_element', args);
         return formatSuccess(result);
       } catch (error) {
         return errorResponse(
@@ -282,7 +282,7 @@ export function registerDesktopTools(
     },
     handler: async (args): Promise<ToolResponse> => {
       try {
-        const result = await client.callTool('focus_element', args);
+        const result = await await (await getClient()).callTool('focus_element', args);
         return formatSuccess(result);
       } catch (error) {
         return errorResponse(
@@ -318,7 +318,7 @@ export function registerDesktopTools(
     },
     handler: async (args): Promise<ToolResponse> => {
       try {
-        const result = await client.callTool('scroll_element', args);
+        const result = await await (await getClient()).callTool('scroll_element', args);
         return formatSuccess(result);
       } catch (error) {
         return errorResponse(
@@ -354,7 +354,7 @@ export function registerDesktopTools(
     },
     handler: async (args): Promise<ToolResponse> => {
       try {
-        const result = await client.callTool('wait_visible', args);
+        const result = await await (await getClient()).callTool('wait_visible', args);
         return formatSuccess(result);
       } catch (error) {
         return errorResponse(

package/src/tools/sandbox-tools.ts

@@ -9,7 +9,7 @@ import { CascadeMcpClient } from '../cascade-client';
 import { ToolResponse } from '../types';
 import { errorResponse, formatSuccess } from './response-helpers';
 
-export function registerSandboxTools(registry: ToolRegistry, client: CascadeMcpClient): void {
+export function registerSandboxTools(registry: ToolRegistry, getClient: () => Promise<CascadeMcpClient>): void {
   registry.register({
     name: 'cascade_execute_sandbox_skill',
     description: 'Execute a Python sandbox skill for programmatic file automation',
@@ -63,7 +63,7 @@ export function registerSandboxTools(registry: ToolRegistry, client: CascadeMcpC
           return errorResponse('task is required');
         }
 
-        const result = await client.callTool('execute_sandbox_skill', {
+        const result = await await (await getClient()).callTool('execute_sandbox_skill', {
           skill_id: args.skill_id,
           task: args.task,
           inputs: args.inputs || {},

package/src/tools/web-automation.test.ts

@@ -13,7 +13,7 @@ describe('Web Automation Tools', () => {
   beforeEach(() => {
     registry = new ToolRegistry();
     mockClient = new MockCascadeMcpClient();
-    registerWebTools(registry, mockClient as any);
+    registerWebTools(registry, async () => mockClient as any);
   });
 
   describe('Navigation Tools', () => {

package/src/tools/web-automation.ts

@@ -9,7 +9,7 @@ import { CascadeMcpClient } from '../cascade-client';
 import { ToolResponse } from '../types';
 import { errorResponse, formatSuccess } from './response-helpers';
 
-export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClient): void {
+export function registerWebTools(registry: ToolRegistry, getClient: () => Promise<CascadeMcpClient>): void {
   // Navigation Tools (5)
   
   // 1. cascade_pw_goto
@@ -38,7 +38,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
           return errorResponse('url is required');
         }
 
-        const result = await client.callTool('pw_goto', {
+        const result = await await (await getClient()).callTool('pw_goto', {
           url: args.url,
           wait_until: args.wait_until || 'networkidle'
         });
@@ -62,7 +62,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
     },
     handler: async (): Promise<ToolResponse> => {
       try {
-        const result = await client.callTool('pw_back', {});
+        const result = await await (await getClient()).callTool('pw_back', {});
         return formatSuccess(result);
       } catch (error) {
         return errorResponse(
@@ -82,7 +82,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
     },
     handler: async (): Promise<ToolResponse> => {
       try {
-        const result = await client.callTool('pw_forward', {});
+        const result = await await (await getClient()).callTool('pw_forward', {});
         return formatSuccess(result);
       } catch (error) {
         return errorResponse(
@@ -108,7 +108,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
     },
     handler: async (args): Promise<ToolResponse> => {
       try {
-        const result = await client.callTool('pw_reload', {
+        const result = await await (await getClient()).callTool('pw_reload', {
           wait_until: args.wait_until || 'networkidle'
         });
         return formatSuccess(result);
@@ -145,7 +145,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
           return errorResponse('url is required');
         }
 
-        const result = await client.callTool('pw_wait_for_url', {
+        const result = await await (await getClient()).callTool('pw_wait_for_url', {
           url: args.url,
           timeout_ms: args.timeout_ms || 10000
         });
@@ -181,7 +181,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
           return errorResponse('selector is required');
         }
 
-        const result = await client.callTool('pw_locator_count', {
+        const result = await await (await getClient()).callTool('pw_locator_count', {
           selector: args.selector
         });
         return formatSuccess({ count: result.count });
@@ -218,7 +218,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
           return errorResponse('selector is required');
         }
 
-        const result = await client.callTool('pw_locator_text', {
+        const result = await await (await getClient()).callTool('pw_locator_text', {
           selector: args.selector,
           timeout_ms: args.timeout_ms || 8000
         });
@@ -257,7 +257,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
           return errorResponse('selector is required');
         }
 
-        const result = await client.callTool('pw_click', {
+        const result = await await (await getClient()).callTool('pw_click', {
           selector: args.selector,
           timeout_ms: args.timeout_ms || 8000
         });
@@ -302,7 +302,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
           return errorResponse('text is required');
         }
 
-        const result = await client.callTool('pw_fill', {
+        const result = await await (await getClient()).callTool('pw_fill', {
           selector: args.selector,
           text: args.text,
           timeout_ms: args.timeout_ms || 8000
@@ -347,7 +347,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
           return errorResponse('key is required');
         }
 
-        const result = await client.callTool('pw_press', {
+        const result = await await (await getClient()).callTool('pw_press', {
           selector: args.selector,
           key: args.key,
           timeout_ms: args.timeout_ms || 8000
@@ -389,7 +389,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
           return errorResponse('values is required and must be an array');
         }
 
-        const result = await client.callTool('pw_select_option', {
+        const result = await await (await getClient()).callTool('pw_select_option', {
           selector: args.selector,
           values: args.values
         });
@@ -424,7 +424,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
           return errorResponse('expression is required');
         }
 
-        const result = await client.callTool('pw_eval', {
+        const result = await await (await getClient()).callTool('pw_eval', {
           expression: args.expression
         });
         return formatSuccess({ result: result.result });
@@ -463,7 +463,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
           return errorResponse('expression is required');
         }
 
-        const result = await client.callTool('pw_eval_on_selector', {
+        const result = await await (await getClient()).callTool('pw_eval_on_selector', {
           selector: args.selector,
           expression: args.expression
         });
@@ -486,7 +486,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
     },
     handler: async (): Promise<ToolResponse> => {
       try {
-        const result = await client.callTool('pw_list_frames', {});
+        const result = await await (await getClient()).callTool('pw_list_frames', {});
         return formatSuccess({ frames: result.frames });
       } catch (error) {
         return errorResponse(
@@ -506,7 +506,7 @@ export function registerWebTools(registry: ToolRegistry, client: CascadeMcpClien
     },
     handler: async (): Promise<ToolResponse> => {
       try {
-        const result = await client.callTool('pw_get_cookies', {});
+        const result = await await (await getClient()).callTool('pw_get_cookies', {});
         return formatSuccess({ cookies: result.cookies });
       } catch (error) {
         return errorResponse(

package/src/types/index.ts

@@ -6,6 +6,7 @@
 export interface CascadePluginConfig {
   cascadeGrpcEndpoint: string;
   cascadePythonPath?: string;
+  cascadePythonModulePath?: string;
   firestoreProjectId?: string;
   firestoreCredentialsPath?: string;
   headless?: boolean;