llm-content-creator 0.1.0 → 0.1.1

package/src/presentation/cli/commands/retry.ts

@@ -0,0 +1,241 @@
+/**
+ * CLI Retry Command
+ *
+ * 重新执行历史任务
+ */
+
+import { Command } from 'commander';
+import chalk from 'chalk';
+import { createTaskRepository } from '../../../infrastructure/database/index.js';
+import { TaskQueue } from '../../../infrastructure/queue/TaskQueue.js';
+import { createLogger } from '../../../infrastructure/logging/logger.js';
+
+const logger = createLogger('CLI:Retry');
+
+function printSeparator() {
+  console.log(chalk.gray('─'.repeat(80)));
+}
+
+export const retryCommand = new Command('retry')
+  .description('重新执行任务')
+  .option('-t, --task-id <id>', '重新执行指定任务')
+  .option('-a, --all', '重新执行所有等待中的任务')
+  .option('-s, --status <status>', '按状态筛选任务 (pending, failed, cancelled)', 'pending')
+  .option('-l, --limit <number>', '处理数量限制', '10')
+  .option('--dry-run', '模拟运行，不实际执行')
+  .action(async (options) => {
+    try {
+      printSeparator();
+      console.log(chalk.bold.blue('🔄 重新执行任务'));
+      printSeparator();
+
+      const repository = createTaskRepository();
+      const queue = new TaskQueue();
+
+      // 方案 1: 重新执行指定任务
+      if (options.taskId) {
+        await retrySingleTask(options.taskId, repository, queue, options.dryRun);
+        process.exit(0);
+      }
+
+      // 方案 2: 批量重新执行
+      if (options.all) {
+        const limit = parseInt(options.limit) || 10;
+        await retryBatchTasks(options.status, limit, repository, queue, options.dryRun);
+        process.exit(0);
+      }
+
+      // 没有指定参数，显示帮助
+      console.log(chalk.yellow('请指定要重新执行的任务：'));
+      console.log(chalk.white('1. 重新执行单个任务：'));
+      console.log(chalk.gray('   pnpm run cli:retry --task-id <任务ID>'));
+      console.log(chalk.white('\n2. 批量重新执行所有等待任务：'));
+      console.log(chalk.gray('   pnpm run cli:retry --all'));
+      console.log(chalk.white('\n3. 批量重新执行失败任务：'));
+      console.log(chalk.gray('   pnpm run cli:retry --all --status failed'));
+      console.log(chalk.white('\n4. 模拟运行（不实际执行）：'));
+      console.log(chalk.gray('   pnpm run cli:retry --all --dry-run'));
+      console.log();
+
+      process.exit(0);
+    } catch (error) {
+      logger.error('Failed to retry tasks', error as Error);
+      console.error(chalk.red('❌ 重新执行失败：'), (error as Error).message);
+      process.exit(1);
+    } finally {
+      // 清理队列连接
+      try {
+        const queue = new TaskQueue();
+        await queue.close();
+      } catch (error) {
+        // 忽略清理错误
+      }
+    }
+  });
+
+/**
+ * 重新执行单个任务
+ */
+async function retrySingleTask(
+  taskId: string,
+  repository: any,
+  queue: TaskQueue,
+  dryRun: boolean = false
+): Promise<void> {
+  console.log(chalk.white(`📝 任务 ID: ${chalk.bold(taskId)}`));
+  console.log();
+
+  // 1. 查询任务
+  const task = await repository.findById(taskId);
+
+  if (!task) {
+    console.log(chalk.red('❌ 任务不存在'));
+    process.exit(1);
+  }
+
+  console.log(chalk.gray('任务信息:'));
+  console.log(chalk.gray(`  主题: ${task.topic}`));
+  console.log(chalk.gray(`  状态: ${task.status}`));
+  console.log(chalk.gray(`  模式: ${task.mode}`));
+  console.log(chalk.gray(`  创建时间: ${task.createdAt?.toLocaleString('zh-CN')}`));
+  console.log();
+
+  // 2. 检查任务状态
+  if (task.status === 'running' || task.status === 'processing') {
+    console.log(chalk.yellow('⚠️  任务正在运行中，无需重新执行'));
+    process.exit(0);
+  }
+
+  if (task.status === 'completed') {
+    console.log(chalk.yellow('⚠️  任务已完成，如需重新执行请创建新任务'));
+    process.exit(0);
+  }
+
+  // 3. 模拟运行
+  if (dryRun) {
+    console.log(chalk.blue('🔍 [模拟运行] 将会执行以下操作:'));
+    console.log(chalk.gray(`  1. 将任务添加到 Redis 队列`));
+    console.log(chalk.gray(`  2. Worker 将会获取并处理该任务`));
+    console.log();
+    console.log(chalk.yellow('💡 这是模拟运行，没有实际执行'));
+    console.log(chalk.gray('   去掉 --dry-run 参数即可实际执行'));
+    console.log();
+    return;
+  }
+
+  // 4. 添加到队列
+  try {
+    console.log(chalk.white('⏳ 正在添加到队列...'));
+
+    await queue.addTask({
+      taskId: task.taskId,
+      mode: task.mode === 'sync' ? 'sync' : 'async',
+      topic: task.topic,
+      requirements: task.requirements,
+      hardConstraints: task.hardConstraints,
+    });
+
+    console.log(chalk.green('✅ 任务已添加到队列！'));
+    console.log();
+    console.log(chalk.white('💡 后续操作：'));
+    console.log(chalk.gray('   1. 确保 Worker 正在运行: pnpm run worker'));
+    console.log(chalk.gray('   2. 查看任务状态: pnpm run cli:status --task-id ' + task.taskId));
+    console.log();
+
+    logger.info('Task retried', { taskId, topic: task.topic });
+  } catch (error) {
+    console.log(chalk.red('❌ 添加到队列失败：'), (error as Error).message);
+    throw error;
+  }
+}
+
+/**
+ * 批量重新执行任务
+ */
+async function retryBatchTasks(
+  status: string,
+  limit: number,
+  repository: any,
+  queue: TaskQueue,
+  dryRun: boolean = false
+): Promise<void> {
+  console.log(chalk.white(`📊 批量重新执行 ${chalk.bold(status)} 状态的任务`));
+  console.log(chalk.gray(`限制: ${limit} 个`));
+  console.log();
+
+  // 1. 查询任务
+  const tasks = await repository.findMany({ status }, { limit });
+
+  if (tasks.length === 0) {
+    console.log(chalk.yellow('✅ 没有找到需要重新执行的任务'));
+    console.log();
+    return;
+  }
+
+  console.log(chalk.gray(`找到 ${tasks.length} 个任务\n`));
+
+  // 2. 显示任务列表
+  console.log(chalk.gray('任务列表:'));
+  tasks.forEach((task: any, index: number) => {
+    console.log(chalk.gray(`  ${index + 1}. ${task.taskId}`));
+    console.log(chalk.gray(`     主题: ${task.topic}`));
+    console.log(chalk.gray(`     状态: ${task.status}`));
+    console.log();
+  });
+
+  // 3. 模拟运行
+  if (dryRun) {
+    console.log(chalk.blue('🔍 [模拟运行] 将会执行以下操作:'));
+    console.log(chalk.gray(`  将 ${tasks.length} 个任务添加到 Redis 队列`));
+    console.log();
+    console.log(chalk.yellow('💡 这是模拟运行，没有实际执行'));
+    console.log(chalk.gray('   去掉 --dry-run 参数即可实际执行'));
+    console.log();
+    return;
+  }
+
+  // 4. 批量添加到队列
+  console.log(chalk.white('⏳ 正在批量添加到队列...\n'));
+
+  let successCount = 0;
+  let failCount = 0;
+
+  for (const task of tasks) {
+    try {
+      await queue.addTask({
+        taskId: task.taskId,
+        mode: task.mode === 'sync' ? 'sync' : 'async',
+        topic: task.topic,
+        requirements: task.requirements,
+        hardConstraints: task.hardConstraints,
+      });
+
+      console.log(chalk.green(`✅ ${task.taskId}`));
+      successCount++;
+    } catch (error) {
+      console.log(chalk.red(`❌ ${task.taskId} - ${(error as Error).message}`));
+      failCount++;
+    }
+  }
+
+  console.log();
+  console.log(chalk.white('📊 执行结果：'));
+  console.log(chalk.green(`   成功: ${successCount} 个`));
+  if (failCount > 0) {
+    console.log(chalk.red(`   失败: ${failCount} 个`));
+  }
+  console.log();
+
+  if (successCount > 0) {
+    console.log(chalk.white('💡 后续操作：'));
+    console.log(chalk.gray('   1. 确保 Worker 正在运行: pnpm run worker'));
+    console.log(chalk.gray('   2. 查看任务列表: pnpm run cli:list'));
+    console.log();
+  }
+
+  logger.info('Batch retry completed', {
+    total: tasks.length,
+    success: successCount,
+    failed: failCount,
+  });
+}

