nikou-cli 0.1.0 → 0.1.3

package/README.md

@@ -165,6 +165,19 @@ Hook 模式包含一个主节点和多个从节点：
 nikou-cli hook init
 ```
 
+安装后也可以用 `ai-hook` 入口完成 Hook 初始化与启动：
+
+```bash
+ai-hook init
+ai-hook
+```
+
+初始化时会提示主节点地址：如果旧配置里已有主节点，直接回车沿用；没有默认值时输入 IP 或域名即可。`ai-hook` 默认等价于 `nikou-cli hook worker codex`；如需 Claude：
+
+```bash
+ai-hook claude --model opus
+```
+
 配置默认写入：
 
 ```text
@@ -254,6 +267,14 @@ nikou-cli hook worker claude \
   --max-budget-usd 5
 ```
 
+使用 `ai-hook` 入口时，默认启动 Codex Worker；第一个参数可指定引擎：
+
+```bash
+ai-hook
+ai-hook claude --model sonnet
+ai-hook gemini
+```
+
 也可以通过 `--` 传递底层工具参数：
 
 ```bash

package/dist/ai-hook.d.ts

@@ -0,0 +1 @@
+#!/usr/bin/env node

package/dist/ai-hook.js

@@ -0,0 +1,12 @@
+#!/usr/bin/env node
+import {
+  normalizeCliArgs
+} from "./chunk-F3EPGM5N.js";
+
+// src/ai-hook.ts
+process.argv = [
+  process.argv[0],
+  "ai-hook",
+  ...normalizeCliArgs("ai-hook", process.argv.slice(2))
+];
+await import("./index.js");

package/dist/chunk-F3EPGM5N.js

@@ -0,0 +1,25 @@
+// src/cli-entry.ts
+import path from "path";
+var AI_HOOK_COMMAND_NAMES = /* @__PURE__ */ new Set(["ai-hook", "ai-hook.cmd", "ai-hook.exe"]);
+var HOOK_SUBCOMMANDS = /* @__PURE__ */ new Set(["master", "init", "worker", "log", "help"]);
+function normalizeCliArgs(commandPath, args) {
+  const commandName = path.basename(commandPath || "");
+  if (!AI_HOOK_COMMAND_NAMES.has(commandName)) {
+    return args;
+  }
+  const [firstArg = "", ...restArgs] = args;
+  if (firstArg === "hook") {
+    return args;
+  }
+  if (HOOK_SUBCOMMANDS.has(firstArg)) {
+    return ["hook", ...args];
+  }
+  if (!firstArg || firstArg.startsWith("-")) {
+    return ["hook", "worker", "codex", ...args];
+  }
+  return ["hook", "worker", firstArg, ...restArgs];
+}
+
+export {
+  normalizeCliArgs
+};

package/dist/index.js

@@ -1,4 +1,7 @@
 #!/usr/bin/env node
+import {
+  normalizeCliArgs
+} from "./chunk-F3EPGM5N.js";
 
 // src/index.ts
 import { Command } from "commander";
@@ -14361,6 +14364,105 @@ function countObjectKeys(value) {
   return Object.keys(value).length;
 }
 
