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

package/dist/index.js

@@ -149,6 +149,15 @@ async function runCommand(command, args, options = {}) {
 function isoNow() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
+function localTimestamp(date = /* @__PURE__ */ new Date()) {
+  const year = date.getFullYear();
+  const month = pad2(date.getMonth() + 1);
+  const day = pad2(date.getDate());
+  const hours = pad2(date.getHours());
+  const minutes = pad2(date.getMinutes());
+  const seconds = pad2(date.getSeconds());
+  return `${year}${month}${day}-${hours}${minutes}${seconds}`;
+}
 function resolvePath(cwd, target) {
   return import_node_path.default.isAbsolute(target) ? target : import_node_path.default.join(cwd, target);
 }
@@ -392,10 +401,37 @@ function normalizeShortcutName(name) {
 function normalizeAliasName(name) {
   return normalizeShortcutName(name);
 }
+function normalizeAgentName(name) {
+  return normalizeShortcutName(name);
+}
 function formatTomlString(value) {
   const escaped = value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t");
   return `"${escaped}"`;
 }
+function collectSectionRanges(lines) {
+  const ranges = [];
+  let current = null;
+  for (let i = 0; i < lines.length; i += 1) {
+    const match = /^\s*\[(.+?)\]\s*$/.exec(lines[i]);
+    if (!match) continue;
+    if (current) {
+      current.end = i;
+      ranges.push(current);
+    }
+    current = {
+      name: match[1].trim(),
+      start: i,
+      end: lines.length
+    };
+  }
+  if (current) {
+    ranges.push(current);
+  }
+  return ranges;
+}
+function isAgentSection(name) {
+  return name === "agent" || name === "agents";
+}
 function updateAliasContent(content, name, command) {
   const lines = content.split(/\r?\n/);
   const entryLine = `${name} = ${formatTomlString(command)}`;
@@ -439,6 +475,33 @@ ${entryLine}
   return output.endsWith("\n") ? output : `${output}
 `;
 }
+function removeAliasContent(content, name) {
+  const lines = content.split(/\r?\n/);
+  let currentSection = null;
+  const removeIndices = [];
+  for (let i = 0; i < lines.length; i += 1) {
+    const sectionMatch = /^\s*\[(.+?)\]\s*$/.exec(lines[i]);
+    if (sectionMatch) {
+      currentSection = sectionMatch[1].trim();
+      continue;
+    }
+    if (currentSection !== "alias") continue;
+    const parsed = parseTomlKeyValue(stripTomlComment(lines[i]).trim());
+    if (!parsed) continue;
+    if (parsed.key === name) {
+      removeIndices.push(i);
+    }
+  }
+  if (removeIndices.length === 0) {
+    return { removed: false, nextContent: ensureTrailingNewline(content) };
+  }
+  removeIndices.sort((a, b) => b - a).forEach((index) => {
+    lines.splice(index, 1);
+  });
+  const output = lines.join("\n");
+  return { removed: true, nextContent: output.endsWith("\n") ? output : `${output}
+` };
+}
 async function upsertAliasEntry(name, command, filePath = getGlobalConfigPath()) {
   const exists = await import_fs_extra2.default.pathExists(filePath);
   const content = exists ? await import_fs_extra2.default.readFile(filePath, "utf8") : "";
@@ -446,6 +509,104 @@ async function upsertAliasEntry(name, command, filePath = getGlobalConfigPath())
   await import_fs_extra2.default.mkdirp(import_node_path3.default.dirname(filePath));
   await import_fs_extra2.default.writeFile(filePath, nextContent, "utf8");
 }
+async function removeAliasEntry(name, filePath = getGlobalConfigPath()) {
+  const exists = await import_fs_extra2.default.pathExists(filePath);
+  if (!exists) return false;
+  const content = await import_fs_extra2.default.readFile(filePath, "utf8");
+  const { removed, nextContent } = removeAliasContent(content, name);
+  if (!removed) return false;
+  await import_fs_extra2.default.writeFile(filePath, nextContent, "utf8");
+  return true;
+}
+function ensureTrailingNewline(content) {
+  if (!content) return "";
+  return content.endsWith("\n") ? content : `${content}
+`;
+}
+function findAgentRangeWithEntry(lines, ranges, name) {
+  for (const range of ranges) {
+    for (let i = range.start + 1; i < range.end; i += 1) {
+      const parsed = parseTomlKeyValue(stripTomlComment(lines[i]).trim());
+      if (!parsed) continue;
+      if (parsed.key === name) return range;
+    }
+  }
+  return null;
+}
+function updateAgentContent(content, name, command) {
+  const lines = content.split(/\r?\n/);
+  const entryLine = `${name} = ${formatTomlString(command)}`;
+  const ranges = collectSectionRanges(lines);
+  const agentRanges = ranges.filter((range) => isAgentSection(range.name));
+  let targetRange = findAgentRangeWithEntry(lines, agentRanges, name);
+  if (!targetRange) {
+    targetRange = agentRanges.find((range) => range.name === "agent") ?? agentRanges.find((range) => range.name === "agents") ?? null;
+  }
+  if (!targetRange) {
+    const trimmed = content.trimEnd();
+    const prefix = trimmed.length > 0 ? `${trimmed}
+
+` : "";
+    return `${prefix}[agent]
+${entryLine}
+`;
+  }
+  let replaced = false;
+  for (let i = targetRange.start + 1; i < targetRange.end; i += 1) {
+    const parsed = parseTomlKeyValue(stripTomlComment(lines[i]).trim());
+    if (!parsed) continue;
+    if (parsed.key === name) {
+      lines[i] = entryLine;
+      replaced = true;
+      break;
+    }
+  }
+  if (!replaced) {
+    lines.splice(targetRange.end, 0, entryLine);
+  }
+  const output = lines.join("\n");
+  return output.endsWith("\n") ? output : `${output}
+`;
+}
+function removeAgentContent(content, name) {
+  const lines = content.split(/\r?\n/);
+  const ranges = collectSectionRanges(lines).filter((range) => isAgentSection(range.name));
+  const removeIndices = [];
+  for (const range of ranges) {
+    for (let i = range.start + 1; i < range.end; i += 1) {
+      const parsed = parseTomlKeyValue(stripTomlComment(lines[i]).trim());
+      if (!parsed) continue;
+      if (parsed.key === name) {
+        removeIndices.push(i);
+      }
+    }
+  }
+  if (removeIndices.length === 0) {
+    return { removed: false, nextContent: ensureTrailingNewline(content) };
+  }
+  removeIndices.sort((a, b) => b - a).forEach((index) => {
+    lines.splice(index, 1);
+  });
+  const output = lines.join("\n");
+  return { removed: true, nextContent: output.endsWith("\n") ? output : `${output}
+` };
+}
+async function upsertAgentEntry(name, command, filePath = getGlobalConfigPath()) {
+  const exists = await import_fs_extra2.default.pathExists(filePath);
+  const content = exists ? await import_fs_extra2.default.readFile(filePath, "utf8") : "";
+  const nextContent = updateAgentContent(content, name, command);
+  await import_fs_extra2.default.mkdirp(import_node_path3.default.dirname(filePath));
+  await import_fs_extra2.default.writeFile(filePath, nextContent, "utf8");
+}
+async function removeAgentEntry(name, filePath = getGlobalConfigPath()) {
+  const exists = await import_fs_extra2.default.pathExists(filePath);
+  if (!exists) return false;
+  const content = await import_fs_extra2.default.readFile(filePath, "utf8");
+  const { removed, nextContent } = removeAgentContent(content, name);
+  if (!removed) return false;
+  await import_fs_extra2.default.writeFile(filePath, nextContent, "utf8");
+  return true;
+}
 function parseGlobalConfig(content) {
   const lines = content.split(/\r?\n/);
   let currentSection = null;
@@ -512,6 +673,34 @@ function parseAliasEntries(content) {
   }
   return entries;
 }
+function parseAgentEntries(content) {
+  const lines = content.split(/\r?\n/);
+  let currentSection = null;
+  const entries = [];
+  const names = /* @__PURE__ */ new Set();
+  for (const rawLine of lines) {
+    const line = stripTomlComment(rawLine).trim();
+    if (!line) continue;
+    const sectionMatch = /^\[(.+)\]$/.exec(line);
+    if (sectionMatch) {
+      currentSection = sectionMatch[1].trim();
+      continue;
+    }
+    if (!isAgentSection(currentSection)) continue;
+    const parsed = parseTomlKeyValue(line);
+    if (!parsed) continue;
+    const name = normalizeShortcutName(parsed.key);
+    const command = parsed.value.trim();
+    if (!name || !command) continue;
+    if (names.has(name)) continue;
+    names.add(name);
+    entries.push({
+      name,
+      command
+    });
+  }
+  return entries;
+}
 async function loadGlobalConfig(logger) {
   const filePath = getGlobalConfigPath();
   const exists = await import_fs_extra2.default.pathExists(filePath);
@@ -1215,7 +1404,7 @@ async function readLogLines(logFile) {
 }
 function buildListHeader(state, columns) {
   const total = state.logs.length;
-  const title = `\u65E5\u5FD7\u5217\u8868\uFF08${total} \u6761\uFF09\uFF5C\u2191/\u2193 \u9009\u62E9  Enter \u67E5\u770B  q \u9000\u51FA`;
+  const title = `\u65E5\u5FD7\u5217\u8868\uFF08${total} \u6761\uFF09\uFF5C\u2191/\u2193 \u9009\u62E9  PageUp/PageDown \u7FFB\u9875  Enter \u67E5\u770B  q \u9000\u51FA`;
   return truncateLine2(title, columns);
 }
 function buildListStatus(state, columns) {
@@ -1430,6 +1619,18 @@ async function runLogsViewer() {
         render2(state);
         return;
       }
+      if (isPageUp(input)) {
+        const pageSize = getPageSize2(getTerminalSize2().rows);
+        state.selectedIndex = clampIndex2(state.selectedIndex - pageSize, state.logs.length);
+        render2(state);
+        return;
+      }
+      if (isPageDown(input)) {
+        const pageSize = getPageSize2(getTerminalSize2().rows);
+        state.selectedIndex = clampIndex2(state.selectedIndex + pageSize, state.logs.length);
+        render2(state);
+        return;
+      }
       if (isEnter(input)) {
         void openView();
         return;
@@ -2535,13 +2736,26 @@ function normalizeWebhookUrls(urls) {
   return urls.map((url) => url.trim()).filter((url) => url.length > 0);
 }
 function buildWebhookPayload(input) {
-  return {
-    event: input.event,
-    task: input.task,
+  const base = {
     branch: input.branch ?? "",
     iteration: input.iteration,
     stage: input.stage,
-    timestamp: input.timestamp ?? isoNow()
+    timestamp: input.timestamp ?? localTimestamp(),
+    project: input.project,
+    commit: input.commit ?? "",
+    pr: input.pr ?? "",
+    ...input.plan !== void 0 ? { plan: input.plan } : {}
+  };
+  if (input.event === "task_start") {
+    return {
+      ...base,
+      event: "task_start",
+      task: input.task
+    };
+  }
+  return {
+    ...base,
+    event: input.event
   };
 }
 function resolveFetcher(fetcher) {
@@ -2599,11 +2813,14 @@ function trimOutput(output, limit = MAX_LOG_LENGTH) {
   return `${output.slice(0, limit)}
 \u2026\u2026\uFF08\u8F93\u51FA\u5DF2\u622A\u65AD\uFF0C\u539F\u59CB\u957F\u5EA6 ${output.length} \u5B57\u7B26\uFF09`;
 }
-function truncateText(text, limit = 24) {
+function truncateText(text, limit = 100) {
   const trimmed = text.trim();
   if (trimmed.length <= limit) return trimmed;
   return `${trimmed.slice(0, limit)}...`;
 }
+function normalizePlanForWebhook(plan) {
+  return plan.replace(/\r\n?/g, "\n");
+}
 async function safeCommandOutput(command, args, cwd, logger, label, verboseCommand) {
   const result = await runCommand(command, args, {
     cwd,
@@ -2617,6 +2834,41 @@ async function safeCommandOutput(command, args, cwd, logger, label, verboseComma
   }
   return result.stdout.trim();
 }
+function normalizeWebhookUrl(value) {
+  if (!value) return "";
+  const trimmed = value.trim();
+  if (!/^https?:\/\//i.test(trimmed)) return "";
+  return trimmed;
+}
+function normalizeRepoUrl(remoteUrl) {
+  const trimmed = remoteUrl.trim();
+  if (!trimmed) return null;
+  const withoutGit = trimmed.replace(/\.git$/i, "");
+  if (withoutGit.includes("://")) {
+    try {
+      const parsed = new URL(withoutGit);
+      const protocol = parsed.protocol === "http:" || parsed.protocol === "https:" ? parsed.protocol : "https:";
+      const pathname = parsed.pathname.replace(/\.git$/i, "");
+      return `${protocol}//${parsed.host}${pathname}`.replace(/\/+$/, "");
+    } catch {
+      return null;
+    }
+  }
+  const scpMatch = withoutGit.match(/^(?:[^@]+@)?([^:]+):(.+)$/);
+  if (!scpMatch) return null;
+  const host = scpMatch[1];
+  const repoPath = scpMatch[2];
+  return `https://${host}/${repoPath}`.replace(/\/+$/, "");
+}
+async function resolveCommitLink(cwd, logger) {
+  const sha = await safeCommandOutput("git", ["rev-parse", "HEAD"], cwd, logger, "git", "git rev-parse HEAD");
+  if (!sha) return "";
+  const remote = await safeCommandOutput("git", ["remote", "get-url", "origin"], cwd, logger, "git", "git remote get-url origin");
+  if (!remote) return "";
+  const repoUrl = normalizeRepoUrl(remote);
+  if (!repoUrl) return "";
+  return `${repoUrl}/commit/${sha}`;
+}
 async function runSingleTest(kind, command, cwd, logger) {
   const label = kind === "unit" ? "\u5355\u5143\u6D4B\u8BD5" : "e2e \u6D4B\u8BD5";
   logger.info(`\u6267\u884C${label}: ${command}`);
@@ -2809,14 +3061,33 @@ async function runLoop(config) {
   let prInfo = null;
   let prFailed = false;
   let sessionIndex = 0;
+  let commitLink = "";
+  let prLink = "";
+  let commitCreated = false;
+  let pushSucceeded = false;
   const preWorktreeRecords = [];
-  const notifyWebhook = async (event, iteration, stage) => {
-    const payload = buildWebhookPayload({
+  const resolveProjectName = () => import_node_path9.default.basename(workDir);
+  const notifyWebhook = async (event, iteration, stage, plan) => {
+    const project = resolveProjectName();
+    const payload = event === "task_start" ? buildWebhookPayload({
       event,
       task: config.task,
       branch: branchName,
       iteration,
-      stage
+      stage,
+      project,
+      commit: commitLink,
+      pr: prLink,
+      plan
+    }) : buildWebhookPayload({
+      event,
+      branch: branchName,
+      iteration,
+      stage,
+      project,
+      commit: commitLink,
+      pr: prLink,
+      plan
     });
     await sendWebhookNotifications(config.webhooks, payload, logger);
   };
@@ -2894,7 +3165,8 @@ async function runLoop(config) {
     });
     const runAiSession = async (stage, prompt, extras) => {
       sessionIndex += 1;
-      await notifyWebhook("iteration_start", sessionIndex, stage);
+      const webhookPlan = stage === "\u8BA1\u5212\u751F\u6210" ? normalizePlanForWebhook(await readFileSafe(workflowFiles.planFile)) : void 0;
+      await notifyWebhook("iteration_start", sessionIndex, stage, webhookPlan);
       logger.info(`${stage} \u63D0\u793A\u6784\u5EFA\u5B8C\u6210\uFF0C\u8C03\u7528 AI CLI...`);
       const aiResult = await runAi(prompt, aiConfig, logger, extras?.cwd ?? workDir);
       accumulatedUsage = mergeTokenUsage(accumulatedUsage, aiResult.usage);
@@ -3110,6 +3382,7 @@ async function runLoop(config) {
         };
         try {
           const committed = await commitAll(commitMessage, workDir, logger);
+          commitCreated = committed;
           deliveryNotes.push(committed ? `\u81EA\u52A8\u63D0\u4EA4\uFF1A\u5DF2\u63D0\u4EA4\uFF08${commitMessage.title}\uFF09` : "\u81EA\u52A8\u63D0\u4EA4\uFF1A\u672A\u751F\u6210\u63D0\u4EA4\uFF08\u53EF\u80FD\u65E0\u53D8\u66F4\u6216\u63D0\u4EA4\u5931\u8D25\uFF09");
         } catch (error) {
           deliveryNotes.push(`\u81EA\u52A8\u63D0\u4EA4\uFF1A\u5931\u8D25\uFF08${String(error)}\uFF09`);
@@ -3126,6 +3399,7 @@ async function runLoop(config) {
       } else {
         try {
           await pushBranch(branchName, workDir, logger);
+          pushSucceeded = true;
           deliveryNotes.push(`\u81EA\u52A8\u63A8\u9001\uFF1A\u5DF2\u63A8\u9001\uFF08${branchName}\uFF09`);
         } catch (error) {
           deliveryNotes.push(`\u81EA\u52A8\u63A8\u9001\uFF1A\u5931\u8D25\uFF08${String(error)}\uFF09`);
@@ -3134,6 +3408,9 @@ async function runLoop(config) {
     } else {
       deliveryNotes.push("\u81EA\u52A8\u63A8\u9001\uFF1A\u672A\u5F00\u542F");
     }
+    if (commitCreated && pushSucceeded) {
+      commitLink = await resolveCommitLink(workDir, logger);
+    }
     if (config.pr.enable) {
       if (lastTestFailed) {
         deliveryNotes.push("PR \u521B\u5EFA\uFF1A\u5DF2\u8DF3\u8FC7\uFF08\u6D4B\u8BD5\u672A\u901A\u8FC7\uFF09");
@@ -3192,6 +3469,7 @@ async function runLoop(config) {
     } else {
       deliveryNotes.push("PR \u521B\u5EFA\uFF1A\u672A\u5F00\u542F\uFF08\u7F3A\u5C11\u5206\u652F\u540D\uFF09");
     }
+    prLink = normalizeWebhookUrl(prInfo?.url);
     if (deliveryNotes.length > 0) {
       const record = formatSystemRecord("\u63D0\u4EA4\u4E0EPR", deliveryNotes.join("\n"), isoNow());
       await appendSection(workflowFiles.notesFile, record);
@@ -3843,6 +4121,8 @@ var RUN_OPTION_SPECS = [
 var RUN_OPTION_FLAG_MAP = new Map(
   RUN_OPTION_SPECS.flatMap((spec) => spec.flags.map((flag) => [flag, spec]))
 );
+var USE_ALIAS_FLAG = "--use-alias";
+var USE_AGENT_FLAG = "--use-agent";
 function parseInteger(value, defaultValue) {
   const parsed = Number.parseInt(value, 10);
   if (Number.isNaN(parsed)) return defaultValue;
@@ -3872,7 +4152,21 @@ function buildBackgroundArgs(argv, logFile, branchName, injectBranch = false) {
 }
 function extractAliasCommandArgs(argv, name) {
   const args = argv.slice(2);
-  const start = args.findIndex((arg, index) => arg === "set" && args[index + 1] === "alias" && args[index + 2] === name);
+  const start = args.findIndex((arg, index) => {
+    const legacyMatch = arg === "set" && args[index + 1] === "alias" && args[index + 2] === name;
+    const aliasMatch = isAliasCommandToken(arg) && args[index + 1] === "set" && args[index + 2] === name;
+    return legacyMatch || aliasMatch;
+  });
+  if (start < 0) return [];
+  const rest = args.slice(start + 3);
+  if (rest[0] === "--") return rest.slice(1);
+  return rest;
+}
+function extractAgentCommandArgs(argv, action, name) {
+  const args = argv.slice(2);
+  const start = args.findIndex(
+    (arg, index) => arg === "agent" && args[index + 1] === action && args[index + 2] === name
+  );
   if (start < 0) return [];
   const rest = args.slice(start + 3);
   if (rest[0] === "--") return rest.slice(1);
@@ -3891,7 +4185,7 @@ function extractAliasRunArgs(argv, name) {
   if (rest[0] === "--") return rest.slice(1);
   return rest;
 }
-function normalizeAliasCommandArgs(args) {
+function normalizeRunCommandArgs(args) {
   let start = 0;
   if (args[start] === "wheel-ai") {
     start += 1;
@@ -3962,18 +4256,133 @@ function parseArgSegments(tokens) {
   }
   return segments;
 }
-function mergeAliasCommandArgs(aliasTokens, additionTokens) {
-  const aliasSegments = parseArgSegments(aliasTokens);
+function mergeRunCommandArgs(baseTokens, additionTokens) {
+  const baseSegments = parseArgSegments(baseTokens);
   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)),
+    ...baseSegments.filter((segment) => !segment.name || !overrideNames.has(segment.name)),
     ...additionSegments
   ];
   return merged.flatMap((segment) => segment.tokens);
 }
+function extractRunCommandArgs(argv) {
+  const args = argv.slice(2);
+  const start = args.findIndex((arg) => arg === "run");
+  if (start < 0) return [];
+  return args.slice(start + 1);
+}
+function parseUseOptionToken(token, flag) {
+  if (token === flag) {
+    return { matched: true };
+  }
+  if (token.startsWith(`${flag}=`)) {
+    return { matched: true, value: token.slice(flag.length + 1) };
+  }
+  return { matched: false };
+}
+function resolveUseOption(tokens, index) {
+  const token = tokens[index];
+  const aliasMatch = parseUseOptionToken(token, USE_ALIAS_FLAG);
+  if (aliasMatch.matched) {
+    const value = aliasMatch.value ?? tokens[index + 1];
+    if (!value) {
+      throw new Error(`${USE_ALIAS_FLAG} \u9700\u8981\u63D0\u4F9B\u540D\u79F0`);
+    }
+    const nextIndex = aliasMatch.value ? index + 1 : index + 2;
+    return { type: "alias", name: value, nextIndex };
+  }
+  const agentMatch = parseUseOptionToken(token, USE_AGENT_FLAG);
+  if (agentMatch.matched) {
+    const value = agentMatch.value ?? tokens[index + 1];
+    if (!value) {
+      throw new Error(`${USE_AGENT_FLAG} \u9700\u8981\u63D0\u4F9B\u540D\u79F0`);
+    }
+    const nextIndex = agentMatch.value ? index + 1 : index + 2;
+    return { type: "agent", name: value, nextIndex };
+  }
+  return null;
+}
+function buildAliasRunArgs(entry) {
+  return normalizeRunCommandArgs(splitCommandArgs(entry.command));
+}
+function buildAgentRunArgs(entry) {
+  const tokens = normalizeRunCommandArgs(splitCommandArgs(entry.command));
+  if (tokens.length === 0) return [];
+  if (tokens[0].startsWith("-")) {
+    return tokens;
+  }
+  const [command, ...args] = tokens;
+  if (args.length === 0) {
+    return ["--ai-cli", command];
+  }
+  return ["--ai-cli", command, "--ai-args", ...args];
+}
+function expandRunTokens(tokens, lookup, stack) {
+  let mergedTokens = [];
+  let buffer = [];
+  let expanded = false;
+  let index = 0;
+  while (index < tokens.length) {
+    const token = tokens[index];
+    if (token === "--") {
+      buffer.push(...tokens.slice(index));
+      break;
+    }
+    const match = resolveUseOption(tokens, index);
+    if (!match) {
+      buffer.push(token);
+      index += 1;
+      continue;
+    }
+    if (buffer.length > 0) {
+      mergedTokens = mergeRunCommandArgs(mergedTokens, buffer);
+      buffer = [];
+    }
+    expanded = true;
+    if (match.type === "alias") {
+      const normalized2 = normalizeAliasName(match.name);
+      if (!normalized2) {
+        throw new Error("alias \u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A\u4E14\u4E0D\u80FD\u5305\u542B\u7A7A\u767D\u5B57\u7B26");
+      }
+      if (stack.alias.has(normalized2)) {
+        throw new Error(`alias \u5FAA\u73AF\u5F15\u7528\uFF1A${normalized2}`);
+      }
+      const entry2 = lookup.aliasEntries.get(normalized2);
+      if (!entry2) {
+        throw new Error(`\u672A\u627E\u5230 alias\uFF1A${normalized2}`);
+      }
+      stack.alias.add(normalized2);
+      const resolved2 = expandRunTokens(buildAliasRunArgs(entry2), lookup, stack);
+      stack.alias.delete(normalized2);
+      mergedTokens = mergeRunCommandArgs(mergedTokens, resolved2.tokens);
+      index = match.nextIndex;
+      continue;
+    }
+    const normalized = normalizeAgentName(match.name);
+    if (!normalized) {
+      throw new Error("agent \u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A\u4E14\u4E0D\u80FD\u5305\u542B\u7A7A\u767D\u5B57\u7B26");
+    }
+    if (stack.agent.has(normalized)) {
+      throw new Error(`agent \u5FAA\u73AF\u5F15\u7528\uFF1A${normalized}`);
+    }
+    const entry = lookup.agentEntries.get(normalized);
+    if (!entry) {
+      throw new Error(`\u672A\u627E\u5230 agent\uFF1A${normalized}`);
+    }
+    stack.agent.add(normalized);
+    const resolved = expandRunTokens(buildAgentRunArgs(entry), lookup, stack);
+    stack.agent.delete(normalized);
+    mergedTokens = mergeRunCommandArgs(mergedTokens, resolved.tokens);
+    index = match.nextIndex;
+  }
+  if (buffer.length > 0) {
+    mergedTokens = mergeRunCommandArgs(mergedTokens, buffer);
+  }
+  return { tokens: mergedTokens, expanded };
+}
 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], {
@@ -4057,12 +4466,45 @@ async function runCli(argv) {
   const globalConfig = await loadGlobalConfig(defaultLogger);
   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.name("wheel-ai").description("\u57FA\u4E8E AI CLI \u7684\u6301\u7EED\u8FED\u4EE3\u5F00\u53D1\u5DE5\u5177").version("0.2.1");
   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"
+    "\nalias \u7BA1\u7406\uFF1A\n  wheel-ai alias set <name> <options...>\n  wheel-ai alias list\n  wheel-ai alias delete <name>\n\nalias/agent \u53E0\u52A0\uFF1A\n  wheel-ai run --use-alias <name> [--use-alias <name>...]\n  wheel-ai run --use-agent <name> [--use-agent <name>...]\n  \u540C\u540D\u9009\u9879\u6309\u51FA\u73B0\u987A\u5E8F\u8986\u76D6\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) => {
+  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("--use-alias <name>", "\u53E0\u52A0 alias \u914D\u7F6E\uFF08\u53EF\u91CD\u590D\uFF09", collect, []).option("--use-agent <name>", "\u53E0\u52A0 agent \u914D\u7F6E\uFF08\u53EF\u91CD\u590D\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 rawRunArgs = extractRunCommandArgs(effectiveArgv);
+    const hasUseOptions = rawRunArgs.some(
+      (token) => token === USE_ALIAS_FLAG || token.startsWith(`${USE_ALIAS_FLAG}=`) || token === USE_AGENT_FLAG || token.startsWith(`${USE_AGENT_FLAG}=`)
+    );
+    if (hasUseOptions) {
+      const filePath = getGlobalConfigPath();
+      const exists = await import_fs_extra12.default.pathExists(filePath);
+      const content = exists ? await import_fs_extra12.default.readFile(filePath, "utf8") : "";
+      const aliasEntries = parseAliasEntries(content);
+      const agentEntries = parseAgentEntries(content);
+      const resolved = expandRunTokens(
+        rawRunArgs,
+        {
+          aliasEntries: new Map(aliasEntries.map((entry) => [entry.name, entry])),
+          agentEntries: new Map(agentEntries.map((entry) => [entry.name, entry]))
+        },
+        {
+          alias: /* @__PURE__ */ new Set(),
+          agent: /* @__PURE__ */ new Set()
+        }
+      );
+      if (resolved.expanded) {
+        const nextArgv = [process.argv[0], process.argv[1], "run", ...resolved.tokens];
+        const originalArgv = process.argv;
+        process.argv = nextArgv;
+        try {
+          await runCli(nextArgv);
+        } finally {
+          process.argv = originalArgv;
+        }
+        return;
+      }
+    }
     const tasks = normalizeTaskList(options.task);
     if (tasks.length === 0) {
       throw new Error("\u9700\u8981\u81F3\u5C11\u63D0\u4F9B\u4E00\u4E2A\u4EFB\u52A1\u63CF\u8FF0");
@@ -4225,7 +4667,78 @@ async function runCli(argv) {
   program.command("logs").description("\u67E5\u770B\u5386\u53F2\u65E5\u5FD7").action(async () => {
     await runLogsViewer();
   });
-  program.command("set").description("\u5199\u5165\u5168\u5C40\u914D\u7F6E").command("alias <name> [options...]").description("\u8BBE\u7F6E alias").allowUnknownOption(true).action(async (name) => {
+  const agentCommand = program.command("agent").description("\u7BA1\u7406 AI CLI agent \u914D\u7F6E");
+  agentCommand.command("add <name> [command...]").description("\u65B0\u589E agent").allowUnknownOption(true).allowExcessArguments(true).action(async (name) => {
+    const normalized = normalizeAgentName(name);
+    if (!normalized) {
+      throw new Error("agent \u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A\u4E14\u4E0D\u80FD\u5305\u542B\u7A7A\u767D\u5B57\u7B26");
+    }
+    const commandArgs = extractAgentCommandArgs(effectiveArgv, "add", name);
+    const commandLine = formatCommandLine(commandArgs);
+    if (!commandLine) {
+      throw new Error("agent \u547D\u4EE4\u4E0D\u80FD\u4E3A\u7A7A");
+    }
+    const filePath = getGlobalConfigPath();
+    const exists = await import_fs_extra12.default.pathExists(filePath);
+    const content = exists ? await import_fs_extra12.default.readFile(filePath, "utf8") : "";
+    const entries = parseAgentEntries(content);
+    if (entries.some((entry) => entry.name === normalized)) {
+      throw new Error(`agent \u5DF2\u5B58\u5728\uFF1A${normalized}`);
+    }
+    await upsertAgentEntry(normalized, commandLine);
+    console.log(`\u5DF2\u65B0\u589E agent\uFF1A${normalized}`);
+  });
+  agentCommand.command("set <name> [command...]").description("\u5199\u5165 agent").allowUnknownOption(true).allowExcessArguments(true).action(async (name) => {
+    const normalized = normalizeAgentName(name);
+    if (!normalized) {
+      throw new Error("agent \u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A\u4E14\u4E0D\u80FD\u5305\u542B\u7A7A\u767D\u5B57\u7B26");
+    }
+    const commandArgs = extractAgentCommandArgs(effectiveArgv, "set", name);
+    const commandLine = formatCommandLine(commandArgs);
+    if (!commandLine) {
+      throw new Error("agent \u547D\u4EE4\u4E0D\u80FD\u4E3A\u7A7A");
+    }
+    await upsertAgentEntry(normalized, commandLine);
+    console.log(`\u5DF2\u5199\u5165 agent\uFF1A${normalized}`);
+  });
+  agentCommand.command("delete <name>").description("\u5220\u9664 agent").action(async (name) => {
+    const normalized = normalizeAgentName(name);
+    if (!normalized) {
+      throw new Error("agent \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 agent \u914D\u7F6E\u6587\u4EF6\uFF1A${filePath}`);
+    }
+    const removed = await removeAgentEntry(normalized);
+    if (!removed) {
+      throw new Error(`\u672A\u627E\u5230 agent\uFF1A${normalized}`);
+    }
+    console.log(`\u5DF2\u5220\u9664 agent\uFF1A${normalized}`);
+  });
+  agentCommand.command("list").description("\u5217\u51FA agent \u914D\u7F6E").action(async () => {
+    const filePath = getGlobalConfigPath();
+    const exists = await import_fs_extra12.default.pathExists(filePath);
+    if (!exists) {
+      console.log("\u672A\u53D1\u73B0 agent \u914D\u7F6E");
+      return;
+    }
+    const content = await import_fs_extra12.default.readFile(filePath, "utf8");
+    const entries = parseAgentEntries(content);
+    if (entries.length === 0) {
+      console.log("\u672A\u53D1\u73B0 agent \u914D\u7F6E");
+      return;
+    }
+    entries.forEach((entry) => {
+      console.log(`${entry.name}: ${entry.command}`);
+    });
+  });
+  agentCommand.action(() => {
+    agentCommand.help();
+  });
+  const aliasCommand = program.command("alias").alias("aliases").description("\u7BA1\u7406\u5168\u5C40 alias \u914D\u7F6E");
+  aliasCommand.command("set <name> [options...]").description("\u5199\u5165 alias").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");
@@ -4238,7 +4751,39 @@ async function runCli(argv) {
     await upsertAliasEntry(normalized, commandLine);
     console.log(`\u5DF2\u5199\u5165 alias\uFF1A${normalized}`);
   });
-  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("list").description("\u5217\u51FA alias \u914D\u7F6E").action(async () => {
+    const filePath = getGlobalConfigPath();
+    const exists = await import_fs_extra12.default.pathExists(filePath);
+    if (!exists) {
+      console.log("\u672A\u53D1\u73B0 alias \u914D\u7F6E");
+      return;
+    }
+    const content = await import_fs_extra12.default.readFile(filePath, "utf8");
+    const entries = parseAliasEntries(content).filter((entry) => entry.source === "alias");
+    if (entries.length === 0) {
+      console.log("\u672A\u53D1\u73B0 alias \u914D\u7F6E");
+      return;
+    }
+    entries.forEach((entry) => {
+      console.log(`${entry.name}: ${entry.command}`);
+    });
+  });
+  aliasCommand.command("delete <name>").description("\u5220\u9664 alias").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 removed = await removeAliasEntry(normalized);
+    if (!removed) {
+      throw new Error(`\u672A\u627E\u5230 alias\uFF1A${normalized}`);
+    }
+    console.log(`\u5DF2\u5220\u9664 alias\uFF1A${normalized}`);
+  });
   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) {
@@ -4255,9 +4800,9 @@ async function runCli(argv) {
     if (!entry) {
       throw new Error(`\u672A\u627E\u5230 alias\uFF1A${normalized}`);
     }
-    const aliasTokens = normalizeAliasCommandArgs(splitCommandArgs(entry.command));
+    const aliasTokens = normalizeRunCommandArgs(splitCommandArgs(entry.command));
     const additionTokens = extractAliasRunArgs(effectiveArgv, normalized);
-    const mergedTokens = mergeAliasCommandArgs(aliasTokens, additionTokens);
+    const mergedTokens = mergeRunCommandArgs(aliasTokens, additionTokens);
     if (mergedTokens.length === 0) {
       throw new Error("alias \u547D\u4EE4\u4E0D\u80FD\u4E3A\u7A7A");
     }