@ai-setting/roy-agent-cli 1.7.10 → 1.7.12

package/dist/bin/roy-agent.js

@@ -9429,7 +9429,6 @@ var require_dist = __commonJS((exports) => {
 
 // src/cli.ts
 import yargsLib from "yargs";
-import { hideBin } from "yargs/helpers";
 
 // src/services/quiet-mode.service.ts
 import { setQuietMode as setCoreQuietMode, isQuietMode as isCoreQuietMode } from "@ai-setting/roy-agent-core";
@@ -9461,7 +9460,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.7.10",
+  version: "1.7.12",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -21170,7 +21169,7 @@ var EventSourceAddCommand = {
     type: "string",
     demandOption: true
   }).positional("type", {
-    describe: "事件源类型（如 lark-cli, timer, websocket 或第三方自定义类型）",
+    describe: "事件源类型（如 lark-cli, bounty-cli, bounty-im, timer, websocket 或第三方自定义类型）",
     type: "string",
     demandOption: true
   }).option("event-types", {
@@ -21193,7 +21192,7 @@ var EventSourceAddCommand = {
     describe: "Cron 表达式",
     type: "string"
   }).option("profile", {
-    describe: "Profile 名称（lark-cli / bounty-im 类型用，从 ~/.config/bounty/profiles/<name>.json 读取配置；多 appId / 多账户场景必要，参考 #1637）",
+    describe: "Profile 名称（lark-cli / bounty-im / bounty-cli 类型用，从 ~/.config/bounty/profiles/<name>.json 读取配置；多 appId / 多账户场景必要，参考 #1637）",
     type: "string"
   }).option("email", {
     describe: "Agent IM 注册邮箱（bounty-im 类型用，v0.14 strict email-only；与 --profile 互斥）",
@@ -21202,6 +21201,9 @@ var EventSourceAddCommand = {
     describe: "跳过 TLS 证书校验（bounty-im 类型用，wss:// 自签名场景，生产环境不推荐）",
     type: "boolean",
     default: false
+  }).option("channel", {
+    describe: "Mattermost 频道名（bounty-cli 类型用，启动时执行 `bounty event consume --channel <name>`；与 --command 互斥）",
+    type: "string"
   }).option("prompt", {
     describe: "自定义 prompt 消息（timer 类型，替换默认 SelfReminder 内容）",
     type: "string"
@@ -21255,6 +21257,14 @@ var EventSourceAddCommand = {
       } else {
         resolvedServerUrl = resolveServerUrl(undefined, fallback);
       }
+      if (a.type === "bounty-cli") {
+        if (!a.channel && !a.command) {
+          output.error(chalk61.red(`
+✗ bounty-cli 类型需要 --channel <频道名>（或 --command 覆盖默认命令）
+`));
+          process.exit(1);
+        }
+      }
       const config = {
         id: uuid(),
         name: a.name,
@@ -21269,6 +21279,7 @@ var EventSourceAddCommand = {
         email: resolvedEmail,
         imServerUrl: resolvedServerUrl,
         tlsSkipVerify: a.tlsSkipVerify === true,
+        ...a.type === "bounty-cli" && a.channel ? { channel: a.channel } : {},
         options: a.prompt ? { prompt: a.prompt } : undefined
       };
       esComponent.register(config);
@@ -21303,6 +21314,9 @@ var EventSourceAddCommand = {
       if (a.prompt) {
         output.log(`  Prompt: ${chalk61.gray(a.prompt.length > 60 ? a.prompt.slice(0, 60) + "..." : a.prompt)}`);
       }
+      if (a.channel) {
+        output.log(`  Channel: ${chalk61.gray(a.channel)}`);
+      }
       output.log("");
       output.log(chalk61.gray(`使用 'roy-agent eventsource start ${config.id.substring(0, 8)}' 启动它。`));
     } finally {
@@ -25591,11 +25605,6 @@ async function verifyInstalledVersion(packageName, declaredVersion) {
   if (actual.version !== declaredVersion) {
     return { ok: false, reason: "version-mismatch", actualVersion: actual.version };
   }
-  try {
-    await import(packageName);
-  } catch (e) {
-    console.warn(`⚠️  verifyInstalledVersion: dynamic import of '${packageName}' failed but version check passed (npm global root may not be in Node module resolution path): ${e.message}`);
-  }
   return { ok: true, actualVersion: actual.version };
 }
 function getPackageManagerCommand() {
@@ -25755,9 +25764,9 @@ var InstallPackageCommand = {
         if (verify.ok === false) {
           console.warn(`
 ⚠️  Post-install version drift detected for '${resolvedPackageName}':
-   declared (plugins.json): ${plugin.version}
-   actual (npm global root): ${verify.actualVersion ?? "(unknown)"}
-   reason: ${verify.reason}
+` + `   declared (plugins.json): ${plugin.version}
+` + `   actual (npm global root): ${verify.actualVersion ?? "(unknown)"}
+` + `   reason: ${verify.reason}
 ` + `   请检查 ~/.roy-agent/node_modules/${resolvedPackageName}/ 是否残留陈旧 cp 副本
 `);
         }
@@ -25890,6 +25899,18 @@ function quietModeMiddleware(argv) {
     quietService.setQuiet(true);
   }
 }
+function rewriteEsFlag(argv) {
+  const esIdx = argv.indexOf("--es");
+  if (esIdx === -1)
+    return argv;
+  const esValue = argv[esIdx + 1];
+  if (!esValue || esValue.startsWith("--")) {
+    return argv;
+  }
+  const before = argv.slice(0, esIdx);
+  const after = argv.slice(esIdx + 2);
+  return [...before, "eventsource", "start", esValue, ...after];
+}
 var PLUGIN_HELP = `
 Plugins:
   coder-harness LSP plugins:
@@ -25920,8 +25941,13 @@ Examples:
   --plugin tslsp code-check        Enable multiple plugins`;
 async function runCli() {
   const version = getPackageVersion();
+  const rewrittenArgv = rewriteEsFlag(process.argv.slice(2));
   const yargs = yargsLib;
-  await yargs(hideBin(process.argv)).scriptName("roy-agent").version(version).option("quiet", {
+  await yargs(rewrittenArgv).scriptName("roy-agent").version(version).option("es", {
+    describe: "Start an event source by id/name (alias for `eventsource start <id>`). e.g. --es my-source",
+    type: "string",
+    global: true
+  }).option("quiet", {
     describe: "Quiet mode (default: on, use --no-quiet to enable logging)",
     type: "boolean",
     default: true,

package/dist/index.js

@@ -9428,7 +9428,6 @@ var require_dist = __commonJS((exports) => {
 
 // src/cli.ts
 import yargsLib from "yargs";
-import { hideBin } from "yargs/helpers";
 
 // src/services/quiet-mode.service.ts
 import { setQuietMode as setCoreQuietMode, isQuietMode as isCoreQuietMode } from "@ai-setting/roy-agent-core";
@@ -9460,7 +9459,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.7.10",
+  version: "1.7.12",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -21169,7 +21168,7 @@ var EventSourceAddCommand = {
     type: "string",
     demandOption: true
   }).positional("type", {
-    describe: "事件源类型（如 lark-cli, timer, websocket 或第三方自定义类型）",
+    describe: "事件源类型（如 lark-cli, bounty-cli, bounty-im, timer, websocket 或第三方自定义类型）",
     type: "string",
     demandOption: true
   }).option("event-types", {
@@ -21192,7 +21191,7 @@ var EventSourceAddCommand = {
     describe: "Cron 表达式",
     type: "string"
   }).option("profile", {
-    describe: "Profile 名称（lark-cli / bounty-im 类型用，从 ~/.config/bounty/profiles/<name>.json 读取配置；多 appId / 多账户场景必要，参考 #1637）",
+    describe: "Profile 名称（lark-cli / bounty-im / bounty-cli 类型用，从 ~/.config/bounty/profiles/<name>.json 读取配置；多 appId / 多账户场景必要，参考 #1637）",
     type: "string"
   }).option("email", {
     describe: "Agent IM 注册邮箱（bounty-im 类型用，v0.14 strict email-only；与 --profile 互斥）",
@@ -21201,6 +21200,9 @@ var EventSourceAddCommand = {
     describe: "跳过 TLS 证书校验（bounty-im 类型用，wss:// 自签名场景，生产环境不推荐）",
     type: "boolean",
     default: false
+  }).option("channel", {
+    describe: "Mattermost 频道名（bounty-cli 类型用，启动时执行 `bounty event consume --channel <name>`；与 --command 互斥）",
+    type: "string"
   }).option("prompt", {
     describe: "自定义 prompt 消息（timer 类型，替换默认 SelfReminder 内容）",
     type: "string"
@@ -21254,6 +21256,14 @@ var EventSourceAddCommand = {
       } else {
         resolvedServerUrl = resolveServerUrl(undefined, fallback);
       }
+      if (a.type === "bounty-cli") {
+        if (!a.channel && !a.command) {
+          output.error(chalk61.red(`
+✗ bounty-cli 类型需要 --channel <频道名>（或 --command 覆盖默认命令）
+`));
+          process.exit(1);
+        }
+      }
       const config = {
         id: uuid(),
         name: a.name,
@@ -21268,6 +21278,7 @@ var EventSourceAddCommand = {
         email: resolvedEmail,
         imServerUrl: resolvedServerUrl,
         tlsSkipVerify: a.tlsSkipVerify === true,
+        ...a.type === "bounty-cli" && a.channel ? { channel: a.channel } : {},
         options: a.prompt ? { prompt: a.prompt } : undefined
       };
       esComponent.register(config);
@@ -21302,6 +21313,9 @@ var EventSourceAddCommand = {
       if (a.prompt) {
         output.log(`  Prompt: ${chalk61.gray(a.prompt.length > 60 ? a.prompt.slice(0, 60) + "..." : a.prompt)}`);
       }
+      if (a.channel) {
+        output.log(`  Channel: ${chalk61.gray(a.channel)}`);
+      }
       output.log("");
       output.log(chalk61.gray(`使用 'roy-agent eventsource start ${config.id.substring(0, 8)}' 启动它。`));
     } finally {
@@ -25590,11 +25604,6 @@ async function verifyInstalledVersion(packageName, declaredVersion) {
   if (actual.version !== declaredVersion) {
     return { ok: false, reason: "version-mismatch", actualVersion: actual.version };
   }
-  try {
-    await import(packageName);
-  } catch (e) {
-    console.warn(`⚠️  verifyInstalledVersion: dynamic import of '${packageName}' failed but version check passed (npm global root may not be in Node module resolution path): ${e.message}`);
-  }
   return { ok: true, actualVersion: actual.version };
 }
 function getPackageManagerCommand() {
@@ -25754,9 +25763,9 @@ var InstallPackageCommand = {
         if (verify.ok === false) {
           console.warn(`
 ⚠️  Post-install version drift detected for '${resolvedPackageName}':
-   declared (plugins.json): ${plugin.version}
-   actual (npm global root): ${verify.actualVersion ?? "(unknown)"}
-   reason: ${verify.reason}
+` + `   declared (plugins.json): ${plugin.version}
+` + `   actual (npm global root): ${verify.actualVersion ?? "(unknown)"}
+` + `   reason: ${verify.reason}
 ` + `   请检查 ~/.roy-agent/node_modules/${resolvedPackageName}/ 是否残留陈旧 cp 副本
 `);
         }
@@ -25889,6 +25898,18 @@ function quietModeMiddleware(argv) {
     quietService.setQuiet(true);
   }
 }
+function rewriteEsFlag(argv) {
+  const esIdx = argv.indexOf("--es");
+  if (esIdx === -1)
+    return argv;
+  const esValue = argv[esIdx + 1];
+  if (!esValue || esValue.startsWith("--")) {
+    return argv;
+  }
+  const before = argv.slice(0, esIdx);
+  const after = argv.slice(esIdx + 2);
+  return [...before, "eventsource", "start", esValue, ...after];
+}
 var PLUGIN_HELP = `
 Plugins:
   coder-harness LSP plugins:
@@ -25919,8 +25940,13 @@ Examples:
   --plugin tslsp code-check        Enable multiple plugins`;
 async function runCli() {
   const version = getPackageVersion();
+  const rewrittenArgv = rewriteEsFlag(process.argv.slice(2));
   const yargs = yargsLib;
-  await yargs(hideBin(process.argv)).scriptName("roy-agent").version(version).option("quiet", {
+  await yargs(rewrittenArgv).scriptName("roy-agent").version(version).option("es", {
+    describe: "Start an event source by id/name (alias for `eventsource start <id>`). e.g. --es my-source",
+    type: "string",
+    global: true
+  }).option("quiet", {
     describe: "Quiet mode (default: on, use --no-quiet to enable logging)",
     type: "boolean",
     default: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-cli",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "type": "module",
   "description": "CLI for roy-agent - Non-interactive command execution",
   "main": "./dist/index.js",