@gholl-studio/pier-connector 0.2.26 → 0.2.29

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@gholl-studio/pier-connector",
     "author": "gholl",
-    "version": "0.2.26",
+    "version": "0.2.29",
     "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

@@ -259,40 +259,33 @@ export default function register(api) {
             if (!this.js) return;
             
             const chatSubject = `chat.${jobId}`;
-            const actionSubject = `jobs.action.${jobId}`;
             const streamName = 'PIER_JOBS';
             const nodeSlug = this.config.nodeId.replace(/[^a-zA-Z0-9]/g, '_');
             const jobSlug = jobId.replace(/[^a-zA-Z0-9]/g, '_');
-            
-            const chatDurable = `pier_chat_${nodeSlug}_${jobSlug}`;
-            const actionDurable = `pier_action_${nodeSlug}_${jobSlug}`;
+            const durableName = `pier_chat_${nodeSlug}_${jobSlug}`;
 
-            const setupConsumer = async (subject, durable) => {
+            try {
                 let consumer;
                 try {
-                    consumer = await this.js.consumers.get(streamName, durable);
+                    consumer = await this.js.consumers.get(streamName, durableName);
                 } catch {
                     await this.jsm.consumers.add(streamName, {
-                        durable_name: durable,
-                        filter_subject: subject,
+                        durable_name: durableName,
+                        filter_subject: chatSubject,
                         deliver_policy: DeliverPolicy.New,
                         ack_policy: AckPolicy.Explicit,
                         ack_wait: 1000 * 60 * 60,
                     });
-                    consumer = await this.js.consumers.get(streamName, durable);
+                    consumer = await this.js.consumers.get(streamName, durableName);
                 }
-                return consumer;
-            };
 
-            try {
-                // 1. Setup Chat Consumer (Conversational)
-                const chatConsumer = await setupConsumer(chatSubject, chatDurable);
-                const chatIter = await chatConsumer.consume();
-                
+                const iter = await consumer.consume();
+                this.jobSubscriptions.set(jobId, iter);
+
                 (async () => {
-                    logger.info(`[pier-connector][${this.accountId}] 👂 Monitoring CHAT subject ${chatSubject}`);
+                    logger.info(`[pier-connector][${this.accountId}] \u{1F442} Monitoring ${chatSubject}`);
                     const processedMessages = new Set();
-                    for await (const msg of chatIter) {
+                    for await (const msg of iter) {
                         try {
                             const rawMsg = new TextDecoder().decode(msg.data);
                             let msgPayload = JSON.parse(rawMsg);
@@ -300,6 +293,8 @@ export default function register(api) {
                             if (msgPayload.id && processedMessages.has(msgPayload.id)) { msg.ack(); continue; }
                             if (msgPayload.sender_id === this.config.nodeId) { msg.ack(); continue; }
                             if (msgPayload.type === 'receipt') { msg.ack(); continue; }
+                            // Skip system_action messages — those are for the backend state machine
+                            if (msgPayload.type === 'system_action' || msgPayload.msg_type === 'system_action') { msg.ack(); continue; }
 
                             // Send receipt
                             try {
@@ -311,8 +306,16 @@ export default function register(api) {
                             const content = msgPayload.content;
                             if (!content) { msg.ack(); continue; }
 
-                            logger.info(`[pier-connector][${this.accountId}] 💬 Chat: [${jobId}] ${msgPayload.sender_id}: "${truncate(content, 40)}"`);
+                            logger.info(`[pier-connector][${this.accountId}] \u{1F4AC} Chat: [${jobId}] ${msgPayload.sender_id}: "${truncate(content, 40)}"`);
                             if (msgPayload.id) processedMessages.add(msgPayload.id);
+
+                            // Only the assigned robot should process chat messages
+                            const jobMeta = this.activeNodeJobs.get(jobId);
+                            if (!jobMeta || !jobMeta.isTargeted) {
+                                msg.ack();
+                                continue;
+                            }
+
                             msg.ack();
 
                             await this.receiveIncoming({
@@ -323,27 +326,8 @@ export default function register(api) {
                         } catch (err) { logger.error(`[pier-connector] Chat err: ${err.message}`); }
                     }
                 })();
-
-                // 2. Setup Action Consumer (System Signal)
-                const actionConsumer = await setupConsumer(actionSubject, actionDurable);
-                const actionIter = await actionConsumer.consume();
-
-                (async () => {
-                    logger.info(`[pier-connector][${this.accountId}] ⚙️ Monitoring ACTION subject ${actionSubject}`);
-                    for await (const msg of actionIter) {
-                        try {
-                            const rawMsg = new TextDecoder().decode(msg.data);
-                            let payload = JSON.parse(rawMsg);
-                            logger.info(`[pier-connector][${this.accountId}] 📥 Action: [${jobId}] ${payload.action || 'signal'}`);
-                            msg.ack();
-                            // Implementation of system action handling logic on the node side if needed.
-                        } catch (err) { logger.error(`[pier-connector] Action err: ${err.message}`); }
-                    }
-                })();
-
-                this.jobSubscriptions.set(jobId, { chat: chatIter, action: actionIter });
             } catch (err) {
-                logger.error(`[pier-connector][${this.accountId}] Failed to setup consumers: ${err.message}`);
+                logger.error(`[pier-connector][${this.accountId}] Failed to setup chat consumer: ${err.message}`);
             }
         }
 
@@ -362,7 +346,7 @@ export default function register(api) {
                 if (jobId) {
                     logger.info(`[pier-connector][${this.accountId}] ⏰ Received wakeup signal for job ${jobId}`);
                     if (!this.jobSubscriptions.has(jobId)) {
-                        this.activeNodeJobs.set(jobId, { pierJobId: jobId });
+                        this.activeNodeJobs.set(jobId, { pierJobId: jobId, isTargeted: true });
                         await this.subscribeToJobMessages(jobId);
                     }
                     msg.ack();
@@ -615,23 +599,18 @@ export default function register(api) {
                     try {
                         const replySubject = `chat.${jobId}`;
                         
-                        // Pre-hiring Radio Silence
-                        if (metadata?.isTargeted) {
-                            const chatPayload = {
-                                id: crypto.randomUUID ? crypto.randomUUID() : (Math.random().toString(36).substring(2)),
-                                job_id: jobId,
-                                sender_id: robot.config.nodeId || 'anonymous',
-                                sender_type: 'node',
-                                content: text,
-                                created_at: new Date().toISOString(),
-                                auth_token: robot.config.secretKey
-                            };
-                            
-                            await robot.js.publish(replySubject, new TextEncoder().encode(JSON.stringify(chatPayload)));
-                            logger.info(`[pier-connector][${accountId}] 💬 Agent reply published to NATS for job ${jobId} (Subject: ${replySubject})`);
-                        } else {
-                            logger.debug(`[pier-connector][${accountId}] 🤫 Pre-hiring radio silence for job ${jobId}`);
-                        }
+                        const chatPayload = {
+                            id: crypto.randomUUID ? crypto.randomUUID() : (Math.random().toString(36).substring(2)),
+                            job_id: jobId,
+                            sender_id: robot.config.nodeId || 'anonymous',
+                            sender_type: 'node',
+                            content: text,
+                            created_at: new Date().toISOString(),
+                            auth_token: robot.config.secretKey
+                        };
+                        
+                        await robot.js.publish(replySubject, new TextEncoder().encode(JSON.stringify(chatPayload)));
+                        logger.info(`[pier-connector][${accountId}] 💬 Agent reply published to NATS for job ${jobId} (Subject: ${replySubject})`);
                     } catch (err) {
                         logger.error(`[pier-connector][${accountId}] Failed to publish reply: ${err.message}`);
                     }
@@ -641,11 +620,10 @@ export default function register(api) {
                         if (robot.jobStopTimeouts.has(jobId)) clearTimeout(robot.jobStopTimeouts.get(jobId));
                         
                         const timeout = setTimeout(() => {
-                            const subs = robot.jobSubscriptions.get(jobId);
-                            if (subs) {
-                                logger.info(`[pier-connector][${accountId}] 🛑 Stopping listeners for job ${jobId} (inactivity)`);
-                                if (subs.chat) subs.chat.stop();
-                                if (subs.action) subs.action.stop();
+                            const sub = robot.jobSubscriptions.get(jobId);
+                            if (sub) {
+                                logger.info(`[pier-connector][${accountId}] \u{1F6D1} Stopping listener for job ${jobId} (inactivity)`);
+                                sub.stop();
                                 robot.jobSubscriptions.delete(jobId);
                                 robot.jobStopTimeouts.delete(jobId);
                             }
@@ -819,7 +797,7 @@ export default function register(api) {
                 }
 
                 try {
-                    const subject = `jobs.action.${params.jobId}`;
+                    const subject = `chat.${params.jobId}`;
                     const { jobId, accountId: _, ...payload } = params;
 
                     const msgData = {