@gholl-studio/pier-connector 0.2.16 → 0.2.18

package/package.json

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

@@ -188,13 +188,25 @@ export default function register(api) {
             }
         });
 
+        const dynamicSessionKey = `pier-job-${jobId}`;
+        const injectedPrompt = [
+            "=========================================",
+            "CRITICAL DIRECTIVE - PIER TRADING NETWORK",
+            "=========================================",
+            "You are an autonomous AI worker on Pier.",
+            "1. You MUST USE the `pier_finish_task` tool to submit the final result when your work is complete.",
+            "2. If you need to negotiate or clarify requirements with the employer, use `pier_chat`.",
+            "3. Do not just wait in silence. Always officially finish the task if the employer's goal is met.",
+            inbound.systemPrompt ? `\nEmployer Guidelines:\n${inbound.systemPrompt}` : ""
+        ].join('\n');
+
         const ctxPayload = api.runtime.channel.reply.finalizeInboundContext({
             Body: inbound.text,
             BodyForAgent: inbound.text,
             RawBody: inbound.text,
             From: inbound.senderId,
             To: `pier:${jobId}`,
-            SessionKey: route.sessionKey,
+            SessionKey: dynamicSessionKey,
             AccountId: route.accountId,
             ChatType: 'direct',
             SenderId: inbound.senderId,
@@ -204,7 +216,7 @@ export default function register(api) {
             OriginatingTo: `pier:${jobId}`,
             WasMentioned: true,
             CommandAuthorized: true,
-            SystemPrompt: inbound.systemPrompt || undefined,
+            SystemPrompt: injectedPrompt,
             MessageId: inbound.messageId || jobId
         });
 
@@ -215,7 +227,7 @@ export default function register(api) {
             cfg: api.config,
             agentId: route.agentId,
             onIdle: () => {
-                logger.debug(`[pier-connector] Dispatcher idle for session ${route.sessionKey}`);
+                logger.debug(`[pier-connector] Dispatcher idle for session ${dynamicSessionKey}`);
             },
             deliver: async (payload) => {
                 const metadata = activeNodeJobs.get(jobId);
@@ -239,10 +251,10 @@ export default function register(api) {
         // Record session meta
         if (api.runtime.channel.session?.recordSessionMetaFromInbound) {
             try {
-                const storePath = api.runtime.channel.session.resolveStorePath(api.config, route.sessionKey);
+                const storePath = api.runtime.channel.session.resolveStorePath(api.config, dynamicSessionKey);
                 await api.runtime.channel.session.recordSessionMetaFromInbound({
                     storePath,
-                    sessionKey: route.sessionKey,
+                    sessionKey: dynamicSessionKey,
                     ctx: ctxPayload
                 });
             } catch (err) {
@@ -251,14 +263,14 @@ export default function register(api) {
         }
 
         try {
-            logger.info(`[pier-connector] 🧠 Triggering agent for session ${route.sessionKey}...`);
+            logger.info(`[pier-connector] 🧠 Triggering agent for session ${dynamicSessionKey}...`);
             // Dispatch reply — this will trigger outbound: sendText in pierChannel
             await api.runtime.channel.reply.dispatchReplyFromConfig({
                 ctx: ctxPayload,
                 cfg: api.config,
                 dispatcher
             });
-            logger.info(`[pier-connector] 🧠 Agent dispatch completed for ${route.sessionKey}`);
+            logger.info(`[pier-connector] 🧠 Agent dispatch completed for ${dynamicSessionKey}`);
         } finally {
             markDispatchIdle();
         }
@@ -339,42 +351,26 @@ export default function register(api) {
                 const msg = metadata?.pierNatsMsg;
                 const isRealtimeMsg = metadata?.isRealtimeMsg;
 
-                if (msg || isRealtimeMsg) {
-                    const elapsed = metadata?.pierStartTime
-                        ? (performance.now() - metadata.pierStartTime).toFixed(1)
-                        : null;
-
-                    const responsePayload = createResultPayload({
-                        id: jobId,
-                        reply: text,
-                        latencyMs: elapsed ? Number(elapsed) : undefined,
-                        workerId: getActiveConfig().nodeId,
-                        walletAddress: getActiveConfig().walletAddress,
-                    });
-
-                    if (isRealtimeMsg && js) {
-                        try {
-                            const config = getActiveConfig();
-                            const replySubject = `jobs.job.${jobId}.msg`;
-                            const replyPayload = {
-                                id: ethers.hexlify(ethers.randomBytes(16)), 
-                                job_id: jobId,
-                                sender_id: config.nodeId,
-                                sender_type: 'node',
-                                content: text,
-                                timestamp: new Date().toISOString(),
-                                auth_token: config.secretKey // Secure token for backend validation
-                            };
-                            
-                            await js.publish(replySubject, new TextEncoder().encode(JSON.stringify(replyPayload)));
-                            logger.info(`[pier-connector] 💬 Agent reply published directly to NATS for job ${jobId}`);
-                        } catch (err) {
-                            logger.error(`[pier-connector] Failed to publish realtime reply to NATS: ${err.message}`);
-                        }
-                    } else if (js) {
-                        // BUG-44: Marketplace results are now buffered in receiveIncoming and submitted ONCE at the end.
-                        // sendText only logs the progress here.
-                        logger.debug(`[pier-connector] ⏳ Marketplace response buffered: "${truncate(text, 40)}"`);
+                if (jobId && js) { // Ensure we have a jobId and NATS JetStream is available
+                    try {
+                        const config = getActiveConfig();
+                        const replySubject = `jobs.job.${jobId}.msg`;
+                        
+                        // Treat ALL agent text outputs as Chat Messages so the Employer sees them in real-time
+                        const chatPayload = {
+                            id: crypto.randomUUID ? crypto.randomUUID() : (Math.random().toString(36).substring(2)),
+                            job_id: jobId,
+                            sender_id: config.nodeId || 'anonymous',
+                            sender_type: 'node',
+                            content: text,
+                            timestamp: new Date().toISOString(),
+                            auth_token: config.secretKey // Secure token for backend validation
+                        };
+                        
+                        await js.publish(replySubject, new TextEncoder().encode(JSON.stringify(chatPayload)));
+                        logger.info(`[pier-connector] 💬 Agent reply published directly to NATS chat for job ${jobId}`);
+                    } catch (err) {
+                        logger.error(`[pier-connector] Failed to publish realtime reply to NATS: ${err.message}`);
                     }
 
                     // Delayed stop for job-specific message listener
@@ -546,9 +542,11 @@ export default function register(api) {
                     logger.warn(`[pier-connector] ⚠️ Failed to restore active jobs: ${err.message}`);
                 }
 
-                // Public pool with load balancing via JetStream Durable Consumer
+                // Public pool with broadcast via JetStream Durable Consumer
                 if (publicSubject) {
-                    const durableName = `pier_marketplace_${config.queueGroup || 'default'}`;
+                    // For Bidding, every node needs to see the marketplace requests to evaluate them,
+                    // so we do not use the shared queueGroup. We use a unique durable per node.
+                    const durableName = `pier_market_${config.nodeId.replace(/-/g, '_')}`;
                     const streamName = 'PIER_JOBS';
                     logger.info(`[pier-connector] 👂 Listening to Marketplace (JetStream): ${publicSubject} (Durable: ${durableName})`);
                     
@@ -567,7 +565,7 @@ export default function register(api) {
                                         filter_subject: publicSubject,
                                         deliver_policy: DeliverPolicy.New, // SDK-3: Only new messages
                                         ack_policy: AckPolicy.Explicit,
-                                        deliver_group: config.queueGroup
+                                        // Removed deliver_group to ensure it's a broadcast to all independent nodes
                                     });
                                 } catch (addErr) {
                                     // SDK-5: Config mismatch — delete old and recreate
@@ -578,7 +576,6 @@ export default function register(api) {
                                         filter_subject: publicSubject,
                                         deliver_policy: DeliverPolicy.New,
                                         ack_policy: AckPolicy.Explicit,
-                                        deliver_group: config.queueGroup
                                     });
                                 }
                                 consumer = await js.consumers.get(streamName, durableName);
@@ -809,6 +806,7 @@ export default function register(api) {
 
                     // Anti-Interference: If busy, ignore new marketplace jobs (BUG-34)
                     if (isBusy) {
+                        logger.debug(`[pier-connector] 🚫 Busy. Ignoring new job payload: ${rawData.substring(0, 50)}...`);
                         // NAK so others in the queue group can take it
                         msg.nak();
                         return;
@@ -821,10 +819,12 @@ export default function register(api) {
                         return;
                     }
 
-                    // For Marketplace jobs (those without assigned_node_id, or even those with it), 
-                    // we must ATOMICALLY CLAIM it from the backend before setting isBusy.
+                    // For Marketplace jobs: if assigned_node_id IS NOT present, it's open! 
+                    // Do NOT claim it, let the agent evaluate and use pier_bid_task instead.
                     const jobIdToClaim = payload.id;
-                    if (jobIdToClaim) {
+                    const isTargeted = !!(payload.assigned_node_id || payload.targetNodeId || payload.TargetNodeID);
+                    
+                    if (jobIdToClaim && isTargeted) {
                         const claimResult = await claimJob(jobIdToClaim);
                         if (!claimResult.ok) {
                             if (claimResult.alreadyClaimed) {
@@ -838,7 +838,8 @@ export default function register(api) {
                         }
                     }
 
-                    // Claimed successfully! Set busy state
+                    // For an open bidding job, we don't lock the DB but we do set the node `isBusy` temporarily 
+                    // while it thinks whether to bid or not.
                     isBusy = true;
                     msg.ack();
 
@@ -1142,6 +1143,7 @@ export default function register(api) {
     };
 
     // For Node (Worker)
+    registerSystemActionTool('pier_bid_task', 'Bid on an open marketplace task to offer your services to the employer', 'task_bid', { message: { type: 'string', description: 'Your pitch explaining why you are a good fit for this task' } });
     registerSystemActionTool('pier_accept_task', 'Accept an offered task from the employer in the current chat', 'task_accept', {});
     registerSystemActionTool('pier_finish_task', 'Submit the final result for a task', 'task_submit', { result: { type: 'string', description: 'The final result or file links' } });