agency-orchestrator 0.5.2 → 0.6.0

package/dist/cli/compose.js

@@ -8,6 +8,7 @@ import { listAgents } from '../agents/loader.js';
 import { existsSync, writeFileSync, mkdirSync } from 'node:fs';
 import { resolve, relative } from 'node:path';
 import { createConnector } from '../connectors/factory.js';
+import { t } from '../i18n.js';
 /**
  * 从 agents 目录构建精简的角色目录
  */
@@ -299,7 +300,7 @@ export async function composeWorkflow(options) {
     // 1. 构建角色目录
     const roles = buildRoleCatalog(agentsDir);
     if (roles.length === 0) {
-        throw new Error(`角色目录为空: ${agentsDir}\n请先运行 ao init 下载角色定义`);
+        throw new Error(t('compose.empty_catalog', { dir: agentsDir }));
     }
     const catalog = formatCatalogForPrompt(roles);
     // 2. 构建 prompt
@@ -311,7 +312,7 @@ export async function composeWorkflow(options) {
     });
     const userPrompt = buildComposeUserPrompt(description, lang);
     // 3. 调用 LLM
-    console.log(`  正在用 AI 编排工作流...（${roles.length} 个角色可选）\n`);
+    console.log(`  ${t('compose.generating', { n: roles.length })}\n`);
     const connector = createConnector(llmConfig);
     const result = await connector.chat(systemPrompt, userPrompt, {
         ...llmConfig,
@@ -320,7 +321,7 @@ export async function composeWorkflow(options) {
     // 4. 提取 YAML
     const yaml = extractYamlFromResponse(result.content);
     if (!yaml || !yaml.includes('steps:')) {
-        throw new Error('AI 生成的内容不是有效的 workflow YAML，请重试或调整描述');
+        throw new Error(t('compose.invalid_yaml'));
     }
     // 5. 保存（避免覆盖）
     const workflowsDir = resolve('workflows');
@@ -333,7 +334,9 @@ export async function composeWorkflow(options) {
     const savedPath = resolve(workflowsDir, fileName);
     writeFileSync(savedPath, yaml + '\n', 'utf-8');
     const relativePath = relative(process.cwd(), savedPath);
-    console.log(`  Token 用量: 输入 ${result.usage.input_tokens}, 输出 ${result.usage.output_tokens}`);
+    if (process.env.AO_VERBOSE) {
+        console.log(`  ${t('compose.tokens', { in: result.usage.input_tokens, out: result.usage.output_tokens })}`);
+    }
     // 6. 校验生成的 YAML（含角色路径真实性校验，防 LLM 幻觉）
     const warnings = [];
     const validRolePaths = new Set(roles.map(r => r.path));

package/dist/cli.js

@@ -16,8 +16,20 @@ import { buildDAG, formatDAG } from './core/dag.js';
 import { listAgents } from './agents/loader.js';
 import { run } from './index.js';
 import { scheduleUpdateCheck } from './utils/version-check.js';
+import { t, detectLang } from './i18n.js';
+import { loadEnvFile, writeEnvFile, ensureEnvGitignored } from './utils/env-loader.js';
+// Auto-load ./.env (shell env wins; no overwrite)
+loadEnvFile();
+// Suppress Node's DEP0190 warning from legitimate shell:true on Windows (.cmd shims).
+const origEmit = process.emit.bind(process);
+process.emit = function (name, data, ...rest) {
+    if (name === 'warning' && data && data.code === 'DEP0190')
+        return false;
+    return origEmit(name, data, ...rest);
+};
 const args = process.argv.slice(2);
 const command = args[0];
+detectLang(process.argv);
 async function main() {
     // 启动时提示新版本（仅 TTY，24h 缓存，失败静默）
     scheduleUpdateCheck(getVersion());
@@ -84,8 +96,9 @@ async function handleRun() {
     const watch = args.includes('--watch');
     let resumeDir = getArgValue('--resume');
     const fromStep = getArgValue('--from');
-    const provider = getArgValue('--provider');
-    const model = getArgValue('--model');
+    // Precedence: CLI flag > .env (AO_PROVIDER/AO_MODEL) > YAML
+    const provider = (getArgValue('--provider') || process.env.AO_PROVIDER);
+    const model = getArgValue('--model') || process.env.AO_MODEL;
     // --resume last: 自动找最近一次的输出目录
     if (resumeDir === 'last') {
         const { findLatestOutput } = await import('./output/reporter.js');
@@ -123,18 +136,18 @@ async function handleRun() {
 function handleValidate() {
     const filePath = args[1];
     if (!filePath) {
-        console.error('用法: ao validate <workflow.yaml>');
+        console.error(t('validate.usage'));
         process.exit(1);
     }
     try {
         const workflow = parseWorkflow(resolve(filePath));
         const errors = validateWorkflow(workflow);
         if (errors.length === 0) {
-            console.log(`  ${workflow.name} — 校验通过`);
-            console.log(`  ${workflow.steps.length} 个步骤, ${(workflow.inputs || []).length} 个输入`);
+            console.log(`  ${t('validate.ok', { name: workflow.name })}`);
+            console.log(`  ${t('validate.stats', { steps: workflow.steps.length, inputs: (workflow.inputs || []).length })}`);
         }
         else {
-            console.error(`  ${workflow.name} — 校验失败:\n`);
+            console.error(`  ${t('validate.failed', { name: workflow.name })}\n`);
             for (const err of errors) {
                 console.error(`  - ${err}`);
             }
@@ -142,21 +155,21 @@ function handleValidate() {
         }
     }
     catch (err) {
-        console.error(`错误: ${err instanceof Error ? err.message : err}`);
+        console.error(`${t('error.prefix')}: ${err instanceof Error ? err.message : err}`);
         process.exit(1);
     }
 }
 function handlePlan() {
     const filePath = args[1];
     if (!filePath) {
-        console.error('用法: ao plan <workflow.yaml>');
+        console.error(t('plan.usage'));
         process.exit(1);
     }
     try {
         const workflow = parseWorkflow(resolve(filePath));
         const errors = validateWorkflow(workflow);
         if (errors.length > 0) {
-            console.error(`校验失败:\n${errors.map(e => `  - ${e}`).join('\n')}`);
+            console.error(`${t('plan.validate_failed')}\n${errors.map(e => `  - ${e}`).join('\n')}`);
             process.exit(1);
         }
         const dag = buildDAG(workflow);
@@ -164,7 +177,7 @@ function handlePlan() {
         console.log(formatDAG(dag));
     }
     catch (err) {
-        console.error(`错误: ${err instanceof Error ? err.message : err}`);
+        console.error(`${t('error.prefix')}: ${err instanceof Error ? err.message : err}`);
         process.exit(1);
     }
 }
@@ -242,10 +255,10 @@ async function handleCompose() {
             autoRun,
             lang: composeLang,
         });
-        console.log(`\n  ✅ 工作流已生成: ${relativePath}\n`);
+        console.log(`\n  ${t('compose.generated', { path: relativePath })}\n`);
         // 校验警告
         if (warnings.length > 0) {
-            console.log('  ⚠️  校验发现问题（AI 生成的 YAML 可能需要手动调整）:');
+            console.log(`  ${t('compose.warnings_header')}`);
             for (const w of warnings) {
                 console.log(`    - ${w}`);
             }
@@ -253,13 +266,13 @@ async function handleCompose() {
         }
         if (autoRun) {
             // --run 模式：校验有严重问题时不执行
-            if (warnings.some(w => w.includes('解析失败'))) {
-                console.error('  生成的 YAML 有解析错误，无法自动运行。请手动修复后执行:');
+            if (warnings.some(w => w.includes('解析失败') || w.toLowerCase().includes('parse failed'))) {
+                console.error(`  ${t('compose.retry_yaml_bad')}`);
                 console.error(`    ao run ${relativePath}`);
                 process.exit(1);
             }
             console.log('─'.repeat(50));
-            console.log('  开始执行工作流...\n');
+            console.log(`  ${t('compose.auto_running')}\n`);
             // 保底：如果 LLM 仍然生成了 required inputs，用用户描述填充
             const { parseWorkflow } = await import('./core/parser.js');
             const workflow = parseWorkflow(resolve(savedPath));
@@ -278,7 +291,7 @@ async function handleCompose() {
             process.exit(result.success ? 0 : 1);
         }
         // 非 --run 模式：显示预览和下一步提示
-        console.log('  预览:');
+        console.log(`  ${t('compose.preview')}`);
         const previewLines = yaml.split('\n').slice(0, 30);
         for (const line of previewLines) {
             console.log(`    ${line}`);
@@ -287,14 +300,14 @@ async function handleCompose() {
             console.log('    ...');
         }
         console.log('');
-        console.log('  接下来可以:');
-        console.log(`    ao validate ${relativePath}   校验工作流`);
-        console.log(`    ao plan ${relativePath}       查看执行计划`);
-        console.log(`    ao run ${relativePath}        运行工作流`);
+        console.log(`  ${t('compose.next_steps')}`);
+        console.log(`    ao validate ${relativePath}   ${t('compose.next.validate')}`);
+        console.log(`    ao plan ${relativePath}       ${t('compose.next.plan')}`);
+        console.log(`    ao run ${relativePath}        ${t('compose.next.run')}`);
         console.log('');
     }
     catch (err) {
-        console.error(`\n错误: ${err instanceof Error ? err.message : err}`);
+        console.error(`\n${t('error.prefix')}: ${err instanceof Error ? err.message : err}`);
         process.exit(1);
     }
 }
@@ -326,6 +339,50 @@ async function handleInit() {
         await interactiveInitWorkflow();
         return;
     }
+    // ao init --provider X --model Y --base-url Z --api-key K → write ./.env
+    const cfgProvider = getArgValue('--provider');
+    const cfgModel = getArgValue('--model');
+    const cfgBaseUrl = getArgValue('--base-url') || getArgValue('--baseurl');
+    const cfgApiKey = getArgValue('--api-key') || getArgValue('--apikey');
+    if (cfgProvider || cfgModel || cfgBaseUrl || cfgApiKey) {
+        const updates = {};
+        if (cfgProvider)
+            updates.AO_PROVIDER = cfgProvider;
+        if (cfgModel)
+            updates.AO_MODEL = cfgModel;
+        if (cfgBaseUrl) {
+            // Route to the env var the matching connector already reads
+            const p = (cfgProvider || '').toLowerCase();
+            const urlVar = p === 'ollama' ? 'OLLAMA_BASE_URL' :
+                'OPENAI_BASE_URL';
+            updates[urlVar] = cfgBaseUrl;
+        }
+        if (cfgApiKey) {
+            // Route api key to the provider-specific var the connectors already read
+            const p = (cfgProvider || process.env.AO_PROVIDER || '').toLowerCase();
+            const keyVar = p === 'deepseek' ? 'DEEPSEEK_API_KEY' :
+                p === 'openai' ? 'OPENAI_API_KEY' :
+                    p === 'anthropic' || p === 'claude' ? 'ANTHROPIC_API_KEY' :
+                        p === 'zhipu' || p === 'glm' ? 'ZHIPU_API_KEY' :
+                            p === 'qwen' || p === 'dashscope' ? 'DASHSCOPE_API_KEY' :
+                                p === 'moonshot' || p === 'kimi' ? 'MOONSHOT_API_KEY' :
+                                    'AO_API_KEY';
+            updates[keyVar] = cfgApiKey;
+        }
+        const envPath = resolve(process.cwd(), '.env');
+        writeEnvFile(updates);
+        const gitignoreUpdated = ensureEnvGitignored();
+        console.log(`  ✅ 已写入 ${envPath}`);
+        for (const [k, v] of Object.entries(updates)) {
+            const shown = /KEY|TOKEN|SECRET/i.test(k) ? v.slice(0, 6) + '…' : v;
+            console.log(`     ${k}=${shown}`);
+        }
+        if (gitignoreUpdated)
+            console.log(`  🔒 已将 .env 加入 .gitignore`);
+        console.log(`\n  下次运行 ao 时会自动加载这些配置。`);
+        console.log(`  也可手动编辑 .env 或复制到其他项目复用。`);
+        return;
+    }
     const lang = getArgValue('--lang') === 'en' ? 'en' : 'zh';
     const pkgName = lang === 'en' ? 'agency-agents' : 'agency-agents-zh';
     const gitRepo = lang === 'en'
@@ -512,57 +569,6 @@ function getVersion() {
     }
 }
 function printHelp() {
-    console.log(`
-  agency-orchestrator — Multi-Agent Workflow Engine
-  基于 agency-agents-zh 的多智能体编排引擎
-
-  Quick Start:
-    ao demo                           零配置体验多智能体协作
-    ao init                           下载 AI 角色定义（中文）
-    ao init --lang en                 Download English AI roles
-    ao roles                          查看所有可用角色
-    ao plan <workflow.yaml>           查看执行计划 (DAG)
-    ao run <workflow.yaml> [options]   执行工作流
-
-  Commands:
-    demo                              零配置体验多智能体协作（mock + 真实 AI）
-    init                              下载/更新角色库 (--lang en 下载英文版)
-    init --workflow                    交互式创建新工作流
-    compose "描述"                     AI 智能编排工作流（一句话生成 YAML）
-    compose "描述" --run               生成并立即运行（一句话出结果）
-    serve                             启动 MCP Server（供 Claude Code / Cursor 调用）
-    run <workflow.yaml>               执行工作流
-    validate <workflow.yaml>          校验工作流定义
-    plan <workflow.yaml>              查看执行计划
-    explain <workflow.yaml>           用自然语言解释执行计划
-    roles [--agents-dir path]         列出可用角色
-
-  Options:
-    --input, -i key=value    传入输入变量
-    --input, -i key=@file    从文件读取变量值
-    --provider <name>        覆盖 YAML 中的 LLM provider (如 claude-code, deepseek)
-    --model <name>           覆盖 YAML 中的模型名
-    --output dir             输出目录 (默认 ao-output/)
-    --resume <dir|last>      从上次运行恢复（加载已完成步骤的输出）
-    --from <step-id>         配合 --resume，从指定步骤重新执行
-    --watch                  实时进度显示（终端 UI）
-    --quiet, -q              静默模式
-    --version, -v            版本号
-
-  Examples:
-    ao init
-    ao compose "PR 代码审查，覆盖安全和性能"
-    ao run workflows/story-creation.yaml -i premise='一个时间旅行的故事' -i style='悬疑'
-    ao run workflows/product-review.yaml -i prd_content=@prd.md
-    ao plan workflows/content-pipeline.yaml
-
-  Resume (基于上次结果迭代):
-    ao run workflow.yaml --resume last                    # 跳过上次已完成的步骤
-    ao run workflow.yaml --resume last --from summary     # 从 summary 步骤重新执行
-    ao run workflow.yaml --resume ao-output/xxx/         # 指定具体输出目录
-
-  Agents (中文): https://github.com/jnMetaCode/agency-agents-zh
-  Agents (English): https://github.com/msitarzewski/agency-agents
-  `);
+    console.log(t('help.text'));
 }
 main();

package/dist/connectors/claude-code.js

@@ -13,6 +13,7 @@ import { spawn } from 'node:child_process';
 import { writeFileSync, unlinkSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
+import { t } from '../i18n.js';
 export class ClaudeCodeConnector {
     async chat(systemPrompt, userMessage, config) {
         const timeout = config.timeout || 600_000; // 默认 10 分钟
@@ -69,7 +70,7 @@ export class ClaudeCodeConnector {
                 if (now - lastProgressTime > 10_000) {
                     lastProgressTime = now;
                     const kb = (receivedBytes / 1024).toFixed(1);
-                    process.stderr.write(`  📡 已接收 ${kb}KB...\n`);
+                    process.stderr.write(`  ${t('stream.received', { size: kb })}\n`);
                 }
             });
             child.stderr.on('data', (chunk) => { stderr += chunk.toString(); });

package/dist/connectors/cli-base.js

@@ -8,6 +8,7 @@
  * 避免 ENAMETOOLONG 错误（GitHub issue #1）
  */
 import { spawn } from 'node:child_process';
+import { t } from '../i18n.js';
 /**
  * 命令行参数安全长度上限
  * claude -p 等 CLI 工具通过命令行参数传大 prompt 会严重变慢
@@ -60,7 +61,7 @@ export class CLIBaseConnector {
                 if (now - lastProgressTime > 10_000) {
                     lastProgressTime = now;
                     const kb = (receivedBytes / 1024).toFixed(1);
-                    process.stderr.write(`  📡 已接收 ${kb}KB...\n`);
+                    process.stderr.write(`  ${t('stream.received', { size: kb })}\n`);
                 }
             });
             child.stderr.on('data', (chunk) => { stderr += chunk.toString(); });

package/dist/core/dag.js

@@ -1,3 +1,4 @@
+import { t } from '../i18n.js';
 /**
  * 从 WorkflowDefinition 构建 DAG
  */
@@ -82,7 +83,7 @@ function topologicalLevels(nodes) {
  * 格式化 DAG 为可读文本（用于 `ao plan` 命令）
  */
 export function formatDAG(dag) {
-    const lines = ['执行计划:\n'];
+    const lines = [`${t('dag.title')}\n`];
     for (let i = 0; i < dag.levels.length; i++) {
         const level = dag.levels[i];
         const parallel = level.length > 1;
@@ -90,16 +91,16 @@ export function formatDAG(dag) {
             const node = dag.nodes.get(level[j]);
             const step = node.step;
             const prefix = parallel ? (j === 0 ? '┌' : j === level.length - 1 ? '└' : '├') : '→';
-            const tag = parallel ? ' (并行)' : '';
-            lines.push(`  第${i + 1}层 ${prefix} [${step.id}] ${step.role || step.type}${tag}`);
+            const tag = parallel ? t('dag.parallel') : '';
+            lines.push(`  ${t('dag.layer', { n: i + 1 })} ${prefix} [${step.id}] ${step.role || step.type}${tag}`);
             if (node.dependencies.length > 0) {
-                lines.push(`         依赖: ${node.dependencies.join(', ')}`);
+                lines.push(`         ${t('dag.deps')}: ${node.dependencies.join(', ')}`);
             }
             if (step.condition) {
-                lines.push(`         条件: ${step.condition}`);
+                lines.push(`         ${t('dag.condition')}: ${step.condition}`);
             }
             if (step.loop) {
-                lines.push(`         循环: → ${step.loop.back_to} (最多 ${step.loop.max_iterations} 次)`);
+                lines.push(`         ${t('dag.loop', { to: step.loop.back_to, n: step.loop.max_iterations })}`);
             }
         }
         if (i < dag.levels.length - 1)

package/dist/core/parser.js

@@ -3,37 +3,38 @@
  */
 import { readFileSync } from 'node:fs';
 import yaml from 'js-yaml';
+import { t } from '../i18n.js';
 export function parseWorkflow(filePath) {
     const raw = readFileSync(filePath, 'utf-8');
     const doc = yaml.load(raw);
     // 基本校验
     if (!doc || typeof doc !== 'object') {
-        throw new Error(`工作流文件格式错误: ${filePath}`);
+        throw new Error(t('parse.bad_yaml', { path: filePath }));
     }
     if (!doc.name || typeof doc.name !== 'string') {
-        throw new Error('工作流缺少 name 字段');
+        throw new Error(t('parse.missing_name'));
     }
     if (!doc.steps || !Array.isArray(doc.steps) || doc.steps.length === 0) {
-        throw new Error('工作流缺少 steps 或 steps 为空');
+        throw new Error(t('parse.missing_steps'));
     }
     if (!doc.llm || typeof doc.llm !== 'object') {
-        throw new Error('工作流缺少 llm 配置');
+        throw new Error(t('parse.missing_llm'));
     }
     const llm = doc.llm;
     if (!llm.provider) {
-        throw new Error('llm 配置缺少 provider');
+        throw new Error(t('parse.missing_provider'));
     }
     // CLI providers (claude-code, gemini-cli, copilot-cli, codex-cli, openclaw-cli, hermes-cli) 和 ollama 不需要 model
     const cliProviders = ['claude-code', 'gemini-cli', 'copilot-cli', 'codex-cli', 'openclaw-cli', 'hermes-cli', 'ollama'];
     if (!llm.model && !cliProviders.includes(llm.provider)) {
-        throw new Error('llm 配置缺少 model（CLI provider 可省略）');
+        throw new Error(t('parse.missing_model'));
     }
     // 校验每个 step
     const stepIds = new Set();
     const steps = doc.steps;
     for (const step of steps) {
         if (!step.id)
-            throw new Error('step 缺少 id');
+            throw new Error(t('parse.missing_step_id'));
         if (stepIds.has(step.id))
             throw new Error(`step id 重复: ${step.id}`);
         stepIds.add(step.id);
@@ -101,10 +102,7 @@ export function validateWorkflow(workflow) {
             if (!inputDef && !isOutput && varName !== '_loop_iteration') {
                 errors.push(`step "${step.id}" 引用了未定义的变量: {{${varName}}}`);
             }
-            // 可选输入无默认值用在模板中 → 警告
-            if (inputDef && !inputDef.required && inputDef.default === undefined) {
-                errors.push(`step "${step.id}" 使用了可选输入 {{${varName}}}，但未设置默认值（未提供时为空字符串）`);
-            }
+            // 可选输入无默认值时，运行时自动填空字符串 — 非错误，不再警告
         }
     }
     // 检查循环依赖

package/dist/i18n.d.ts

@@ -0,0 +1,19 @@
+/**
+ * Minimal i18n for CLI user-facing strings.
+ *
+ * Language detection priority:
+ *   1. --lang=en CLI flag
+ *   2. AO_LANG env var
+ *   3. LANG env var (en_US.UTF-8 → en)
+ *   4. Default: zh
+ */
+type Lang = 'zh' | 'en';
+export declare function detectLang(argv?: string[]): Lang;
+export declare function setLang(lang: Lang): void;
+type Dict = Record<string, {
+    zh: string;
+    en: string;
+}>;
+declare const dict: Dict;
+export declare function t(key: keyof typeof dict, params?: Record<string, string | number>): string;
+export {};