@gholl-studio/pier-connector 0.3.21 → 0.3.23

package/package.json

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

package/src/inbound.ts

@@ -7,31 +7,28 @@ import type { InboundMessage } from './types.js';
 import { truncate } from './job-handler.js';
 
 export async function handleInbound(
-    runtime: any, // Using context-aware runtime from gateway
+    ctx: any, // Gateway Context
     inbound: InboundMessage,
     jobId: string,
     robot: any,
     pierPlugin: any
 ) {
-    const logger = runtime.log || console;
+    const logger = ctx.log || console;
+    const channelRuntime = ctx.channelRuntime;
     
-    if (!runtime.reply) {
-        console.error(`[pier-connector][${robot.accountId}] SDK Error: runtime.reply is not available.`);
+    if (!channelRuntime?.reply) {
+        console.error(`[pier-connector][${robot.accountId}] SDK Error: channelRuntime.reply is not available.`);
         return;
     }
 
     // 1. Resolve Account-Scoped Configuration
-    const rootConfig = runtime.cfg || {};
-    const accountScopedCfg = {
-        ...rootConfig,
-        channels: { 
-            ...rootConfig.channels, 
-            pier: robot.config 
-        }
-    };
+    // 使用原始完整配置，不覆盖 channels.pier，确保 bindings 和 defaultAgent 完整可用。
+    // resolveAgentRoute 需要完整配置中的 bindings 才能正确匹配 channel+accountId 路由规则。
+    const rootConfig = ctx.cfg || {};
+    const accountScopedCfg = rootConfig;
 
     // 2. Resolve Agent Route
-    const route = runtime.routing.resolveAgentRoute({
+    const route = channelRuntime.routing.resolveAgentRoute({
         cfg: accountScopedCfg,
         channel: 'pier',
         accountId: robot.accountId,
@@ -43,7 +40,10 @@ export async function handleInbound(
 
     logger.info(`[pier-connector] Routing account '${robot.accountId}' -> agent '${finalAgentId}' (Source: ${routingSource})`);
     
-    const dynamicSessionKey = `pier-job-${jobId}`;
+    // route.sessionKey 由 resolveAgentRoute 生成，格式为 agent/{agentId}/...，
+    // SDK 通过解析此 key 来确定使用哪个 agent。
+    // 若使用自定义字符串（如 pier-job-${jobId}），SDK 无法解析 agentId，会回落到默认 main agent。
+    const dynamicSessionKey = route.sessionKey;
     const metadata = robot.activeNodeJobs.get(jobId);
     let injectedPrompt = "";
 
@@ -72,13 +72,13 @@ export async function handleInbound(
     }
 
     // 3. Finalize Context
-    const ctxPayload = runtime.reply.finalizeInboundContext({
+    const ctxPayload = channelRuntime.reply.finalizeInboundContext({
         Body: inbound.body,
         BodyForAgent: inbound.body,
         RawBody: inbound.body,
         From: inbound.senderId,
         To: `chat:${jobId}`,
-        SessionKey: dynamicSessionKey,
+        SessionKey: route.sessionKey,
         AccountId: robot.accountId, 
         ChatType: 'direct',
         SenderId: inbound.senderId,
@@ -102,7 +102,7 @@ export async function handleInbound(
     });
 
     // 4. Create Dispatcher
-    const { dispatcher, markDispatchIdle } = runtime.reply.createReplyDispatcherWithTyping({
+    const { dispatcher, markDispatchIdle } = channelRuntime.reply.createReplyDispatcherWithTyping({
         deliver: async (payload: any, info: any) => {
             const currentMeta = robot.activeNodeJobs.get(jobId);
             const resAgent = payload.agentId || finalAgentId;
@@ -126,10 +126,10 @@ export async function handleInbound(
     });
 
     // 5. Session Recording
-    if (runtime.session?.recordSessionMetaFromInbound) {
+    if (channelRuntime.session?.recordSessionMetaFromInbound) {
         try {
-            const storePath = runtime.session.resolveStorePath(dynamicSessionKey);
-            await runtime.session.recordSessionMetaFromInbound({
+            const storePath = channelRuntime.session.resolveStorePath(dynamicSessionKey);
+            await channelRuntime.session.recordSessionMetaFromInbound({
                 storePath, sessionKey: dynamicSessionKey, ctx: ctxPayload
             });
         } catch (err: any) {
@@ -139,7 +139,7 @@ export async function handleInbound(
 
     // 6. Dispatch
     try {
-        await runtime.reply.dispatchReplyFromConfig({
+        await channelRuntime.reply.dispatchReplyFromConfig({
             ctx: ctxPayload, 
             cfg: accountScopedCfg, 
             dispatcher,

package/src/index.ts

@@ -168,9 +168,10 @@ const pierPlugin: ChannelPlugin<PierAccountConfig> = {
     gateway: {
         startAccount: async (ctx) => {
             const config = ctx.account;
-            // ctx has .log, .runtime, .cfg, etc.
+            // Use ctx as the runtime provider as it contains .channelRuntime, .log, etc.
             const robot = new PierRobot(config, ctx as any, async (inbound, jobId) => {
-                await handleInbound(ctx.runtime, inbound, jobId, robot, pierPlugin);
+                // Pass the context containing channelRuntime
+                await handleInbound(ctx, inbound, jobId, robot, pierPlugin);
             });
             instances.set(ctx.accountId, robot);
             
@@ -185,11 +186,17 @@ const pierPlugin: ChannelPlugin<PierAccountConfig> = {
                     lastStartAt: (robot as any).lastStartAt 
                 } as any);
 
-                // Note: We resolve here to signal successful startup.
-                // The robot stays alive in the 'instances' map.
-                // If OpenClaw requires a long-running promise, we can revert to keeping it alive,
-                // but usually, status monitoring is enough for non-standard services.
-                console.log(`[pier-connector][${ctx.accountId}] Startup successful and resolved.`);
+                // IMPORTANT: Keep startAccount promise active for the lifetime of the connection.
+                // If this promise resolves, the Gateway will auto-restart the account.
+                await new Promise<void>((resolve) => {
+                    ctx.abortSignal.addEventListener('abort', () => {
+                        resolve();
+                    }, { once: true });
+                    
+                    if (ctx.abortSignal.aborted) resolve();
+                });
+                
+                console.log(`[pier-connector][${ctx.accountId}] Account signal aborted. Stopping...`);
             } catch (err: any) {
                 (robot as any).lastError = err.message;
                 ctx.setStatus({