hamster-wheel-cli 0.2.0-beta.1 → 0.2.0-beta.2

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 本项目遵循语义化版本，变更日志以时间倒序记录。
 
+## [0.2.0-beta.2] - 2025-12-24
+### Added
+- 新增 `alias run` 子命令，支持执行 alias 时追加参数并覆盖同名选项。
+
 ## [0.2.0] - 2025-12-24
 ### Added
 - 支持多任务执行与 multi-task 模式，提供 relay（接力）、serial（串行）、serial-continue（串行继续）、parallel（并行）四种执行方式。

package/README.md

@@ -82,6 +82,13 @@ weekly = "run --task \"补充测试\" --run-tests"
 wheel-ai set alias daily --task "补充文档" --run-tests
 ```
 
+也可以直接执行 alias，并在末尾追加命令：
+```bash
+wheel-ai alias run daily --run-e2e --task "补充 e2e"
+```
+- `<addition...>` 支持多个命令/参数组合，等价于将追加内容放在 alias 命令末尾。
+- 当追加的命令/参数与 alias 内已有内容重复时，以追加的为准。
+
 ## 持久化记忆
 - `docs/ai-workflow.md`：AI 执行前的工作流基线，需作为提示前置输入。
 - `memory/plan.md`：分阶段计划（可被 AI 重写保持最新）。

package/dist/cli.js

@@ -3802,6 +3802,44 @@ async function tailLogFile(options) {
 
 // src/cli.ts
 var FOREGROUND_CHILD_ENV = "WHEEL_AI_FOREGROUND_CHILD";
+var RUN_OPTION_SPECS = [
+  { name: "task", flags: ["-t", "--task"], valueMode: "single" },
+  { name: "iterations", flags: ["-i", "--iterations"], valueMode: "single" },
+  { name: "ai-cli", flags: ["--ai-cli"], valueMode: "single" },
+  { name: "ai-args", flags: ["--ai-args"], valueMode: "variadic" },
+  { name: "ai-prompt-arg", flags: ["--ai-prompt-arg"], valueMode: "single" },
+  { name: "notes-file", flags: ["--notes-file"], valueMode: "single" },
+  { name: "plan-file", flags: ["--plan-file"], valueMode: "single" },
+  { name: "workflow-doc", flags: ["--workflow-doc"], valueMode: "single" },
+  { name: "worktree", flags: ["--worktree"], valueMode: "none" },
+  { name: "branch", flags: ["--branch"], valueMode: "single" },
+  { name: "worktree-path", flags: ["--worktree-path"], valueMode: "single" },
+  { name: "base-branch", flags: ["--base-branch"], valueMode: "single" },
+  { name: "skip-install", flags: ["--skip-install"], valueMode: "none" },
+  { name: "run-tests", flags: ["--run-tests"], valueMode: "none" },
+  { name: "run-e2e", flags: ["--run-e2e"], valueMode: "none" },
+  { name: "unit-command", flags: ["--unit-command"], valueMode: "single" },
+  { name: "e2e-command", flags: ["--e2e-command"], valueMode: "single" },
+  { name: "auto-commit", flags: ["--auto-commit"], valueMode: "none" },
+  { name: "auto-push", flags: ["--auto-push"], valueMode: "none" },
+  { name: "pr", flags: ["--pr"], valueMode: "none" },
+  { name: "pr-title", flags: ["--pr-title"], valueMode: "single" },
+  { name: "pr-body", flags: ["--pr-body"], valueMode: "single" },
+  { name: "draft", flags: ["--draft"], valueMode: "none" },
+  { name: "reviewer", flags: ["--reviewer"], valueMode: "variadic" },
+  { name: "auto-merge", flags: ["--auto-merge"], valueMode: "none" },
+  { name: "webhook", flags: ["--webhook"], valueMode: "single" },
+  { name: "webhook-timeout", flags: ["--webhook-timeout"], valueMode: "single" },
+  { name: "multi-task-mode", flags: ["--multi-task-mode"], valueMode: "single" },
+  { name: "stop-signal", flags: ["--stop-signal"], valueMode: "single" },
+  { name: "log-file", flags: ["--log-file"], valueMode: "single" },
+  { name: "background", flags: ["--background"], valueMode: "none" },
+  { name: "verbose", flags: ["-v", "--verbose"], valueMode: "none" },
+  { name: "skip-quality", flags: ["--skip-quality"], valueMode: "none" }
+];
+var RUN_OPTION_FLAG_MAP = new Map(
+  RUN_OPTION_SPECS.flatMap((spec) => spec.flags.map((flag) => [flag, spec]))
+);
 function parseInteger(value, defaultValue) {
   const parsed = Number.parseInt(value, 10);
   if (Number.isNaN(parsed)) return defaultValue;
@@ -3837,6 +3875,102 @@ function extractAliasCommandArgs(argv, name) {
   if (rest[0] === "--") return rest.slice(1);
   return rest;
 }
+function isAliasCommandToken(token) {
+  return token === "alias" || token === "aliases";
+}
+function extractAliasRunArgs(argv, name) {
+  const args = argv.slice(2);
+  const start = args.findIndex(
+    (arg, index) => isAliasCommandToken(arg) && args[index + 1] === "run" && args[index + 2] === name
+  );
+  if (start < 0) return [];
+  const rest = args.slice(start + 3);
+  if (rest[0] === "--") return rest.slice(1);
+  return rest;
+}
+function normalizeAliasCommandArgs(args) {
+  let start = 0;
+  if (args[start] === "wheel-ai") {
+    start += 1;
+  }
+  if (args[start] === "run") {
+    start += 1;
+  }
+  return args.slice(start);
+}
+function resolveRunOptionSpec(token) {
+  const equalIndex = token.indexOf("=");
+  const flag = equalIndex > 0 ? token.slice(0, equalIndex) : token;
+  const spec = RUN_OPTION_FLAG_MAP.get(flag);
+  if (!spec) return null;
+  if (equalIndex > 0) {
+    return { spec, inlineValue: token.slice(equalIndex + 1) };
+  }
+  return { spec };
+}
+function parseArgSegments(tokens) {
+  const segments = [];
+  let index = 0;
+  while (index < tokens.length) {
+    const token = tokens[index];
+    if (token === "--") {
+      segments.push({ tokens: tokens.slice(index) });
+      break;
+    }
+    const match = resolveRunOptionSpec(token);
+    if (!match) {
+      segments.push({ tokens: [token] });
+      index += 1;
+      continue;
+    }
+    if (match.inlineValue !== void 0) {
+      segments.push({ name: match.spec.name, tokens: [token] });
+      index += 1;
+      continue;
+    }
+    if (match.spec.valueMode === "none") {
+      segments.push({ name: match.spec.name, tokens: [token] });
+      index += 1;
+      continue;
+    }
+    if (match.spec.valueMode === "single") {
+      const next = tokens[index + 1];
+      if (next !== void 0) {
+        segments.push({ name: match.spec.name, tokens: [token, next] });
+        index += 2;
+      } else {
+        segments.push({ name: match.spec.name, tokens: [token] });
+        index += 1;
+      }
+      continue;
+    }
+    const values = [];
+    let cursor = index + 1;
+    while (cursor < tokens.length) {
+      const next = tokens[cursor];
+      if (next === "--") break;
+      const nextMatch = resolveRunOptionSpec(next);
+      if (nextMatch) break;
+      values.push(next);
+      cursor += 1;
+    }
+    segments.push({ name: match.spec.name, tokens: [token, ...values] });
+    index = cursor;
+  }
+  return segments;
+}
+function mergeAliasCommandArgs(aliasTokens, additionTokens) {
+  const aliasSegments = parseArgSegments(aliasTokens);
+  const additionSegments = parseArgSegments(additionTokens);
+  const overrideNames = new Set(
+    additionSegments.flatMap((segment) => segment.name ? [segment.name] : [])
+  );
+  const merged = [
+    ...aliasSegments.filter((segment) => !segment.name || !overrideNames.has(segment.name)),
+    ...additionSegments
+  ];
+  return merged.flatMap((segment) => segment.tokens);
+}
 async function runForegroundWithDetach(options) {
   const args = buildBackgroundArgs(options.argv, options.logFile, options.branchName, options.injectBranch);
   const child = (0, import_node_child_process.spawn)(process.execPath, [...process.execArgv, ...args], {
@@ -3921,6 +4055,10 @@ async function runCli(argv) {
   const effectiveArgv = applyShortcutArgv(argv, globalConfig);
   const program = new import_commander.Command();
   program.name("wheel-ai").description("\u57FA\u4E8E AI CLI \u7684\u6301\u7EED\u8FED\u4EE3\u5F00\u53D1\u5DE5\u5177").version("1.0.0");
+  program.addHelpText(
+    "after",
+    "\n\u522B\u540D\u6267\u884C\uFF1A\n  wheel-ai alias run <alias> <addition...>\n  \u8FFD\u52A0\u547D\u4EE4\u4E0E alias \u91CD\u53E0\u65F6\uFF0C\u4EE5\u8FFD\u52A0\u4E3A\u51C6\u3002\n"
+  );
   program.command("run").option("-t, --task <task>", "\u9700\u8981\u5B8C\u6210\u7684\u4EFB\u52A1\u63CF\u8FF0\uFF08\u53EF\u91CD\u590D\u4F20\u5165\uFF0C\u72EC\u7ACB\u5904\u7406\uFF09", collect, []).option("-i, --iterations <number>", "\u6700\u5927\u8FED\u4EE3\u6B21\u6570", (value) => parseInteger(value, 5), 5).option("--ai-cli <command>", "AI CLI \u547D\u4EE4", "claude").option("--ai-args <args...>", "AI CLI \u53C2\u6570", []).option("--ai-prompt-arg <flag>", "\u7528\u4E8E\u4F20\u5165 prompt \u7684\u53C2\u6570\uFF08\u4E3A\u7A7A\u5219\u4F7F\u7528 stdin\uFF09").option("--notes-file <path>", "\u6301\u4E45\u5316\u8BB0\u5FC6\u6587\u4EF6", defaultNotesPath()).option("--plan-file <path>", "\u8BA1\u5212\u6587\u4EF6", defaultPlanPath()).option("--workflow-doc <path>", "AI \u5DE5\u4F5C\u6D41\u7A0B\u8BF4\u660E\u6587\u4EF6", defaultWorkflowDoc()).option("--worktree", "\u5728\u72EC\u7ACB worktree \u4E0A\u6267\u884C", false).option("--branch <name>", "worktree \u5206\u652F\u540D\uFF08\u9ED8\u8BA4\u81EA\u52A8\u751F\u6210\u6216\u5F53\u524D\u5206\u652F\uFF09").option("--worktree-path <path>", "worktree \u8DEF\u5F84\uFF0C\u9ED8\u8BA4 ../worktrees/<branch>").option("--base-branch <name>", "\u521B\u5EFA\u5206\u652F\u7684\u57FA\u7EBF\u5206\u652F", "main").option("--skip-install", "\u8DF3\u8FC7\u5F00\u59CB\u4EFB\u52A1\u524D\u7684\u4F9D\u8D56\u68C0\u67E5", false).option("--run-tests", "\u8FD0\u884C\u5355\u5143\u6D4B\u8BD5\u547D\u4EE4", false).option("--run-e2e", "\u8FD0\u884C e2e \u6D4B\u8BD5\u547D\u4EE4", false).option("--unit-command <cmd>", "\u5355\u5143\u6D4B\u8BD5\u547D\u4EE4", "yarn test").option("--e2e-command <cmd>", "e2e \u6D4B\u8BD5\u547D\u4EE4", "yarn e2e").option("--auto-commit", "\u81EA\u52A8 git commit", false).option("--auto-push", "\u81EA\u52A8 git push", false).option("--pr", "\u4F7F\u7528 gh \u521B\u5EFA PR", false).option("--pr-title <title>", "PR \u6807\u9898").option("--pr-body <path>", "PR \u63CF\u8FF0\u6587\u4EF6\u8DEF\u5F84\uFF08\u53EF\u7559\u7A7A\u81EA\u52A8\u751F\u6210\uFF09").option("--draft", "\u4EE5\u8349\u7A3F\u5F62\u5F0F\u521B\u5EFA PR", false).option("--reviewer <user...>", "PR reviewers", collect, []).option("--auto-merge", "PR \u68C0\u67E5\u901A\u8FC7\u540E\u81EA\u52A8\u5408\u5E76", false).option("--webhook <url>", "webhook \u901A\u77E5 URL\uFF08\u53EF\u91CD\u590D\uFF09", collect, []).option("--webhook-timeout <ms>", "webhook \u8BF7\u6C42\u8D85\u65F6\uFF08\u6BEB\u79D2\uFF09", (value) => parseInteger(value, 8e3)).option("--multi-task-mode <mode>", "\u591A\u4EFB\u52A1\u6267\u884C\u6A21\u5F0F\uFF08relay/serial/serial-continue/parallel\uFF0C\u6216\u4E2D\u6587\u63CF\u8FF0\uFF09", "relay").option("--stop-signal <token>", "AI \u8F93\u51FA\u4E2D\u7684\u505C\u6B62\u6807\u8BB0", "<<DONE>>").option("--log-file <path>", "\u65E5\u5FD7\u8F93\u51FA\u6587\u4EF6\u8DEF\u5F84").option("--background", "\u5207\u5165\u540E\u53F0\u8FD0\u884C", false).option("-v, --verbose", "\u8F93\u51FA\u8C03\u8BD5\u65E5\u5FD7", false).option("--skip-quality", "\u8DF3\u8FC7\u4EE3\u7801\u8D28\u91CF\u68C0\u67E5", false).action(async (options) => {
     const tasks = normalizeTaskList(options.task);
     if (tasks.length === 0) {
@@ -4097,7 +4235,39 @@ async function runCli(argv) {
     await upsertAliasEntry(normalized, commandLine);
     console.log(`\u5DF2\u5199\u5165 alias\uFF1A${normalized}`);
   });
-  program.command("alias").alias("aliases").description("\u6D4F\u89C8\u5168\u5C40 alias \u914D\u7F6E").action(async () => {
+  const aliasCommand = program.command("alias").alias("aliases").description("\u6D4F\u89C8\u5168\u5C40 alias \u914D\u7F6E\uFF08alias run \u53EF\u6267\u884C\u5E76\u8FFD\u52A0\u547D\u4EE4\uFF09");
+  aliasCommand.command("run <name> [addition...]").description("\u6267\u884C alias \u5E76\u8FFD\u52A0\u547D\u4EE4").allowUnknownOption(true).allowExcessArguments(true).action(async (name) => {
+    const normalized = normalizeAliasName(name);
+    if (!normalized) {
+      throw new Error("alias \u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A\u4E14\u4E0D\u80FD\u5305\u542B\u7A7A\u767D\u5B57\u7B26");
+    }
+    const filePath = getGlobalConfigPath();
+    const exists = await import_fs_extra12.default.pathExists(filePath);
+    if (!exists) {
+      throw new Error(`\u672A\u627E\u5230 alias \u914D\u7F6E\u6587\u4EF6\uFF1A${filePath}`);
+    }
+    const content = await import_fs_extra12.default.readFile(filePath, "utf8");
+    const entries = parseAliasEntries(content);
+    const entry = entries.find((item) => item.name === normalized);
+    if (!entry) {
+      throw new Error(`\u672A\u627E\u5230 alias\uFF1A${normalized}`);
+    }
+    const aliasTokens = normalizeAliasCommandArgs(splitCommandArgs(entry.command));
+    const additionTokens = extractAliasRunArgs(effectiveArgv, normalized);
+    const mergedTokens = mergeAliasCommandArgs(aliasTokens, additionTokens);
+    if (mergedTokens.length === 0) {
+      throw new Error("alias \u547D\u4EE4\u4E0D\u80FD\u4E3A\u7A7A");
+    }
+    const nextArgv = [process.argv[0], process.argv[1], "run", ...mergedTokens];
+    const originalArgv = process.argv;
+    process.argv = nextArgv;
+    try {
+      await runCli(nextArgv);
+    } finally {
+      process.argv = originalArgv;
+    }
+  });
+  aliasCommand.action(async () => {
     await runAliasViewer();
   });
   await program.parseAsync(effectiveArgv);