diff --git a/plugin/core/openclaw-agents.ts b/plugin/core/openclaw-agents.ts
index b48a3c6..945f6e1 100644
--- a/plugin/core/openclaw-agents.ts
+++ b/plugin/core/openclaw-agents.ts
@@ -17,7 +17,7 @@ export interface OpenClawAgentInfo {
 export async function listOpenClawAgents(logger?: { debug?: (...args: any[]) => void; warn?: (...args: any[]) => void }): Promise<OpenClawAgentInfo[]> {
   try {
     const { stdout } = await execFileAsync('openclaw', ['agents', 'list'], {
-      timeout: 15000,
+      timeout: 30000,
       maxBuffer: 1024 * 1024,
     });
     return parseOpenClawAgents(stdout);
diff --git a/plugin/index.ts b/plugin/index.ts
index 24f0f1d..93b5f7b 100644
--- a/plugin/index.ts
+++ b/plugin/index.ts
@@ -96,7 +96,7 @@ export default {
           avg15: load[2],
         },
         openclaw: {
-          version: api.version || 'unknown',
+          version: process.env.OPENCLAW_SERVICE_VERSION || api.version || 'unknown',
           pluginVersion: '0.3.1', // Bumped for PLG-CAL-004
         },
         timestamp: new Date().toISOString(),
@@ -119,7 +119,7 @@ export default {
       if (!bridgeClient) return;
 
       const meta: OpenClawMeta = {
-        version: api.version || 'unknown',
+        version: process.env.OPENCLAW_SERVICE_VERSION || api.version || 'unknown',
         plugin_version: '0.3.1',
         agents: await listOpenClawAgents(logger),
       };