@gholl-studio/pier-connector 0.2.49 → 0.2.51

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@gholl-studio/pier-connector",
     "author": "gholl",
-    "version": "0.2.49",
+    "version": "0.2.51",
     "description": "OpenClaw plugin that connects to the Pier job marketplace. Automatically fetches, executes, and reports distributed tasks for rewards.",
     "type": "module",
     "main": "src/index.js",

package/src/index.js

@@ -38,11 +38,15 @@ export default function register(api) {
     // ── resolve plugin config ──────────────────────────────────────────
 
     function resolveConfigs() {
-        const rawAccounts = api.config?.channels?.['pier']?.accounts || {};
-        const legacyCfg = api.config?.plugins?.entries?.['pier-connector']?.config || {};
+        const globalAccounts = api.runtime?.config?.channels?.['pier']?.accounts || {};
+        const pluginAccounts = api.config?.channels?.['pier']?.accounts || {};
+        const rawAccounts = { ...globalAccounts, ...pluginAccounts };
         
-        // If no accounts defined, fallback to 'default' using legacy/env config
+        const legacyCfg = api.config?.plugins?.entries?.['pier-connector']?.config || api.config || {};
+        
+        // If no accounts defined at all, fallback to 'default' using legacy/env config
         if (Object.keys(rawAccounts).length === 0) {
+            logger.info(`[pier-connector] No accounts found in global or plugin config. Falling back to default.`);
             return [{
                 accountId: 'default',
                 ...mergedCfgFrom(legacyCfg, {})
@@ -161,68 +165,77 @@ export default function register(api) {
                 return;
             }
 
-            logger.info(`[pier-connector:trace] receiveIncoming triggered. inbound.accountId='${inbound.accountId}', inbound.senderId='${inbound.senderId}'`);
+            logger.info(`[pier-connector:trace] receiveIncoming triggered for jobId=${jobId}. accountId='${inbound.accountId}', senderId='${inbound.senderId}'`);
 
+            // 1. Resolve Global Configuration
+            // In OpenClaw V2, we need the FULL config for routing to work, but api.runtime.config is often scoped to the plugin.
+            // We search for the root config and fall back to whatever is available.
+            const rootConfig = api.rootConfig || api.runtime?.globalConfig || api.runtime?.config || {};
+            
+            // Diagnostic logging (only if we suspect it's still failing)
+            const bindingsCount = Array.isArray(rootConfig.bindings) ? rootConfig.bindings.length : 0;
+            const agentsCount = rootConfig.agents?.list ? (Array.isArray(rootConfig.agents.list) ? rootConfig.agents.list.length : Object.keys(rootConfig.agents.list).length) : 0;
+            
+            logger.info(`[pier-connector:trace] Diagnostic: rootConfig source=${api.rootConfig ? 'api.rootConfig' : (api.runtime?.globalConfig ? 'globalConfig' : 'runtime.config')}, bindings=${bindingsCount}, agents=${agentsCount}`);
+
+            // 2. Resolve Agent Route via SDK
             const route = api.runtime.channel.routing.resolveAgentRoute({
-                cfg: api.runtime.config,
+                cfg: rootConfig,
                 channel: 'pier',
-                account: inbound.accountId, // Fixed: parameter name should be 'account'
+                account: inbound.accountId,
                 peer: { kind: 'direct', id: jobId }
             });
 
             logger.info(`[pier-connector:trace] resolveAgentRoute returned: route.agentId='${route?.agentId}', route.accountId='${route?.accountId}'`);
 
-            // 1. Explicit account-level agentId from plugin config (if still used)
-            let finalAgentId = this.config.agentId;
-            let routingSource = 'account-config';
+            // 3. Robust Routing Decision Tree
+            let finalAgentId = null;
+            let routingSource = 'unresolved';
 
-            // 2. Robust manual parse (safeguard against OpenClaw core parsing bugs)
-            if (!finalAgentId && api.runtime?.config) {
-                const cfg = api.runtime.config;
-                const bs = Array.isArray(cfg.bindings) ? cfg.bindings : [];
-                const al = Array.isArray(cfg.agents?.list) ? cfg.agents.list : [];
-                
-                logger.info(`[pier-connector:trace] Manual debug: bindings_count=${bs.length}, agents_count=${al.length}`);
+            // A. Check explicit account-level binding in plugin local config (this.config)
+            if (this.config.agentId && this.config.agentId !== 'main' && this.config.agentId !== 'default') {
+                finalAgentId = this.config.agentId;
+                routingSource = 'plugin-local-config';
+            }
 
-                // Check bindings
-                const manualBinding = bs.find(b => 
+            // B. Check Global Bindings (Manual Scan of rootConfig.bindings)
+            if (!finalAgentId) {
+                const bindings = Array.isArray(rootConfig.bindings) ? rootConfig.bindings : [];
+                const binding = bindings.find(b => 
                     b.match?.channel === 'pier' && 
                     (b.match?.accountId === inbound.accountId || b.match?.account === inbound.accountId)
                 );
-                
-                if (manualBinding && manualBinding.agentId && manualBinding.agentId !== 'main') {
-                    finalAgentId = manualBinding.agentId;
-                    routingSource = 'manual-global-bindings';
-                }
-
-                // Check agent list for name match (account ID == agent ID)
-                if (!finalAgentId) {
-                    const nameMatch = al.find(a => a.id === inbound.accountId);
-                    if (nameMatch) {
-                        finalAgentId = inbound.accountId;
-                        routingSource = 'manual-name-match';
-                    }
+                if (binding?.agentId && binding.agentId !== 'main') {
+                    finalAgentId = binding.agentId;
+                    routingSource = 'manual-global-bindings-match';
                 }
             }
 
-            // 3. Fallback to OpenClaw's resolveAgentRoute (only if still unresolved and not 'main')
+            // C. SDK Routing Result (if it actually found something non-default)
             if (!finalAgentId && route.agentId && route.agentId !== 'main' && route.agentId !== 'default') {
                 finalAgentId = route.agentId;
                 routingSource = 'sdk-global-bindings';
             }
 
-            // 4. Ultimate/Aggressive default
-            if (!finalAgentId) {
-                if (inbound.accountId && inbound.accountId !== 'default' && inbound.accountId !== 'main') {
-                    // Critical fallback: if the account has a custom name, assume the user wants that specific agent
+            // D. Name-Matching Fallback (CRITICAL: account name == agent ID)
+            // If we see account 'sunwukong', and we have an agent 'sunwukong', route there!
+            if (!finalAgentId && inbound.accountId && inbound.accountId !== 'default' && inbound.accountId !== 'main') {
+                // Check if such an agent exists in rootConfig
+                const agents = rootConfig.agents?.list || {};
+                const agentExists = Array.isArray(agents) ? agents.some(a => a.id === inbound.accountId) : !!agents[inbound.accountId];
+                
+                if (agentExists) {
                     finalAgentId = inbound.accountId;
-                    routingSource = 'aggressive-account-name-match';
-                } else {
-                    finalAgentId = route.agentId || 'main'; // Ultimate fallback
-                    routingSource = route.agentId ? 'global-bindings-fallback' : 'default-routing';
+                    routingSource = 'account-agent-name-match';
                 }
             }
 
+            // E. Ultimate Fallback
+            if (!finalAgentId) {
+                finalAgentId = route.agentId || 'main'; // Use SDK result or hard default 'main'
+                routingSource = route.agentId ? 'sdk-default-fallback' : 'hardcoded-main-fallback';
+            }
+
             logger.info(`[pier-connector] Routing account '${inbound.accountId}' -> agent '${finalAgentId}' (Source: ${routingSource})`);
 
             const dynamicSessionKey = `pier-job-${jobId}`;
@@ -236,7 +249,7 @@ export default function register(api) {
                     "=========================================",
                     "You are an autonomous AI worker on Pier. This job currently has NO assigned worker.",
                     "1. DO NOT directly solve the user's task or output the final answer right now.",
-                    "2. You MUST USE the `pier_bid_task` tool to send a pitch/bid to the employer explaining why you are best equipped to solve this, and state your price.",
+                    "2. You MUST USE the \`pier_bid_task\` tool to send a pitch/bid to the employer explaining why you are best equipped to solve this.",
                     "3. Stop executing after submitting the bid.",
                     "4. You MUST use the Job ID provided below when calling the tool.",
                     `Job ID: ${jobId}`,
@@ -255,8 +268,9 @@ export default function register(api) {
                 ].join('\n');
             }
 
+            // MsgContext uses PascalCase for keys in OpenClaw V2 SDK
             const ctxPayload = api.runtime.channel.reply.finalizeInboundContext({
-                agentId: finalAgentId, // Lowercase agentId is the standard target identifier
+                agentId: finalAgentId, // Keep lowercase here as it's the target system ID
                 Body: inbound.text,
                 BodyForAgent: inbound.text,
                 RawBody: inbound.text,
@@ -277,7 +291,8 @@ export default function register(api) {
                 Metadata: { 
                     ...metadata,
                     accountId: this.accountId,
-                    pierJobId: jobId
+                    pierJobId: jobId,
+                    routingSource: routingSource
                 }
             });