workflow-ai 1.0.9 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workflow-ai",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "AI Agent Workflow Coordinator — kanban-based pipeline for AI coding agents",
   "type": "module",
   "bin": {

package/src/cli.mjs

@@ -1,131 +1,131 @@
-#!/usr/bin/env node
-
-import { initProject } from './init.mjs';
-import { runPipeline } from './runner.mjs';
-import { readFileSync } from 'node:fs';
-import { join, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const pkgPath = join(__dirname, '..', 'package.json');
-
-const HELP_TEXT = `workflow-ai v1.0.0
-
-Usage:
-  workflow init [path] [--force]   Initialize .workflow/ in target directory
-  workflow run [options]           Run the AI pipeline
-  workflow help                    Show this help
-  workflow version                 Show version
-
-Run options:
-  --plan <plan>      Plan ID to execute
-  --config <path>    Config file path
-  --project <path>   Project root (default: auto-detect)
-`;
-
-function showHelp() {
-  console.log(HELP_TEXT);
-}
-
-function showVersion() {
-  try {
-    const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
-    console.log(`workflow-ai v${pkg.version}`);
-  } catch (err) {
-    console.error('Error reading package.json:', err.message);
-    process.exit(1);
-  }
-}
-
-function parseArgs(argv) {
-  const args = { _: [] };
-  let i = 0;
-  while (i < argv.length) {
-    const arg = argv[i];
-    if (arg.startsWith('--')) {
-      const key = arg.slice(2);
-      if (i + 1 < argv.length && !argv[i + 1].startsWith('--')) {
-        args[key] = argv[i + 1];
-        i += 2;
-      } else {
-        args[key] = true;
-        i += 1;
-      }
-    } else {
-      args._.push(arg);
-      i += 1;
-    }
-  }
-  return args;
-}
-
-async function runInit(args) {
-  const targetPath = args._[0] || process.cwd();
-  const force = args.force === true;
-  const result = initProject(targetPath, { force });
-  
-  if (result.errors && result.errors.length > 0) {
-    console.error('Errors:', result.errors.join(', '));
-    process.exit(1);
-  }
-  
-  console.log('✅ Initialization completed:');
-  result.steps.forEach(step => console.log(`  • ${step}`));
-  if (result.warnings && result.warnings.length > 0) {
-    console.warn('Warnings:', result.warnings.join(', '));
-  }
-}
-
-async function runRun(args) {
-  // Expose wf's node_modules to child ESM scripts via a custom loader
-  const loaderPath = join(__dirname, 'wf-loader.mjs');
-  const loaderUrl = `file:///${loaderPath.replace(/\\/g, '/')}`;
-  process.env.NODE_OPTIONS = process.env.NODE_OPTIONS
-    ? `${process.env.NODE_OPTIONS} --import ${loaderUrl}`
-    : `--import ${loaderUrl}`;
-
-  const argv = [];
-  if (args.plan) {
-    argv.push('--plan', args.plan);
-  }
-  if (args.config) {
-    argv.push('--config', args.config);
-  }
-  if (args.project) {
-    argv.push('--project', args.project);
-  }
-  
-  await runPipeline(argv);
-}
-
-export function run(argv) {
-  const args = parseArgs(argv);
-  const command = args._.shift();
-
-  switch (command) {
-    case 'init':
-      runInit(args);
-      break;
-    case 'run':
-      runRun(args);
-      break;
-    case 'help':
-      showHelp();
-      break;
-    case 'version':
-      showVersion();
-      break;
-    default:
-      if (!command) {
-        showHelp();
-      } else {
-        console.error(`Unknown command: ${command}`);
-        console.error('Run "workflow help" for usage.');
-        process.exit(1);
-      }
-  }
-}
-
-if (import.meta.url === `file://${process.argv[1]}`) {
-  run(process.argv.slice(2));
+#!/usr/bin/env node
+
+import { initProject } from './init.mjs';
+import { runPipeline } from './runner.mjs';
+import { readFileSync } from 'node:fs';
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const pkgPath = join(__dirname, '..', 'package.json');
+
+const HELP_TEXT = `workflow-ai v1.0.0
+
+Usage:
+  workflow init [path] [--force]   Initialize .workflow/ in target directory
+  workflow run [options]           Run the AI pipeline
+  workflow help                    Show this help
+  workflow version                 Show version
+
+Run options:
+  --plan <plan>      Plan ID to execute
+  --config <path>    Config file path
+  --project <path>   Project root (default: auto-detect)
+`;
+
+function showHelp() {
+  console.log(HELP_TEXT);
+}
+
+function showVersion() {
+  try {
+    const pkg = JSON.parse(readFileSync(pkgPath, 'utf-8'));
+    console.log(`workflow-ai v${pkg.version}`);
+  } catch (err) {
+    console.error('Error reading package.json:', err.message);
+    process.exit(1);
+  }
+}
+
+function parseArgs(argv) {
+  const args = { _: [] };
+  let i = 0;
+  while (i < argv.length) {
+    const arg = argv[i];
+    if (arg.startsWith('--')) {
+      const key = arg.slice(2);
+      if (i + 1 < argv.length && !argv[i + 1].startsWith('--')) {
+        args[key] = argv[i + 1];
+        i += 2;
+      } else {
+        args[key] = true;
+        i += 1;
+      }
+    } else {
+      args._.push(arg);
+      i += 1;
+    }
+  }
+  return args;
+}
+
+async function runInit(args) {
+  const targetPath = args._[0] || process.cwd();
+  const force = args.force === true;
+  const result = initProject(targetPath, { force });
+  
+  if (result.errors && result.errors.length > 0) {
+    console.error('Errors:', result.errors.join(', '));
+    process.exit(1);
+  }
+  
+  console.log('✅ Initialization completed:');
+  result.steps.forEach(step => console.log(`  • ${step}`));
+  if (result.warnings && result.warnings.length > 0) {
+    console.warn('Warnings:', result.warnings.join(', '));
+  }
+}
+
+async function runRun(args) {
+  // Expose wf's node_modules to child ESM scripts via a custom loader
+  const loaderPath = join(__dirname, 'wf-loader.mjs');
+  const loaderUrl = `file:///${loaderPath.replace(/\\/g, '/')}`;
+  process.env.NODE_OPTIONS = process.env.NODE_OPTIONS
+    ? `${process.env.NODE_OPTIONS} --import ${loaderUrl}`
+    : `--import ${loaderUrl}`;
+
+  const argv = [];
+  if (args.plan) {
+    argv.push('--plan', args.plan);
+  }
+  if (args.config) {
+    argv.push('--config', args.config);
+  }
+  if (args.project) {
+    argv.push('--project', args.project);
+  }
+  
+  await runPipeline(argv);
+}
+
+export function run(argv) {
+  const args = parseArgs(argv);
+  const command = args._.shift();
+
+  switch (command) {
+    case 'init':
+      runInit(args);
+      break;
+    case 'run':
+      runRun(args);
+      break;
+    case 'help':
+      showHelp();
+      break;
+    case 'version':
+      showVersion();
+      break;
+    default:
+      if (!command) {
+        showHelp();
+      } else {
+        console.error(`Unknown command: ${command}`);
+        console.error('Run "workflow help" for usage.');
+        process.exit(1);
+      }
+  }
+}
+
+if (import.meta.url === `file://${process.argv[1]}`) {
+  run(process.argv.slice(2));
 }

package/src/lib/utils.mjs

@@ -96,3 +96,60 @@ export function getPackageRoot() {
   // result/src/lib → result
   return path.resolve(__dirname, '../../');
 }
+
+/**
+ * Парсит секцию "## Ревью" тикета и возвращает статус последней записи.
+ * Поддерживает табличный и текстовый форматы.
+ *
+ * Табличный формат:
+ * | Дата | Статус | Комментарий |
+ * |------|--------|-------------|
+ * | 2026-03-08 | passed | Всё ок |
+ *
+ * Текстовый формат:
+ * - 2026-03-08: passed - Всё ок
+ * - 2026-03-08: failed - Есть замечания
+ *
+ * @param {string} content - Содержимое тикета (markdown)
+ * @returns {string|null} "passed", "failed" или null (если нет ревью)
+ */
+export function getLastReviewStatus(content) {
+  if (!content) return null;
+
+  // Находим секцию "## Ревью" — захватываем всё до следующего заголовка ## или конца файла
+  const reviewSectionMatch = content.match(/^##\s*Ревью\s*\n([\s\S]*)(?=\n^##\s|$)/m);
+  if (!reviewSectionMatch) return null;
+
+  const reviewSection = reviewSectionMatch[1].trim();
+  if (!reviewSection) return null;
+
+  // Пробуем распарсить табличный формат
+  const tableRows = reviewSection.split('\n').filter(line => line.trim().startsWith('|'));
+  if (tableRows.length >= 2) {
+    // Есть заголовок и разделитель, ищем строки с данными
+    const dataRows = tableRows.slice(2).filter(row => {
+      const cells = row.split('|').map(c => c.trim()).filter(c => c);
+      return cells.length >= 2;
+    });
+
+    if (dataRows.length > 0) {
+      const lastRow = dataRows[dataRows.length - 1];
+      const cells = lastRow.split('|').map(c => c.trim()).filter(c => c);
+      // Статус обычно во второй колонке (после даты), может содержать эмодзи (✅ passed / ❌ failed)
+      const statusRaw = cells[1]?.toLowerCase() || '';
+      if (statusRaw.includes('passed')) return 'passed';
+      if (statusRaw.includes('failed')) return 'failed';
+    }
+  }
+
+  // Пробуем распарсить текстовый формат (список)
+  const listItems = reviewSection.split('\n').filter(line => line.trim().match(/^[-*]\s/));
+  if (listItems.length > 0) {
+    const lastItem = listItems[listItems.length - 1].trim();
+    // Ищем статус в формате "- дата: passed/failed - комментарий"
+    const statusMatch = lastItem.match(/:\s*(passed|failed)\b/i);
+    if (statusMatch) return statusMatch[1].toLowerCase();
+  }
+
+  return null;
+}

package/src/runner.mjs

@@ -310,6 +310,12 @@ class PromptBuilder {
       }
     }
 
+    // Добавляем блок Instructions если поле instructions задано и непустое
+    if (stage.instructions && typeof stage.instructions === 'string' && stage.instructions.trim() !== '') {
+      parts.push('\n\nInstructions:');
+      parts.push(stage.instructions.trim());
+    }
+
     return parts.join('\n');
   }
 
@@ -718,8 +724,27 @@ class StageExecutor {
       throw new Error(`Stage not found: ${stageId}`);
     }
 
-    // Выбираем агента: если есть agent_by_attempt и счётчик — ротация по попыткам
+    // Выбираем агента по приоритету:
+    // 1. agent_by_attempt[counter] — ротация по попыткам
+    // 2. agent_by_type[task_type] — выбор по типу задачи
+    // 3. stage.agent — явно указанный агент stage
+    // 4. default_agent — глобальный дефолт
     let agentId = stage.agent || this.pipeline.default_agent;
+
+    // Приоритет 1: agent_by_type (выбор по типу задачи)
+    // task_type берётся из контекста (возвращается из pick-next-task)
+    if (stage.agent_by_type && this.context.task_type) {
+      const taskType = this.context.task_type;
+      if (stage.agent_by_type[taskType]) {
+        const typeBasedAgent = stage.agent_by_type[taskType];
+        if (this.logger) {
+          this.logger.info(`Agent by type: task_type="${taskType}" → ${typeBasedAgent}`, stageId);
+        }
+        agentId = typeBasedAgent;
+      }
+    }
+
+    // Приоритет 2: agent_by_attempt (ротация по попыткам) — перекрывает agent_by_type
     if (stage.agent_by_attempt && stage.counter) {
       const attempt = this.counters[stage.counter] || 0;
       if (stage.agent_by_attempt[attempt]) {
@@ -729,6 +754,7 @@ class StageExecutor {
         }
       }
     }
+
     const agent = this.pipeline.agents[agentId];
     if (!agent) {
       throw new Error(`Agent not found: ${agentId}`);

package/src/scripts/check-conditions.js

@@ -28,7 +28,7 @@
 import fs from 'fs';
 import path from 'path';
 import { findProjectRoot } from '../lib/find-root.mjs';
-import { parseFrontmatter, printResult, normalizePlanId, extractPlanId } from '../lib/utils.mjs';
+import { parseFrontmatter, printResult, normalizePlanId, extractPlanId, serializeFrontmatter } from '../lib/utils.mjs';
 
 const PROJECT_DIR = findProjectRoot();
 const WORKFLOW_DIR = path.join(PROJECT_DIR, '.workflow');
@@ -102,6 +102,34 @@ function readTickets(dir) {
   return tickets;
 }
 
+/**
+ * Перемещает тикет из ready/ в backlog/
+ */
+function demoteToBacklog(ticketId) {
+  const sourcePath = path.join(READY_DIR, `${ticketId}.md`);
+  const targetPath = path.join(BACKLOG_DIR, `${ticketId}.md`);
+
+  if (!fs.existsSync(sourcePath)) {
+    console.error(`[WARN] ${ticketId}: not found in ready/, skipping`);
+    return false;
+  }
+
+  const content = fs.readFileSync(sourcePath, 'utf8');
+  const { frontmatter, body } = parseFrontmatter(content);
+
+  frontmatter.updated_at = new Date().toISOString();
+
+  const newContent = serializeFrontmatter(frontmatter) + body;
+
+  if (!fs.existsSync(BACKLOG_DIR)) {
+    fs.mkdirSync(BACKLOG_DIR, { recursive: true });
+  }
+
+  fs.renameSync(sourcePath, targetPath);
+  fs.writeFileSync(targetPath, newContent, 'utf8');
+  return true;
+}
+
 /**
  * Проверяет все тикеты в backlog/ и возвращает список готовых
  */
@@ -137,6 +165,36 @@ function checkBacklog(planId) {
   return { ready, waiting, total: tickets.length };
 }
 
+/**
+ * Проверяет тикеты в ready/ и возвращает тикеты в backlog при невыполненных условиях
+ */
+function checkReady(planId) {
+  const allTickets = readTickets(READY_DIR);
+  const tickets = planId
+    ? allTickets.filter(t => normalizePlanId(t.frontmatter.parent_plan) === planId)
+    : allTickets;
+
+  const demoted = [];
+
+  for (const ticket of tickets) {
+    const { frontmatter, id } = ticket;
+    const conditions = frontmatter.conditions || [];
+    const dependencies = frontmatter.dependencies || [];
+
+    const depsMet = checkDependencies(dependencies);
+    const conditionsMet = conditions.every(checkCondition);
+
+    if (!depsMet || !conditionsMet) {
+      if (demoteToBacklog(id)) {
+        console.log(`[INFO] ${id}: ready/ → backlog/ (условия не выполнены)`);
+        demoted.push(id);
+      }
+    }
+  }
+
+  return { demoted, total: tickets.length };
+}
+
 async function main() {
   const planId = extractPlanId();
 
@@ -144,6 +202,13 @@ async function main() {
     console.log(`[INFO] Filtering by plan_id: ${planId}`);
   }
 
+  // Сначала демотирование невалидных тикетов из ready/
+  console.log(`[INFO] Checking ready/ for invalid tickets: ${READY_DIR}`);
+  const { demoted, total: readyTotal } = checkReady(planId);
+  console.log(`[INFO] Total in ready/${planId ? ` (plan ${planId})` : ''}: ${readyTotal}`);
+  console.log(`[INFO] Demoted to backlog: ${demoted.length}`);
+
+  // Затем проверка backlog — демотированные тикеты сразу переоцениваются
   console.log(`[INFO] Scanning backlog/: ${BACKLOG_DIR}`);
 
   const { ready, waiting, total } = checkBacklog(planId);
@@ -160,7 +225,7 @@ async function main() {
   }
 
   if (ready.length > 0) {
-    printResult({ status: 'has_ready', ready_tickets: ready.join(', ') });
+    printResult({ status: 'has_ready', ready_tickets: ready.join(', '), demoted_tickets: demoted.join(', ') });
     return;
   }
 
@@ -168,10 +233,10 @@ async function main() {
   const readyDirTickets = readTickets(READY_DIR);
   if (readyDirTickets.length > 0) {
     console.log(`[INFO] No new ready tickets, but ready/ has ${readyDirTickets.length} ticket(s)`);
-    printResult({ status: 'default', ready_tickets: '' });
+    printResult({ status: 'default', ready_tickets: '', demoted_tickets: demoted.join(', ') });
   } else {
     console.log('[INFO] No ready tickets and ready/ is empty');
-    printResult({ status: 'empty', ready_tickets: '' });
+    printResult({ status: 'empty', ready_tickets: '', demoted_tickets: demoted.join(', ') });
   }
 }
 

package/src/scripts/move-ticket.js

@@ -27,12 +27,12 @@ const VALID_STATUSES = ['backlog', 'ready', 'in-progress', 'blocked', 'review',
 
 // Таблица допустимых переходов
 const VALID_TRANSITIONS = {
-  'backlog': ['ready'],
-  'ready': ['in-progress', 'review'],
+  'backlog': ['ready', 'blocked', 'done'],
+  'ready': ['in-progress', 'review', 'backlog'],
   'in-progress': ['done', 'blocked', 'review'],
   'blocked': ['ready'],
   'review': ['done', 'ready', 'in-progress', 'blocked'],
-  'done': []
+  'done': ['ready', 'blocked']
 };
 
 /**