package/src/presentation/cli/commands/status.ts

@@ -6,7 +6,7 @@
 
 import { Command } from 'commander';
 import chalk from 'chalk';
-import { PostgresTaskRepository } from '../../../infrastructure/database/PostgresTaskRepository.js';
+import { createTaskRepository } from '../../../infrastructure/database/index.js';
 import { getStatusText, formatDate, formatDuration, printSeparator } from '../utils/formatter.js';
 import { cleanupResources } from '../utils/cleanup.js';
 
@@ -14,7 +14,7 @@ export const statusCommand = new Command('status')
   .description('查询任务状态')
   .requiredOption('-t, --task-id <taskId>', '任务ID')
   .action(async (options) => {
-    const taskRepo = new PostgresTaskRepository();
+    const taskRepo = createTaskRepository();
 
     try {
       const task = await taskRepo.findById(options.taskId);
@@ -71,6 +71,7 @@ export const statusCommand = new Command('status')
 
       // 清理资源并正常退出
       await cleanupResources(taskRepo);
+      process.exit(0);
 
     } catch (error) {
       console.error(chalk.red(`❌ 错误: ${error instanceof Error ? error.message : String(error)}`));

package/src/presentation/cli/index.ts

@@ -11,6 +11,8 @@ import { createCommand } from './commands/create.js';
 import { statusCommand } from './commands/status.js';
 import { resultCommand } from './commands/result.js';
 import { cancelCommand } from './commands/cancel.js';
+import { listCommand } from './commands/list.js';
+import { retryCommand } from './commands/retry.js';
 import { createLogger } from '../../infrastructure/logging/logger.js';
 
 const logger = createLogger('CLI');
@@ -26,6 +28,8 @@ program
 
 // 添加命令
 program.addCommand(createCommand);
+program.addCommand(listCommand);
+program.addCommand(retryCommand);
 program.addCommand(statusCommand);
 program.addCommand(resultCommand);
 program.addCommand(cancelCommand);

package/src/presentation/cli/utils/cleanup.ts

@@ -11,7 +11,7 @@ import { closeLogger } from '../../../infrastructure/logging/logger.js';
  *
  * @param repositories - 需要关闭的 Repository 数组
  */
-export async function cleanupResources(...repositories: Array<{ close?: () => Promise<void> }>): Promise<void> {
+export async function cleanupResources(...repositories: Array<any>): Promise<void> {
   const errors: Array<Error> = [];
 
   // 1. 关闭所有 Repository 连接池

package/src/presentation/monitor-cli.ts

@@ -6,10 +6,8 @@
  */
 
 import { Command } from 'commander';
-// @ts-ignore - Module resolution issue with NodeNext
-import { startMonitorServer } from '../../monitoring/index';
-// @ts-ignore - Module resolution issue with NodeNext
-import { createLogger } from '../../infrastructure/logging/logger';
+import { startMonitorServer } from '../monitoring/index.js';
+import { createLogger } from '../infrastructure/logging/logger.js';
 
 const logger = createLogger('MonitorCLI');
 const program = new Command();

package/src/presentation/worker-cli.ts

@@ -6,10 +6,9 @@
  */
 
 import { Command } from 'commander';
-// @ts-ignore - Module resolution issue with NodeNext
-import { createTaskWorker } from '../../workers/index';
-// @ts-ignore - Module resolution issue with NodeNext
-import { createLogger } from '../../infrastructure/logging/logger';
+import { v4 as uuidv4 } from 'uuid';
+import { createTaskWorker } from '../workers/TaskWorker.js';
+import { createLogger } from '../infrastructure/logging/logger.js';
 
 const logger = createLogger('WorkerCLI');
 const program = new Command();
@@ -22,7 +21,7 @@ program
 program
   .command('start')
   .description('启动 Worker')
-  .option('-w, --worker-id <id>', 'Worker ID', process.env.WORKER_ID || `worker-${process.pid}`)
+  .option('-w, --worker-id <id>', 'Worker ID', process.env.WORKER_ID || `worker-${uuidv4()}`)
   .option('-c, --concurrency <number>', '并发数', '2')
   .action(async (options) => {
     try {
@@ -55,6 +54,10 @@ program
       logger.info('Worker running, press Ctrl+C to stop');
     } catch (error) {
       logger.error('Failed to start worker', error as Error);
+      console.error('Detailed error:', error);
+      if (error instanceof Error) {
+        console.error('Stack trace:', error.stack);
+      }
       process.exit(1);
     }
   });

package/src/schedulers/TaskScheduler.ts

@@ -126,7 +126,17 @@ export class TaskScheduler {
       };
 
       // 4. 保存到数据库
-      await this.repository.create(task as Task);
+      await this.repository.create({
+        id: task.id!,
+        traceId: undefined,
+        mode: task.mode!,
+        type: (task.type as any) || 'article',
+        topic: task.topic!,
+        requirements: task.requirements!,
+        hardConstraints: task.hardConstraints,
+        priority: task.priority,
+        maxRetries: 3,
+      });
 
       logger.info('Task created', {
         taskId,
@@ -263,10 +273,8 @@ export class TaskScheduler {
         return false;
       }
 
-      await this.repository.update(taskId, {
-        status: 'cancelled',
-        updatedAt: new Date().toISOString(),
-      });
+      // 使用 delete 方法标记任务为已取消
+      await this.repository.delete(taskId);
 
       logger.info('Task cancelled', { taskId });
 

package/src/workers/TaskWorker.ts

@@ -5,9 +5,10 @@
  */
 
 import { Worker, Job } from 'bullmq';
+import { v4 as uuidv4 } from 'uuid';
 import { getRedisClient } from '../infrastructure/redis/connection.js';
-import { createTaskRepository } from '../infrastructure/database/index.js';
-import { createSimpleContentCreatorGraph, createInitialState } from '../domain/workflow/index.js';
+import { createTaskRepository, createResultRepository } from '../infrastructure/database/index.js';
+import { createContentCreatorGraph, createInitialState } from '../domain/workflow/index.js';
 import { createLogger } from '../infrastructure/logging/logger.js';
 import type { TaskJobData } from '../infrastructure/queue/TaskQueue.js';
 import { ExecutionMode } from '../domain/entities/Task.js';
@@ -88,24 +89,35 @@ export class TaskWorker {
     // 更新任务进度
     await job.updateProgress(0);
 
+    let task: Awaited<ReturnType<typeof this.repository.findById>> | null = null;
+
     try {
       // 1. 抢占任务（使用乐观锁）
-      const claimed = await this.repository.claimForProcessing(
+      task = await this.repository.findById(data.taskId);
+      if (!task) {
+        throw new Error(`Task not found: ${data.taskId}`);
+      }
+
+      const claimed = await this.repository.claimTask(
         data.taskId,
-        this.workerId
+        this.workerId,
+        task.version
       );
 
       if (!claimed) {
-        throw new Error(`Failed to claim task ${data.taskId}`);
+        throw new Error(`Failed to claim task ${data.taskId} (version mismatch or already claimed)`);
       }
 
+      // 更新任务版本号（claimTask 会将版本号 +1）
+      task.version = task.version + 1;
+
       logger.info('Task claimed', { taskId: data.taskId });
 
       // 更新进度 10%
       await job.updateProgress(10);
 
       // 2. 创建工作流图
-      const graph = createSimpleContentCreatorGraph();
+      const graph = createContentCreatorGraph();
 
       // 3. 创建初始状态
       const initialState = createInitialState({
@@ -130,16 +142,31 @@ export class TaskWorker {
       await job.updateProgress(90);
 
       // 5. 保存结果
-      await this.repository.update(data.taskId, {
-        status: 'completed',
-        completedAt: new Date().toISOString(),
-        result: {
-          articleContent: result.articleContent,
-          searchResults: result.searchResults,
-          organizedInfo: result.organizedInfo,
-          images: result.images,
-        },
-      });
+      const resultRepo = createResultRepository();
+
+      if (result.articleContent) {
+        await resultRepo.create({
+          taskId: data.taskId,
+          resultType: 'article',
+          content: result.articleContent,
+          metadata: {
+            wordCount: result.articleContent.length,
+          },
+        });
+      }
+
+      if (result.images && result.images.length > 0) {
+        for (const image of result.images) {
+          await resultRepo.create({
+            taskId: data.taskId,
+            resultType: 'image',
+            content: image.url,
+            metadata: image.metadata,
+          });
+        }
+      }
+
+      await this.repository.markAsCompleted(data.taskId, task.version);
 
       const duration = Date.now() - startTime;
 
@@ -169,11 +196,9 @@ export class TaskWorker {
 
       // 保存错误信息
       try {
-        await this.repository.update(data.taskId, {
-          status: 'failed',
-          error: errorMessage,
-          completedAt: new Date().toISOString(),
-        });
+        if (task) {
+          await this.repository.markAsFailed(data.taskId, errorMessage, task.version);
+        }
       } catch (updateError) {
         logger.error('Failed to update task error status', updateError as Error, {
           taskId: data.taskId,
@@ -315,6 +340,6 @@ export function createTaskWorker(
   workerId?: string,
   concurrency?: number
 ): TaskWorker {
-  const id = workerId || process.env.WORKER_ID || `worker-${process.pid}`;
+  const id = workerId || process.env.WORKER_ID || `worker-${uuidv4()}`;
   return new TaskWorker(id, concurrency);
 }