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

package/src/global-config.ts

@@ -20,6 +20,14 @@ export interface AliasEntry {
   readonly source: 'alias' | 'shortcut';
 }
 
+/**
+ * 全局 agent 配置条目。
+ */
+export interface AgentEntry {
+  readonly name: string;
+  readonly command: string;
+}
+
 /**
  * 全局配置结构。
  */
@@ -177,6 +185,13 @@ export function normalizeAliasName(name: string): string | null {
   return normalizeShortcutName(name);
 }
 
+/**
+ * 规范化 agent 名称。
+ */
+export function normalizeAgentName(name: string): string | null {
+  return normalizeShortcutName(name);
+}
+
 function formatTomlString(value: string): string {
   const escaped = value
     .replace(/\\/g, '\\\\')
@@ -187,6 +202,43 @@ function formatTomlString(value: string): string {
   return `"${escaped}"`;
 }
 
+interface SectionRange {
+  readonly name: string;
+  readonly start: number;
+  end: number;
+}
+
+function collectSectionRanges(lines: string[]): SectionRange[] {
+  const ranges: SectionRange[] = [];
+  let current: SectionRange | null = 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: string | null): boolean {
+  return name === 'agent' || name === 'agents';
+}
+
 /**
  * 更新 alias 配置内容，返回新文本。
  */
@@ -234,6 +286,43 @@ export function updateAliasContent(content: string, name: string, command: strin
   return output.endsWith('\n') ? output : `${output}\n`;
 }
 
+/**
+ * 删除 alias 配置内容，返回删除结果与新文本。
+ */
+export function removeAliasContent(content: string, name: string): { removed: boolean; nextContent: string } {
+  const lines = content.split(/\r?\n/);
+  let currentSection: string | null = null;
+  const removeIndices: number[] = [];
+
+  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}\n` };
+}
+
 /**
  * 写入或更新 alias 配置。
  */
@@ -245,6 +334,130 @@ export async function upsertAliasEntry(name: string, command: string, filePath:
   await fs.writeFile(filePath, nextContent, 'utf8');
 }
 
+/**
+ * 删除 alias 配置，返回是否删除成功。
+ */
+export async function removeAliasEntry(name: string, filePath: string = getGlobalConfigPath()): Promise<boolean> {
+  const exists = await fs.pathExists(filePath);
+  if (!exists) return false;
+  const content = await fs.readFile(filePath, 'utf8');
+  const { removed, nextContent } = removeAliasContent(content, name);
+  if (!removed) return false;
+  await fs.writeFile(filePath, nextContent, 'utf8');
+  return true;
+}
+
+function ensureTrailingNewline(content: string): string {
+  if (!content) return '';
+  return content.endsWith('\n') ? content : `${content}\n`;
+}
+
+function findAgentRangeWithEntry(lines: string[], ranges: SectionRange[], name: string): SectionRange | null {
+  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;
+}
+
+/**
+ * 更新 agent 配置内容，返回新文本。
+ */
+export function updateAgentContent(content: string, name: string, command: string): string {
+  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}\n\n` : '';
+    return `${prefix}[agent]\n${entryLine}\n`;
+  }
+
+  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}\n`;
+}
+
+/**
+ * 删除 agent 配置内容，返回删除结果与新文本。
+ */
+export function removeAgentContent(content: string, name: string): { removed: boolean; nextContent: string } {
+  const lines = content.split(/\r?\n/);
+  const ranges = collectSectionRanges(lines).filter(range => isAgentSection(range.name));
+  const removeIndices: number[] = [];
+
+  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}\n` };
+}
+
+/**
+ * 写入或更新 agent 配置。
+ */
+export async function upsertAgentEntry(name: string, command: string, filePath: string = getGlobalConfigPath()): Promise<void> {
+  const exists = await fs.pathExists(filePath);
+  const content = exists ? await fs.readFile(filePath, 'utf8') : '';
+  const nextContent = updateAgentContent(content, name, command);
+  await fs.mkdirp(path.dirname(filePath));
+  await fs.writeFile(filePath, nextContent, 'utf8');
+}
+
+/**
+ * 删除 agent 配置，返回是否删除成功。
+ */
+export async function removeAgentEntry(name: string, filePath: string = getGlobalConfigPath()): Promise<boolean> {
+  const exists = await fs.pathExists(filePath);
+  if (!exists) return false;
+  const content = await fs.readFile(filePath, 'utf8');
+  const { removed, nextContent } = removeAgentContent(content, name);
+  if (!removed) return false;
+  await fs.writeFile(filePath, nextContent, 'utf8');
+  return true;
+}
+
 /**
  * 解析全局 TOML 配置文本。
  */
