nikou-cli 0.1.7 → 0.1.8

package/README.md

@@ -162,6 +162,8 @@ Hook 支持三种启动模式：
 
 主节点负责连接聊天平台、接收消息、维护 Worker 列表并分发任务。从节点负责连接主节点，收到任务后调用 Codex、Claude 或 Gemini 执行。
 
+群聊发送 `@机器人 绑定: <目录>` 时，主节点会先检查当前用户是否已经绑定该目录；已有绑定会直接返回结果，未绑定则只把路径校验任务发给该用户自己的在线 Worker。一个群可以保留多个用户、多个目录的 Agent 绑定，绑定指令不会广播给其他 Worker 抢占。
+
 ### 初始化配置
 
 ```bash

package/dist/index.js

@@ -3041,7 +3041,10 @@ var TaskManager = class {
     }
     if (task.status !== "pending") {
       this.logger.info(
-        formatTraceLog(task.traceId, `\u8BA4\u9886\u88AB\u62D2\u7EDD\uFF1A\u4EFB\u52A1\u5DF2\u88AB\u8BA4\u9886 worker=${workerMeta.workerId}`)
+        formatTraceLog(
+          task.traceId,
+          `\u8BA4\u9886\u88AB\u62D2\u7EDD\uFF1A\u4EFB\u52A1\u5DF2\u88AB\u8BA4\u9886 claimed_worker=${task.claimedWorkerId || "-"}, rejected_worker=${workerMeta.workerId}`
+        )
       );
       return false;
     }
@@ -4028,6 +4031,15 @@ var ChatBindingRegistry = class {
   getByKey(chatId, bindingKey) {
     return this.bindings.get(normalize2(chatId))?.get(normalize2(bindingKey)) || null;
   }
+  /** 按群、绑定用户和目录查找普通绑定，供绑定指令做幂等校验。 */
+  getNormalBinding(chatId, ownerUserId, dirPath) {
+    const owner = normalize2(ownerUserId);
+    const dir = normalize2(dirPath);
+    if (!owner || !dir) {
+      return null;
+    }
+    return this.listByChat(chatId).find((binding) => binding.kind === "normal" && binding.ownerUserId === owner && binding.dirPath === dir) || null;
+  }
   /** 返回全部绑定记录（扁平） */
   list() {
     const all = [];
@@ -5356,9 +5368,17 @@ var HookMasterCommand = class {
     const bindCmd = parseBindingCommand(text);
     if (bindCmd.matched) {
       this.logger.info(formatMasterTraceLog(messageId, `\u4E3B\u8282\u70B9\u547D\u4E2D\u7ED1\u5B9A\u6307\u4EE4: chat_id=${chatId}, target=${bindCmd.target}`));
-      if (!this.handleBindCommand(chatId, messageId, senderId, bindCmd.target)) {
-        return;
-      }
+      await this.handleBindCommand({
+        data,
+        message,
+        chatId,
+        chatType,
+        messageId,
+        senderId,
+        senderOpenId,
+        target: bindCmd.target
+      });
+      return;
     }
     const stopCmd = parseStopCommand(text);
     if (stopCmd.matched) {
@@ -5378,8 +5398,7 @@ var HookMasterCommand = class {
       chatType,
       senderId,
       senderOpenId,
-      text,
-      isBindingCommand: bindCmd.matched
+      text
     });
   }
   async dispatchFeishuTask(input) {
@@ -5409,10 +5428,6 @@ var HookMasterCommand = class {
       } else {
         this.logger.warn(formatMasterTraceLog(input.messageId, `\u5355\u804A\u4EFB\u52A1\u672A\u5339\u914D\u5230\u4ECE\u8282\u70B9: task_id=${task.taskId}, requester=${input.senderId || "-"}, chat_id=${input.chatId || "-"}`));
       }
-    } else if (input.isBindingCommand) {
-      this.wsServer.broadcast(buildTaskOffer(task, eventKey, input.data));
-      delivered = this.wsServer.getWorkerCount();
-      this.logger.info(formatMasterTraceLog(input.messageId, `\u7ED1\u5B9A\u6307\u4EE4\u5DF2\u5E7F\u64AD\u7ED9\u4ECE\u8282\u70B9\u5339\u914D\u76EE\u5F55: task_id=${task.taskId}, chat_id=${input.chatId || "-"}, delivered=${delivered}, message_id=${input.messageId}`));
     } else {
       await this.groupRouteDispatcher?.dispatch(task, input.text);
       return;
@@ -5433,16 +5448,54 @@ var HookMasterCommand = class {
       () => this.messageResponder?.replyNoWorker(task)
     );
   }
-  handleBindCommand(chatId, messageId, senderId, target) {
+  async handleBindCommand(input) {
+    const { chatId, messageId, senderId, target } = input;
+    const replyInThread = resolveReplyInThread(input.message);
     if (this.bindAllowedUserIds.length > 0 && !this.bindAllowedUserIds.includes(senderId)) {
-      void this.messageResponder?.replyText(chatId, "\u7ED1\u5B9A\u5931\u8D25\uFF1A\u5F53\u524D\u7528\u6237\u4E0D\u5728\u7ED1\u5B9A\u767D\u540D\u5355", messageId, resolveReplyInThread({
-        chat_id: chatId,
-        message_id: messageId
-      }));
-      return false;
+      await this.messageResponder?.replyText(chatId, "\u7ED1\u5B9A\u5931\u8D25\uFF1A\u5F53\u524D\u7528\u6237\u4E0D\u5728\u7ED1\u5B9A\u767D\u540D\u5355", messageId, replyInThread);
+      return;
     }
-    this.logger.info(formatMasterTraceLog(messageId, `\u7ED1\u5B9A\u6307\u4EE4\u6821\u9A8C\u901A\u8FC7\uFF0C\u7EE7\u7EED\u4E0B\u53D1\u5230\u4ECE\u8282\u70B9: chat_id=${chatId}, target=${target}`));
-    return true;
+    if (!target) {
+      await this.messageResponder?.replyText(chatId, "\u7ED1\u5B9A\u5931\u8D25\uFF1A\u8BF7\u6307\u5B9A\u7ED1\u5B9A\u8DEF\u5F84", messageId, replyInThread);
+      return;
+    }
+    const existing = this.chatBindingRegistry.getNormalBinding(chatId, senderId, target);
+    if (existing) {
+      this.logger.info(formatMasterTraceLog(messageId, `\u4E3B\u8282\u70B9\u547D\u4E2D\u5DF2\u6709\u7FA4\u804A\u7ED1\u5B9A: chat_id=${chatId}, worker=${existing.workerId}, owner_user_id=${senderId}, dir=${target}`));
+      await this.messageResponder?.replyText(chatId, `\u5DF2\u7ED1\u5B9A\u5230: ${target}`, messageId, replyInThread);
+      return;
+    }
+    if (!this.taskManager || !this.wsServer) {
+      return;
+    }
+    const workerId = this.workerRegistry.getWorkerIdByOwner(senderId);
+    if (!workerId) {
+      this.logger.warn(formatMasterTraceLog(messageId, `\u7ED1\u5B9A\u5931\u8D25\uFF0C\u672A\u627E\u5230\u53D1\u8D77\u4EBA\u7684\u5728\u7EBF\u4ECE\u8282\u70B9: chat_id=${chatId}, owner_user_id=${senderId}, dir=${target}`));
+      await this.messageResponder?.replyText(chatId, "\u7ED1\u5B9A\u5931\u8D25\uFF1A\u672A\u627E\u5230\u4F60\u7684\u5728\u7EBF\u4ECE\u8282\u70B9\uFF0C\u8BF7\u5148\u542F\u52A8 ai-hook", messageId, replyInThread);
+      return;
+    }
+    const eventKey = "im.message.receive_v1";
+    const task = this.taskManager.createTaskRecord(input.data, messageId, eventKey, {
+      chatId,
+      chatType: input.chatType,
+      requesterUserId: senderId,
+      requesterOpenId: input.senderOpenId,
+      responseMode: "card",
+      routeMode: "direct_group",
+      replyInThread
+    });
+    task.targetWorkerId = workerId;
+    const delivered = this.wsServer.sendTo(workerId, buildTaskOffer(task, eventKey, input.data));
+    if (!delivered) {
+      this.taskManager.cleanupTask(task.taskId);
+      await this.messageResponder?.replyText(chatId, "\u7ED1\u5B9A\u5931\u8D25\uFF1A\u4F60\u7684\u4ECE\u8282\u70B9\u5F53\u524D\u4E0D\u53EF\u7528\uFF0C\u8BF7\u91CD\u65B0\u542F\u52A8 ai-hook", messageId, replyInThread);
+      return;
+    }
+    this.logger.info(formatMasterTraceLog(messageId, `\u7ED1\u5B9A\u6307\u4EE4\u5DF2\u5B9A\u5411\u4E0B\u53D1: task_id=${task.taskId}, chat_id=${chatId}, owner_user_id=${senderId}, worker=${workerId}, dir=${target}`));
+    this.taskManager.scheduleClaimTimeout(
+      task.taskId,
+      () => this.messageResponder?.replyText(chatId, "\u7ED1\u5B9A\u5931\u8D25\uFF1A\u4ECE\u8282\u70B9\u54CD\u5E94\u8D85\u65F6\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5", messageId, replyInThread)
+    );
   }
   async handleBotMenuEvent(data) {
     const event = data?.event || data;
@@ -8329,7 +8382,6 @@ ${question}` : question;
     if (!fs14.existsSync(bindTarget)) {
       return { ...baseTask, canHandle: true, type: "quick_result", quickResult: `\u8DEF\u5F84\u4E0D\u5B58\u5728: ${bindTarget}` };
     }
