agency-orchestrator 0.5.3 → 0.6.1

package/dist/cli.js

@@ -9,7 +9,7 @@
  *   ao roles --agents-dir ./agents
  */
 import { readFileSync, existsSync } from 'node:fs';
-import { resolve } from 'node:path';
+import { resolve, join, dirname } from 'node:path';
 import { execSync } from 'node:child_process';
 import { parseWorkflow, validateWorkflow } from './core/parser.js';
 import { buildDAG, formatDAG } from './core/dag.js';
@@ -17,6 +17,9 @@ 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) {
@@ -93,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');
@@ -335,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'
@@ -478,16 +526,32 @@ function parseInputArgs() {
  * 2. ./agency-agents (英文角色，ao init --lang en 下载的)
  * 3. ../agency-agents-zh 或 ../agency-agents (同级目录)
  * 4. ./agents (自定义)
+ * 5. node_modules/agency-agents-zh (npm 依赖，全局安装时)
+ * 6. 包内置 agency-agents/ (随 npm 包分发，与 dist/ 同级)
  *
  * @param preferLang 优先语言，影响搜索顺序
  */
 function resolveAgentsDir(preferLang) {
+    // scriptDir = dist/ inside the installed package
+    const scriptDir = dirname(new URL(import.meta.url).pathname);
     const zhFirst = [
         './agency-agents-zh',
         './agency-agents',
         '../agency-agents-zh',
         '../agency-agents',
         './agents',
+        // npm 依赖 (cwd/node_modules)
+        './node_modules/agency-agents-zh',
+        './node_modules/agency-agents',
+        // npm 依赖 (包自身的 node_modules，全局安装时)
+        join(scriptDir, '..', 'node_modules', 'agency-agents-zh'),
+        join(scriptDir, '..', 'node_modules', 'agency-agents'),
+        // hoisted node_modules (npm 有时会提升依赖)
+        join(scriptDir, '..', '..', 'node_modules', 'agency-agents-zh'),
+        join(scriptDir, '..', '..', 'node_modules', 'agency-agents'),
+        // 包内置 agency-agents/ (与 dist/ 同级)
+        join(scriptDir, '..', 'agency-agents-zh'),
+        join(scriptDir, '..', 'agency-agents'),
     ];
     const enFirst = [
         './agency-agents',
@@ -495,12 +559,24 @@ function resolveAgentsDir(preferLang) {
         '../agency-agents',
         '../agency-agents-zh',
         './agents',
+        // npm 依赖 (cwd/node_modules)
+        './node_modules/agency-agents',
+        './node_modules/agency-agents-zh',
+        // npm 依赖 (包自身的 node_modules，全局安装时)
+        join(scriptDir, '..', 'node_modules', 'agency-agents'),
+        join(scriptDir, '..', 'node_modules', 'agency-agents-zh'),
+        // hoisted node_modules
+        join(scriptDir, '..', '..', 'node_modules', 'agency-agents'),
+        join(scriptDir, '..', '..', 'node_modules', 'agency-agents-zh'),
+        // 包内置
+        join(scriptDir, '..', 'agency-agents'),
+        join(scriptDir, '..', 'agency-agents-zh'),
     ];
     const candidates = preferLang === 'en' ? enFirst : zhFirst;
     for (const dir of candidates) {
         const full = resolve(dir);
         if (existsSync(full))
-            return dir;
+            return full;
     }
     return preferLang === 'en' ? './agency-agents' : './agency-agents-zh';
 }

package/dist/i18n.js

@@ -152,6 +152,7 @@ const dict = {
     demo                              零配置体验多智能体协作（mock + 真实 AI）
     init                              下载/更新角色库 (--lang en 下载英文版)
     init --workflow                   交互式创建新工作流
+    init --provider <p> --model <m>   写入 .env 默认配置（支持 --base-url, --api-key）
     compose "描述"                    AI 智能编排工作流（一句话生成 YAML）
     compose "描述" --run              生成并立即运行（一句话出结果）
     serve                             启动 MCP Server（供 Claude Code / Cursor 调用）
@@ -204,6 +205,7 @@ const dict = {
     demo                              Zero-config demo (mock + real AI)
     init                              Download/update role library (--lang en for English)
     init --workflow                   Interactively create a new workflow
+    init --provider <p> --model <m>   Write default config to .env (supports --base-url, --api-key)
     compose "desc"                    AI-compose a workflow from one sentence
     compose "desc" --run              Compose and run immediately
     serve                             Start MCP server (for Claude Code / Cursor)

package/dist/utils/env-loader.d.ts

@@ -0,0 +1,9 @@
+export declare function loadEnvFile(path?: string): Record<string, string>;
+/**
+ * Merge KV pairs into .env (preserves existing lines, updates matching keys, appends new).
+ */
+export declare function writeEnvFile(updates: Record<string, string>, path?: string): void;
+/**
+ * Ensure .env is in .gitignore (only if .gitignore exists).
+ */
+export declare function ensureEnvGitignored(cwd?: string): boolean;

package/dist/utils/env-loader.js

@@ -0,0 +1,110 @@
+/**
+ * Minimal .env loader — no deps.
+ *
+ * Reads ./.env from cwd and populates process.env WITHOUT overwriting
+ * values already set by the shell. This preserves the precedence:
+ *   shell env  >  .env  >  defaults
+ *
+ * Supported syntax:
+ *   KEY=value
+ *   KEY="value with spaces"
+ *   KEY='value'
+ *   # comment lines
+ *   blank lines
+ *
+ * Not supported (keep it simple): multi-line values, variable expansion.
+ */
+import { readFileSync, existsSync, writeFileSync, chmodSync } from 'node:fs';
+import { resolve } from 'node:path';
+const LINE_RE = /^\s*([A-Z_][A-Z0-9_]*)\s*=\s*(.*)\s*$/i;
+export function loadEnvFile(path = resolve(process.cwd(), '.env')) {
+    if (!existsSync(path))
+        return {};
+    const raw = readFileSync(path, 'utf-8');
+    const out = {};
+    for (const rawLine of raw.split(/\r?\n/)) {
+        const line = rawLine.trim();
+        if (!line || line.startsWith('#'))
+            continue;
+        const m = line.match(LINE_RE);
+        if (!m)
+            continue;
+        const key = m[1];
+        let val = m[2];
+        // Strip inline comments (only when value isn't quoted)
+        if (!/^["']/.test(val)) {
+            const hashIdx = val.indexOf(' #');
+            if (hashIdx >= 0)
+                val = val.slice(0, hashIdx).trim();
+        }
+        // Unquote
+        if ((val.startsWith('"') && val.endsWith('"')) || (val.startsWith("'") && val.endsWith("'"))) {
+            val = val.slice(1, -1);
+        }
+        out[key] = val;
+        // Shell env takes precedence — don't clobber
+        if (process.env[key] === undefined) {
+            process.env[key] = val;
+        }
+    }
+    return out;
+}
+/**
+ * Merge KV pairs into .env (preserves existing lines, updates matching keys, appends new).
+ */
+export function writeEnvFile(updates, path = resolve(process.cwd(), '.env')) {
+    const existing = existsSync(path) ? readFileSync(path, 'utf-8') : '';
+    const lines = existing.split(/\r?\n/);
+    const seen = new Set();
+    const patched = lines.map(line => {
+        const m = line.match(LINE_RE);
+        if (!m)
+            return line;
+        const key = m[1];
+        if (key in updates) {
+            seen.add(key);
+            return `${key}=${quoteIfNeeded(updates[key])}`;
+        }
+        return line;
+    });
+    // Drop trailing blank lines for clean append
+    while (patched.length > 0 && patched[patched.length - 1].trim() === '')
+        patched.pop();
+    const toAppend = [];
+    for (const [k, v] of Object.entries(updates)) {
+        if (!seen.has(k))
+            toAppend.push(`${k}=${quoteIfNeeded(v)}`);
+    }
+    // Only add the header once — skip if the file already has it
+    const hasHeader = patched.some(l => l.trim() === '# Added by `ao init`');
+    const appendBlock = toAppend.length
+        ? (hasHeader ? ['', ...toAppend] : ['', '# Added by `ao init`', ...toAppend])
+        : [];
+    const final = [...patched, ...appendBlock, ''].join('\n');
+    writeFileSync(path, final, 'utf-8');
+    // Lock down — .env often contains API keys. Windows ignores chmod, so swallow errors.
+    try {
+        chmodSync(path, 0o600);
+    }
+    catch { /* non-POSIX fs */ }
+}
+function quoteIfNeeded(v) {
+    if (/[\s#"']/.test(v))
+        return `"${v.replace(/"/g, '\\"')}"`;
+    return v;
+}
+/**
+ * Ensure .env is in .gitignore (only if .gitignore exists).
+ */
+export function ensureEnvGitignored(cwd = process.cwd()) {
+    const gitignorePath = resolve(cwd, '.gitignore');
+    if (!existsSync(gitignorePath))
+        return false;
+    const content = readFileSync(gitignorePath, 'utf-8');
+    const hasEnv = content.split(/\r?\n/).some(l => l.trim() === '.env');
+    if (hasEnv)
+        return false;
+    const appended = content + (content.endsWith('\n') ? '' : '\n') + '\n# agency-orchestrator local config\n.env\n';
+    writeFileSync(gitignorePath, appended, 'utf-8');
+    return true;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agency-orchestrator",
-  "version": "0.5.3",
+  "version": "0.6.1",
   "description": "Multi-agent YAML workflow engine — 211 AI roles, auto DAG parallelism, zero code. One sentence → multiple AI roles collaborate → complete plan in minutes. 10 LLM providers, 7 need no API key.",
   "keywords": [
     "multi-agent",