@@ -332,6 +545,44 @@ export function parseAliasEntries(content: string): AliasEntry[] {
   return entries;
 }
 
+/**
+ * 解析 agent 配置条目（支持 [agent]/[agents]）。
+ */
+export function parseAgentEntries(content: string): AgentEntry[] {
+  const lines = content.split(/\r?\n/);
+  let currentSection: string | null = null;
+  const entries: AgentEntry[] = [];
+  const names = new Set<string>();
+
+  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;
+}
+
 /**
  * 读取用户目录下的全局配置。
  */

package/src/logs-viewer.ts

@@ -144,7 +144,7 @@ async function readLogLines(logFile: string): Promise<string[]> {
 
 function buildListHeader(state: LogsViewerState, columns: number): string {
   const total = state.logs.length;
-  const title = `日志列表（${total} 条）｜↑/↓ 选择  Enter 查看  q 退出`;
+  const title = `日志列表（${total} 条）｜↑/↓ 选择  PageUp/PageDown 翻页  Enter 查看  q 退出`;
   return truncateLine(title, columns);
 }
 
@@ -397,6 +397,18 @@ export async function runLogsViewer(): Promise<void> {
         render(state);
         return;
       }
+      if (isPageUp(input)) {
+        const pageSize = getPageSize(getTerminalSize().rows);
+        state.selectedIndex = clampIndex(state.selectedIndex - pageSize, state.logs.length);
+        render(state);
+        return;
+      }
+      if (isPageDown(input)) {
+        const pageSize = getPageSize(getTerminalSize().rows);
+        state.selectedIndex = clampIndex(state.selectedIndex + pageSize, state.logs.length);
+        render(state);
+        return;
+      }
       if (isEnter(input)) {
         void openView();
         return;

package/src/loop.ts

@@ -24,7 +24,7 @@ import { createRunTracker } from './runtime-tracker';
 import { buildFallbackSummary, buildSummaryPrompt, ensurePrBodySections, parseDeliverySummary } from './summary';
 import { CheckRunResult, CommitMessage, DeliverySummary, LoopConfig, LoopResult, TestRunResult, TokenUsage, WorkflowFiles, WorktreeResult } from './types';
 import { appendSection, ensureFile, isoNow, readFileSafe, runCommand } from './utils';
-import { buildWebhookPayload, sendWebhookNotifications } from './webhook';
+import { WebhookPayload, buildWebhookPayload, sendWebhookNotifications } from './webhook';
 
 async function ensureWorkflowFiles(workflowFiles: WorkflowFiles): Promise<void> {
   await ensureFile(workflowFiles.workflowDoc, '# AI 工作流程基线\n');
@@ -40,12 +40,16 @@ function trimOutput(output: string, limit = MAX_LOG_LENGTH): string {
   return `${output.slice(0, limit)}\n……（输出已截断，原始长度 ${output.length} 字符）`;
 }
 
-function truncateText(text: string, limit = 24): string {
+function truncateText(text: string, limit = 100): string {
   const trimmed = text.trim();
   if (trimmed.length <= limit) return trimmed;
   return `${trimmed.slice(0, limit)}...`;
 }
 
+function normalizePlanForWebhook(plan: string): string {
+  return plan.replace(/\r\n?/g, '\n');
+}
+
 async function safeCommandOutput(command: string, args: string[], cwd: string, logger: Logger, label: string, verboseCommand: string): Promise<string> {
   const result = await runCommand(command, args, {
     cwd,
@@ -60,6 +64,45 @@ async function safeCommandOutput(command: string, args: string[], cwd: string, l
   return result.stdout.trim();
 }
 
+function normalizeWebhookUrl(value?: string | null): string {
+  if (!value) return '';
+  const trimmed = value.trim();
+  if (!/^https?:\/\//i.test(trimmed)) return '';
+  return trimmed;
+}
+
+function normalizeRepoUrl(remoteUrl: string): string | null {
+  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: string, logger: Logger): Promise<string> {
+  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: 'unit' | 'e2e', command: string, cwd: string, logger: Logger): Promise<TestRunResult> {
   const label = kind === 'unit' ? '单元测试' : 'e2e 测试';
   logger.info(`执行${label}: ${command}`);
@@ -289,17 +332,43 @@ export async function runLoop(config: LoopConfig): Promise<LoopResult> {
   let prInfo: GhPrInfo | null = null;
   let prFailed = false;
   let sessionIndex = 0;
+  let commitLink = '';
+  let prLink = '';
+  let commitCreated = false;
+  let pushSucceeded = false;
 
   const preWorktreeRecords: string[] = [];
-
-  const notifyWebhook = async (event: 'task_start' | 'iteration_start' | 'task_end', iteration: number, stage: string): Promise<void> => {
-    const payload = buildWebhookPayload({
-      event,
-      task: config.task,
-      branch: branchName,
-      iteration,
-      stage
-    });
+  const resolveProjectName = (): string => path.basename(workDir);
+
+  const notifyWebhook = async (
+    event: 'task_start' | 'iteration_start' | 'task_end',
+    iteration: number,
+    stage: string,
+    plan?: string
+  ): Promise<void> => {
+    const project = resolveProjectName();
+    const payload = event === 'task_start'
+      ? buildWebhookPayload({
+          event,
+          task: config.task,
+          branch: branchName,
+          iteration,
+          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);
   };
 
@@ -396,7 +465,10 @@ export async function runLoop(config: LoopConfig): Promise<LoopResult> {
       extras?: { testResults?: TestRunResult[]; checkResults?: CheckRunResult[]; cwd?: string }
     ): Promise<void> => {
       sessionIndex += 1;
-      await notifyWebhook('iteration_start', sessionIndex, stage);
+      const webhookPlan = stage === '计划生成'
+        ? normalizePlanForWebhook(await readFileSafe(workflowFiles.planFile))
+        : undefined;
+      await notifyWebhook('iteration_start', sessionIndex, stage, webhookPlan);
       logger.info(`${stage} 提示构建完成，调用 AI CLI...`);
 
       const aiResult = await runAi(prompt, aiConfig, logger, extras?.cwd ?? workDir);
@@ -633,6 +705,7 @@ export async function runLoop(config: LoopConfig): Promise<LoopResult> {
         };
         try {
           const committed = await commitAll(commitMessage, workDir, logger);
+          commitCreated = committed;
           deliveryNotes.push(committed ? `自动提交：已提交（${commitMessage.title}）` : '自动提交：未生成提交（可能无变更或提交失败）');
         } catch (error) {
           deliveryNotes.push(`自动提交：失败（${String(error)}）`);
@@ -650,6 +723,7 @@ export async function runLoop(config: LoopConfig): Promise<LoopResult> {
       } else {
         try {
           await pushBranch(branchName, workDir, logger);
+          pushSucceeded = true;
           deliveryNotes.push(`自动推送：已推送（${branchName}）`);
         } catch (error) {
           deliveryNotes.push(`自动推送：失败（${String(error)}）`);
@@ -659,6 +733,10 @@ export async function runLoop(config: LoopConfig): Promise<LoopResult> {
       deliveryNotes.push('自动推送：未开启');
     }
 
+    if (commitCreated && pushSucceeded) {
+      commitLink = await resolveCommitLink(workDir, logger);
+    }
+
     if (config.pr.enable) {
       if (lastTestFailed) {
         deliveryNotes.push('PR 创建：已跳过（测试未通过）');
@@ -719,6 +797,8 @@ export async function runLoop(config: LoopConfig): Promise<LoopResult> {
       deliveryNotes.push('PR 创建：未开启（缺少分支名）');
     }
 
+    prLink = normalizeWebhookUrl(prInfo?.url);
+
     if (deliveryNotes.length > 0) {
       const record = formatSystemRecord('提交与PR', deliveryNotes.join('\n'), isoNow());
       await appendSection(workflowFiles.notesFile, record);

package/src/utils.ts

@@ -122,6 +122,19 @@ export function isoNow(): string {
   return new Date().toISOString();
 }
 
+/**
+ * 返回本地时区时间戳（YYYYMMDD-HHmmss）。
+ */
+export function localTimestamp(date: Date = new Date()): string {
+  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}`;
+}
+
 /**
  * 基于 cwd 解析相对路径。
  */

package/src/webhook.ts

@@ -1,27 +1,57 @@
 import { Logger } from './logger';
-import { isoNow } from './utils';
+import { localTimestamp } from './utils';
 import type { WebhookConfig } from './types';
 
 export type WebhookEvent = 'task_start' | 'iteration_start' | 'task_end';
 
-export interface WebhookPayload {
+export interface WebhookPayloadBase {
   readonly event: WebhookEvent;
-  readonly task: string;
   readonly branch: string;
   readonly iteration: number;
   readonly stage: string;
   readonly timestamp: string;
+  readonly project: string;
+  readonly commit: string;
+  readonly pr: string;
+  /**
+   * 计划内容，仅在 iteration_start 且 stage 为“计划生成”时携带（换行已标准化为 \n）。
+   */
+  readonly plan?: string;
 }
 
-export interface WebhookPayloadInput {
+export type WebhookPayload =
+  | (WebhookPayloadBase & {
+      readonly event: 'task_start';
+      readonly task: string;
+    })
+  | (WebhookPayloadBase & {
+      readonly event: 'iteration_start' | 'task_end';
+    });
+
+export interface WebhookPayloadInputBase {
   readonly event: WebhookEvent;
-  readonly task: string;
   readonly branch?: string;
   readonly iteration: number;
   readonly stage: string;
   readonly timestamp?: string;
+  readonly project: string;
+  readonly commit?: string;
+  readonly pr?: string;
+  /**
+   * 计划内容，仅在 iteration_start 且 stage 为“计划生成”时输入（换行已标准化为 \n）。
+   */
+  readonly plan?: string;
 }
 
+export type WebhookPayloadInput =
+  | (WebhookPayloadInputBase & {
+      readonly event: 'task_start';
+      readonly task: string;
+    })
+  | (WebhookPayloadInputBase & {
+      readonly event: 'iteration_start' | 'task_end';
+    });
+
 export type FetchLikeResponse = {
   readonly ok: boolean;
   readonly status: number;
@@ -45,13 +75,28 @@ export function normalizeWebhookUrls(urls?: string[]): string[] {
 }
 
 export function buildWebhookPayload(input: WebhookPayloadInput): WebhookPayload {
-  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 !== undefined ? { plan: input.plan } : {})
+  };
+
+  if (input.event === 'task_start') {
+    return {
+      ...base,
+      event: 'task_start',
+      task: input.task
+    };
+  }
+
+  return {
+    ...base,
+    event: input.event
   };
 }
 

package/tests/e2e/cli.e2e.test.ts

@@ -1,5 +1,7 @@
 import assert from 'node:assert/strict';
 import { execFile } from 'node:child_process';
+import fs from 'node:fs/promises';
+import os from 'node:os';
 import path from 'node:path';
 import { promisify } from 'node:util';
 import { test } from 'node:test';
@@ -78,17 +80,53 @@ test('CLI logs 在非 TTY 下输出提示', async () => {
   assert.ok(stdout.includes('当前终端不支持交互式 logs。'));
 });
 
-test('CLI set alias 帮助信息可正常输出', async () => {
+test('CLI agent 帮助信息可正常输出', async () => {
   const execFileAsync = promisify(execFile);
   const cliPath = path.join(process.cwd(), 'src', 'cli.ts');
-  const { stdout } = await execFileAsync('node', ['--require', 'ts-node/register', cliPath, 'set', 'alias', '--help'], {
+  const { stdout } = await execFileAsync('node', ['--require', 'ts-node/register', cliPath, 'agent', '--help'], {
     env: {
       ...process.env,
       FORCE_COLOR: '0'
     }
   });
 
-  assert.ok(stdout.includes('Usage: wheel-ai set alias'));
+  assert.ok(stdout.includes('Usage: wheel-ai agent'));
+});
+
+test('CLI agent list 输出配置内容', async () => {
+  const execFileAsync = promisify(execFile);
+  const cliPath = path.join(process.cwd(), 'src', 'cli.ts');
+  const homeDir = await fs.mkdtemp(path.join(os.tmpdir(), 'wheel-ai-agent-'));
+  const configDir = path.join(homeDir, '.wheel-ai');
+  await fs.mkdir(configDir, { recursive: true });
+  await fs.writeFile(
+    path.join(configDir, 'config.toml'),
+    `[agent]\nclaude = "claude --model sonnet"\n`,
+    'utf8'
+  );
+
+  const { stdout } = await execFileAsync('node', ['--require', 'ts-node/register', cliPath, 'agent', 'list'], {
+    env: {
+      ...process.env,
+      HOME: homeDir,
+      FORCE_COLOR: '0'
+    }
+  });
+
+  assert.ok(stdout.includes('claude: claude --model sonnet'));
+});
+
+test('CLI alias set 帮助信息可正常输出', async () => {
+  const execFileAsync = promisify(execFile);
+  const cliPath = path.join(process.cwd(), 'src', 'cli.ts');
+  const { stdout } = await execFileAsync('node', ['--require', 'ts-node/register', cliPath, 'alias', 'set', '--help'], {
+    env: {
+      ...process.env,
+      FORCE_COLOR: '0'
+    }
+  });
+
+  assert.ok(stdout.includes('Usage: wheel-ai alias set'));
 });
 
 test('CLI alias 帮助信息可正常输出', async () => {