-    this.stateManager.rebindChatToDir(message.chatId, bindTarget);
     const bindAt = (/* @__PURE__ */ new Date()).toISOString();
     const pathDisplay = resolveCardPathDisplay(bindTarget);
     this.logger.info(formatTraceLog(baseTask.traceId, `\u7ED1\u5B9A\u6210\u529F: chatId=${message.chatId} -> ${bindTarget}`));
@@ -9956,6 +10008,7 @@ var SlaveRelayClient = class {
     if (!chatId || !dirPath) {
       return;
     }
+    this.stateManager.rebindChatToDir(chatId, dirPath);
     this.send({
       type: "binding_update",
       worker_id: this.workerId,
@@ -14011,6 +14064,7 @@ import { execFile, spawn as spawn4 } from "child_process";
 import { createRequire } from "module";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
+var MISSING_CLI_AUTH_SECRET_ERROR = "\u672A\u914D\u7F6E CLI_AUTH_SECRET\uFF0C\u65E0\u6CD5\u62C9\u53D6 Nacos \u540C\u6B65\u8BA1\u5212";
 var NacosSubscriptionSyncCoordinator = class {
   logger;
   workerId;
@@ -14019,12 +14073,15 @@ var NacosSubscriptionSyncCoordinator = class {
   daemon = null;
   running = false;
   stopped = false;
+  missingCliAuthSecretWarned = false;
   status;
+  resolveAuthRuntimeConfig;
   statePath = path26.join(os16.homedir(), ".nikou-block", "worker", "nacos-subscriptions.json");
   constructor(options) {
     this.logger = options.logger;
     this.workerId = options.workerId;
     this.config = options.config;
+    this.resolveAuthRuntimeConfig = options.resolveAuthRuntimeConfig || resolveCliAuthRuntimeConfig;
     this.status = {
       enabled: this.config.enabled,
       configured: false,
@@ -14092,15 +14149,20 @@ var NacosSubscriptionSyncCoordinator = class {
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       this.status.lastError = message;
-      this.logger.warn(`Nacos Skill \u8BA2\u9605\u540C\u6B65\u5931\u8D25: ${message}`);
+      if (message !== MISSING_CLI_AUTH_SECRET_ERROR || !this.missingCliAuthSecretWarned) {
+        this.logger.warn(`Nacos Skill \u8BA2\u9605\u540C\u6B65\u5931\u8D25: ${message}`);
+      }
+      if (message === MISSING_CLI_AUTH_SECRET_ERROR) {
+        this.missingCliAuthSecretWarned = true;
+      }
     } finally {
       this.running = false;
     }
   }
   async fetchPlan() {
-    const runtime = resolveCliAuthRuntimeConfig();
+    const runtime = this.resolveAuthRuntimeConfig();
     if (!runtime.cliAuthSecret) {
-      throw new Error("\u672A\u914D\u7F6E CLI_AUTH_SECRET\uFF0C\u65E0\u6CD5\u62C9\u53D6 Nacos \u540C\u6B65\u8BA1\u5212");
+      throw new Error(MISSING_CLI_AUTH_SECRET_ERROR);
     }
     const response = await fetch(`${runtime.apiUrl}/worker-skills/nacos-sync/plan`, {
       method: "POST",
@@ -14115,7 +14177,7 @@ var NacosSubscriptionSyncCoordinator = class {
   }
   async report(results) {
     if (!results.length) return;
-    const runtime = resolveCliAuthRuntimeConfig();
+    const runtime = this.resolveAuthRuntimeConfig();
     const response = await fetch(`${runtime.apiUrl}/worker-skills/nacos-sync/report`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nikou-cli",
-    "version": "0.1.7",
+    "version": "0.1.8",
     "description": "Install Agent Skills and MCP servers, and run distributed AI hook workers.",
     "type": "module",
     "bin": {