@gholl-studio/pier-connector 0.3.22 → 0.3.24

package/package.json

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

@@ -22,14 +22,10 @@ export async function handleInbound(
     }
 
     // 1. Resolve Account-Scoped Configuration
+    // 使用原始完整配置，不覆盖 channels.pier，确保 bindings 和 defaultAgent 完整可用。
+    // resolveAgentRoute 需要完整配置中的 bindings 才能正确匹配 channel+accountId 路由规则。
     const rootConfig = ctx.cfg || {};
-    const accountScopedCfg = {
-        ...rootConfig,
-        channels: { 
-            ...rootConfig.channels, 
-            pier: robot.config 
-        }
-    };
+    const accountScopedCfg = rootConfig;
 
     // 2. Resolve Agent Route
     const route = channelRuntime.routing.resolveAgentRoute({
@@ -44,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 = "";
 
@@ -79,7 +78,7 @@ export async function handleInbound(
         RawBody: inbound.body,
         From: inbound.senderId,
         To: `chat:${jobId}`,
-        SessionKey: dynamicSessionKey,
+        SessionKey: route.sessionKey,
         AccountId: robot.accountId, 
         ChatType: 'direct',
         SenderId: inbound.senderId,
@@ -103,7 +102,10 @@ export async function handleInbound(
     });
 
     // 4. Create Dispatcher
-    const { dispatcher, markDispatchIdle } = channelRuntime.reply.createReplyDispatcherWithTyping({
+    // 必须从 createReplyDispatcherWithTyping 获取 replyOptions，
+    // 它包含 SDK 内部生命周期钉子（onReplyStart / onTypingController / onTypingCleanup），
+    // 必须传入 dispatchReplyFromConfig 才能正确启动和终止 typing controller。
+    const { dispatcher, replyOptions, markDispatchIdle, markRunComplete } = channelRuntime.reply.createReplyDispatcherWithTyping({
         deliver: async (payload: any, info: any) => {
             const currentMeta = robot.activeNodeJobs.get(jobId);
             const resAgent = payload.agentId || finalAgentId;
@@ -140,19 +142,32 @@ export async function handleInbound(
 
     // 6. Dispatch
     try {
-        await channelRuntime.reply.dispatchReplyFromConfig({
+        const { queuedFinal, counts } = await channelRuntime.reply.dispatchReplyFromConfig({
             ctx: ctxPayload, 
             cfg: accountScopedCfg, 
             dispatcher,
             replyOptions: {
+                // 必须展开 replyOptions，否则 typing controller 永远不会被启动/停止
+                // 上一条消息的会话状态就会游跍，导致 SDK 拒绝处理下一条消息
+                ...replyOptions,
                 onModelSelected: (mCtx: any) => {
                     logger.info(`[pier-connector:debug] Model selected for ${jobId}: ${mCtx.provider}/${mCtx.model}`);
                 }
             }
         });
+
+        // 等待所有已入队的 deliver() 调用完成（参照飞书插件 dispatch.ts L128）
+        // 不调用此方法， dispatchReplyFromConfig 可能在 deliver 永远未执行的情况下返回
+        await dispatcher.waitForIdle();
+
+        logger.info(`[pier-connector] Dispatch complete for ${jobId}. queuedFinal=${queuedFinal}, counts=${JSON.stringify(counts)}`);
     } catch (err: any) {
         logger.error(`[pier-connector] ✖ Dispatch error for job ${jobId}: ${err.message}`);
     } finally {
+        // markRunComplete 通知 typing controller 运行已结束。
+        // markDispatchIdle 通知 dispatcher 空闲。
+        // 必须在 finally 块不调用不等待下一条消息。
+        markRunComplete?.();
         markDispatchIdle?.();
     }
 }