@gholl-studio/pier-connector 0.2.13 → 0.2.17

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@gholl-studio/pier-connector",
     "author": "gholl",
-    "version": "0.2.13",
+    "version": "0.2.17",
     "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,24 +216,34 @@ export default function register(api) {
             OriginatingTo: `pier:${jobId}`,
             WasMentioned: true,
             CommandAuthorized: true,
-            SystemPrompt: inbound.systemPrompt || undefined,
+            SystemPrompt: injectedPrompt,
             MessageId: inbound.messageId || jobId
         });
 
+        let collectedResult = '';
+
         // Create a dispatcher to handle the reply lifecycle (fixes sendFinalReply error)
         const { dispatcher, markDispatchIdle } = api.runtime.channel.reply.createReplyDispatcherWithTyping({
             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) => {
-                // Route Agent's reply to outbound.sendText so it reaches NATS
-                logger.debug(`[pier-connector] deliver() called with text: "${truncate(payload.text, 60)}"`);
+                const metadata = activeNodeJobs.get(jobId);
+                const isRealtime = metadata?.isRealtimeMsg;
+
+                if (!isRealtime) {
+                    collectedResult += payload.text;
+                }
+
+                // Route Agent's reply to outbound.sendText
+                // For marketplace jobs, sendText will now just log (content is buffered in collectedResult)
+                // For realtime chat, it will publish to the chat subject immediately.
                 await pierChannel.outbound.sendText({
                     text: payload.text,
                     to: `pier:${jobId}`,
-                    metadata: activeNodeJobs.get(jobId),
+                    metadata,
                 });
             }
         });
@@ -229,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) {
@@ -241,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();
         }
@@ -362,17 +384,9 @@ export default function register(api) {
                             logger.error(`[pier-connector] Failed to publish realtime reply to NATS: ${err.message}`);
                         }
                     } else if (js) {
-                        // Publish result to jobs.submit via JetStream (not msg.respond)
-                        try {
-                            await js.publish('jobs.submit', new TextEncoder().encode(JSON.stringify(responsePayload)));
-                            jobsCompleted++;
-                            logger.info(
-                                `[pier-connector] ✔ Job ${jobId} result published to jobs.submit` +
-                                (elapsed ? ` — latency: ${elapsed}ms` : ''),
-                            );
-                        } catch (err) {
-                            logger.error(`[pier-connector] ❌ Failed to publish result for job ${jobId}: ${err.message}`);
-                        }
+                        // 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)}"`);
                     }
 
                     // Delayed stop for job-specific message listener
@@ -544,9 +558,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})`);
                     
@@ -565,7 +581,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
@@ -576,7 +592,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);
@@ -807,6 +822,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;
@@ -1088,6 +1104,73 @@ export default function register(api) {
         { optional: true }
     );
 
+    // ── V2 System Action Tools ────────────────────────────────────────
+
+    const registerSystemActionTool = (name, description, action, extraParams, userRole = 'node') => {
+        api.registerTool({
+            name,
+            description,
+            parameters: {
+                type: 'object',
+                properties: {
+                    jobId: { type: 'string', description: 'The ID of the job/chat session' },
+                    ...extraParams
+                },
+                required: ['jobId', ...Object.keys(extraParams)]
+            },
+            async execute(_id, params) {
+                if (!nc || connectionStatus !== 'connected') {
+                    return { content: [{ type: 'text', text: 'Error: NATS not connected' }] };
+                }
+                try {
+                    const config = getActiveConfig();
+                    const subject = `jobs.job.${params.jobId}.msg`;
+                    
+                    const { jobId, ...payload } = params;
+
+                    // If acting as User (Employer), we need the user API key ideally, but for demo we just pass node ID or secret.
+                    // The Backend handles sender_type="node" vs "user".
+                    const msgData = {
+                        id: ethers.hexlify(ethers.randomBytes(16)),
+                        job_id: params.jobId,
+                        sender_id: userRole === 'user' ? 'user_' + config.nodeId : config.nodeId, 
+                        sender_type: userRole,
+                        content: JSON.stringify({
+                            type: 'system_action',
+                            action,
+                            payload
+                        }),
+                        timestamp: new Date().toISOString(),
+                        auth_token: config.secretKey, // auth handle in DB needs updating for user role simulation
+                        type: 'system_action',
+                        action: action
+                    };
+
+                    await js.publish(subject, new TextEncoder().encode(JSON.stringify(msgData)));
+                    return { content: [{ type: 'text', text: `${action} executed successfully` }] };
+                } catch (err) {
+                    return { content: [{ type: 'text', text: `Error: ${err.message}` }] };
+                }
+            }
+        }, { optional: true });
+    };
+
+    // 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' } });
+
+    // For User (Employer Robot) - Spoofed identity using Node's config for A2A testing
+    registerSystemActionTool('pier_propose_task', 'Offer a task to a node with a specific price', 'task_offer', {
+        price: { type: 'number', description: 'The price in PIER tokens to offer' },
+        description: { type: 'string', description: 'The formal task description' }
+    }, 'user');
+    
+    registerSystemActionTool('pier_rate_task', 'Rate the node after completion', 'task_rate', {
+        score: { type: 'number', description: 'Rating from 1 to 5' },
+        comment: { type: 'string', description: 'A short review' }
+    }, 'user');
+
     // ── 4. Register /pier status command ───────────────────────────────
 
     api.registerCommand({