+// src/hook/init/hook-init-normalizer.ts
+var DEFAULT_MASTER_HOST_ENV = "NIKOU_HOOK_MASTER_HOST";
+function resolveHookSection2(config) {
+  return config.hook ?? config.ai_hook ?? config.aiHook ?? {};
+}
+function resolveConfiguredMasterHost(config) {
+  const hook2 = resolveHookSection2(config);
+  return String(hook2.master_host || hook2.masterHost || "").trim();
+}
+function mergeHookInitMasterHost(config, masterHost) {
+  const host = String(masterHost || "").trim();
+  if (!host) {
+    return config;
+  }
+  return {
+    ...config,
+    hook: {
+      ...config.hook ?? config.ai_hook ?? config.aiHook ?? {},
+      master_host: host
+    }
+  };
+}
+function resolveContextConfigFromHook(hook2) {
+  return {
+    enabled: parseBoolean(
+      hook2.context_enabled ?? hook2.contextEnabled,
+      DEFAULT_CONTEXT_CONFIG.enabled
+    ),
+    timeoutMs: parsePositiveInt(
+      hook2.context_timeout_ms ?? hook2.contextTimeoutMs,
+      DEFAULT_CONTEXT_CONFIG.timeoutMs
+    ),
+    threadMax: parsePositiveInt(
+      hook2.context_thread_max ?? hook2.contextThreadMax,
+      DEFAULT_CONTEXT_CONFIG.threadMax
+    ),
+    chatRecentMax: parsePositiveInt(
+      hook2.context_chat_recent_max ?? hook2.contextChatRecentMax,
+      DEFAULT_CONTEXT_CONFIG.chatRecentMax
+    ),
+    userRecentMax: parsePositiveInt(
+      hook2.context_user_recent_max ?? hook2.contextUserRecentMax,
+      DEFAULT_CONTEXT_CONFIG.userRecentMax
+    ),
+    userRecentWindowMin: parsePositiveInt(
+      hook2.context_user_recent_window_min ?? hook2.contextUserRecentWindowMin,
+      DEFAULT_CONTEXT_CONFIG.userRecentWindowMin
+    ),
+    maxChars: parsePositiveInt(
+      hook2.context_max_chars ?? hook2.contextMaxChars,
+      DEFAULT_CONTEXT_CONFIG.maxChars
+    ),
+    logVerbose: parseBoolean(
+      hook2.context_log_verbose ?? hook2.contextLogVerbose,
+      DEFAULT_CONTEXT_CONFIG.logVerbose
+    )
+  };
+}
+function resolveDefaultMasterHost(env = process.env) {
+  return String(env[DEFAULT_MASTER_HOST_ENV] || "").trim();
+}
+function normalizeHookInitConfig(config, defaults = {}) {
+  const hook2 = resolveHookSection2(config);
+  const appId = String(config.feishu?.app_id || config.feishu?.appId || config.feishu?.appid || "").trim();
+  const appSecret = String(
+    config.feishu?.app_secret || config.feishu?.appSecret || config.feishu?.appsecret || ""
+  ).trim();
+  const masterHost = resolveConfiguredMasterHost(config) || String(defaults.defaultMasterHost || "").trim();
+  const masterPort = parsePositiveInt(hook2.master_port ?? hook2.masterPort, DEFAULT_MASTER_PORT);
+  const sharedSecret = String(hook2.shared_secret || hook2.sharedSecret || appSecret || "").trim();
+  const bindAllowedUserIds = parseUserIdList(hook2.bind_allowed_user_ids ?? hook2.bindAllowedUserIds);
+  const missing = [];
+  if (!appId) missing.push("feishu.app_id");
+  if (!appSecret) missing.push("feishu.app_secret");
+  if (!masterHost) missing.push(`hook.master_host \u6216 ${DEFAULT_MASTER_HOST_ENV}`);
+  if (!sharedSecret) missing.push("hook.shared_secret");
+  if (bindAllowedUserIds.length === 0) missing.push("hook.bind_allowed_user_ids");
+  if (missing.length > 0) {
+    throw new Error(`\u521D\u59CB\u5316\u6240\u9700\u914D\u7F6E\u7F3A\u5931: ${missing.join(", ")}`);
+  }
+  return {
+    feishuAppId: appId,
+    feishuAppSecret: appSecret,
+    masterHost,
+    masterPort,
+    sharedSecret,
+    bindAllowedUserIds,
+    botName: String(hook2.bot_name || hook2.botName || "").trim() || void 0,
+    claimTimeoutMs: parsePositiveInt(hook2.claim_timeout_ms ?? hook2.claimTimeoutMs, 1e4),
+    relayHeartbeatIntervalMs: parsePositiveInt(hook2.relay_heartbeat_interval_ms ?? hook2.relayHeartbeatIntervalMs, 3e4),
+    relayHeartbeatTimeoutMs: parsePositiveInt(hook2.relay_heartbeat_timeout_ms ?? hook2.relayHeartbeatTimeoutMs, 9e4),
+    slaveConnectTimeoutMs: parsePositiveInt(hook2.slave_connect_timeout_ms ?? hook2.slaveConnectTimeoutMs, 5e3),
+    reconnectIntervalMs: parsePositiveInt(hook2.reconnect_interval_ms ?? hook2.reconnectIntervalMs, 3e3),
+    authCliAuthSecret: String(config.auth?.cli_auth_secret || "").trim() || void 0,
+    authApiUrl: String(config.auth?.api_url || "").trim() || void 0,
+    contextConfig: resolveContextConfigFromHook(hook2)
+  };
+}
+
 // src/hook/init/hook-init-command.ts
 var BOT_OPTIONS = [{ label: "\u59AE\u853B", value: "\u59AE\u853B" }];
 var DEPLOYMENT_OPTIONS = [
@@ -14374,7 +14476,6 @@ var HookInitCommand = class {
   async run() {
     this.ensureInteractiveTerminal();
     const source = this.resolveSourceConfig();
-    const normalized = this.normalizeSourceConfig(source.config);
     const migration = loadLegacyMigrationResult(this.logger);
     const existingAggregateConfig = this.readJson(DEFAULT_CONFIG_PATH);
     const existingMasterConfig = this.readJson(MASTER_CONFIG_PATH);
@@ -14386,6 +14487,10 @@ var HookInitCommand = class {
       this.printEnvironmentSummary(source.path, { existingAggregateConfig, existingMasterConfig, existingWorkerConfig }, migration.summary);
       const botName = await this.askChoice(rl, "\u7B2C\u4E00\u6B65\uFF1A\u9009\u62E9\u98DE\u4E66\u673A\u5668\u4EBA", BOT_OPTIONS, 0);
       await this.askChoice(rl, "\u7B2C\u4E8C\u6B65\uFF1A\u9009\u62E9\u90E8\u7F72\u65B9\u5F0F", DEPLOYMENT_OPTIONS, 0);
+      const masterHost = await this.askMasterHost(rl, source.config);
+      const normalized = this.normalizeSourceConfig(
+        mergeHookInitMasterHost(source.config, masterHost)
+      );
       const nextMasterConfig = this.buildMasterConfigPayload(normalized, botName);
       const nextWorkerConfig = this.buildWorkerConfigPayload(normalized, botName);
       const nextWorkerState = this.buildSeedWorkerState({
@@ -14452,44 +14557,9 @@ var HookInitCommand = class {
     throw new Error(`\u672A\u627E\u5230\u53EF\u521D\u59CB\u5316\u7684\u914D\u7F6E\u6E90\uFF0C\u8BF7\u5148\u51C6\u5907 ${LEGACY_CONFIG_PATH}\u3001${DEFAULT_CONFIG_PATH} \u6216\u89D2\u8272\u914D\u7F6E\u6587\u4EF6`);
   }
   normalizeSourceConfig(config) {
-    const hook2 = this.resolveHookSection(config);
-    const appId = String(config.feishu?.app_id || config.feishu?.appId || config.feishu?.appid || "").trim();
-    const appSecret = String(
-      config.feishu?.app_secret || config.feishu?.appSecret || config.feishu?.appsecret || ""
-    ).trim();
-    const masterHost = String(hook2.master_host || hook2.masterHost || "").trim();
-    const masterPort = parsePositiveInt(hook2.master_port ?? hook2.masterPort, 19732);
-    const sharedSecret = String(hook2.shared_secret || hook2.sharedSecret || appSecret || "").trim();
-    const bindAllowedUserIds = parseUserIdList(hook2.bind_allowed_user_ids ?? hook2.bindAllowedUserIds);
-    const missing = [];
-    if (!appId) missing.push("feishu.app_id");
-    if (!appSecret) missing.push("feishu.app_secret");
-    if (!masterHost) missing.push("hook.master_host");
-    if (!sharedSecret) missing.push("hook.shared_secret");
-    if (bindAllowedUserIds.length === 0) missing.push("hook.bind_allowed_user_ids");
-    if (missing.length > 0) {
-      throw new Error(`\u521D\u59CB\u5316\u6240\u9700\u914D\u7F6E\u7F3A\u5931: ${missing.join(", ")}`);
-    }
-    return {
-      feishuAppId: appId,
-      feishuAppSecret: appSecret,
-      masterHost,
-      masterPort,
-      sharedSecret,
-      bindAllowedUserIds,
-      botName: String(hook2.bot_name || hook2.botName || "").trim() || void 0,
-      claimTimeoutMs: parsePositiveInt(hook2.claim_timeout_ms ?? hook2.claimTimeoutMs, 1e4),
-      relayHeartbeatIntervalMs: parsePositiveInt(hook2.relay_heartbeat_interval_ms ?? hook2.relayHeartbeatIntervalMs, 3e4),
-      relayHeartbeatTimeoutMs: parsePositiveInt(hook2.relay_heartbeat_timeout_ms ?? hook2.relayHeartbeatTimeoutMs, 9e4),
-      slaveConnectTimeoutMs: parsePositiveInt(hook2.slave_connect_timeout_ms ?? hook2.slaveConnectTimeoutMs, 5e3),
-      reconnectIntervalMs: parsePositiveInt(hook2.reconnect_interval_ms ?? hook2.reconnectIntervalMs, 3e3),
-      authCliAuthSecret: String(config.auth?.cli_auth_secret || "").trim() || void 0,
-      authApiUrl: String(config.auth?.api_url || "").trim() || void 0,
-      contextConfig: resolveContextConfig(config)
-    };
-  }
-  resolveHookSection(config) {
-    return config.hook ?? config.ai_hook ?? config.aiHook ?? {};
+    return normalizeHookInitConfig(config, {
+      defaultMasterHost: resolveDefaultMasterHost()
+    });
   }
   printEnvironmentSummary(sourcePath, existingConfig, migrationSummary) {
     console.log(chalk9.bold("\nHook \u521D\u59CB\u5316\u5411\u5BFC\n"));
@@ -14537,6 +14607,19 @@ var HookInitCommand = class {
       console.log(chalk9.yellow("\u8BF7\u8F93\u5165 y \u6216 n\u3002\n"));
     }
   }
+  async askMasterHost(rl, config) {
+    const defaultHost = resolveConfiguredMasterHost(config) || resolveDefaultMasterHost();
+    while (true) {
+      const label = defaultHost ? `\u7B2C\u4E09\u6B65\uFF1A\u4E3B\u8282\u70B9\u5730\u5740 [\u9ED8\u8BA4 ${defaultHost}]: ` : "\u7B2C\u4E09\u6B65\uFF1A\u4E3B\u8282\u70B9\u5730\u5740: ";
+      const answer = (await rl.question(chalk9.dim(label))).trim();
+      const resolved = answer || defaultHost;
+      if (resolved) {
+        console.log("");
+        return resolved;
+      }
+      console.log(chalk9.yellow("\u4E3B\u8282\u70B9\u5730\u5740\u4E0D\u80FD\u4E3A\u7A7A\uFF0C\u8BF7\u8F93\u5165 IP \u6216\u57DF\u540D\u3002\n"));
+    }
+  }
   buildMasterConfigPayload(normalized, botName) {
     return {
       feishu: {
@@ -15139,4 +15222,9 @@ hook.command("worker").argument("[engine]", "codex|gemini|claude", "codex").desc
 hook.command("log").argument("[query]", "\u53EF\u9009\uFF0CtraceId / messageId / \u5173\u952E\u5B57").description("\u67E5\u770B\u672C\u673A agent-block hook master/worker \u65E5\u5FD7").option("--worker", "\u53EA\u770B worker \u65E5\u5FD7", false).option("--slave", "\u53EA\u770B worker \u65E5\u5FD7\uFF08\u517C\u5BB9\u65E7 ai-hook \u4E60\u60EF\uFF09", false).option("--master", "\u53EA\u770B master \u65E5\u5FD7", false).option("-n, --lines <lines>", "\u9ED8\u8BA4\u8FD4\u56DE\u6700\u8FD1\u591A\u5C11\u884C\uFF0C\u9ED8\u8BA4 200").option("-f, --follow", "\u6301\u7EED\u8DDF\u968F\u65E5\u5FD7\u8F93\u51FA\uFF0C\u7B49\u4EF7 tail -f", false).option("-c, --context <lines>", "\u5E26 query \u65F6\u8FD4\u56DE\u524D\u540E\u6587\uFF0C\u9ED8\u8BA4 20").action(async (query, options) => {
   await hookLogAction(query, options);
 });
+process.argv = [
+  process.argv[0],
+  process.argv[1],
+  ...normalizeCliArgs(process.argv[1], process.argv.slice(2))
+];
 program.parse();

package/package.json

@@ -1,16 +1,17 @@
 {
     "name": "nikou-cli",
-    "version": "0.1.0",
+    "version": "0.1.3",
     "description": "Install Agent Skills and MCP servers, and run distributed AI hook workers.",
     "type": "module",
     "bin": {
-        "nikou-cli": "dist/index.js"
+        "nikou-cli": "dist/index.js",
+        "ai-hook": "dist/ai-hook.js"
     },
     "files": [
         "dist"
     ],
     "scripts": {
-        "build": "tsup src/index.ts --format esm --dts --clean",
+        "build": "tsup src/index.ts src/ai-hook.ts --format esm --dts --clean",
         "dev": "tsup src/index.ts --format esm --watch",
         "test": "tsx --test test/**/*.test.ts",
         "privacy-scan": "node scripts/privacy-scan.mjs",