agency-orchestrator 0.6.0 → 0.6.2

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';
@@ -234,9 +234,9 @@ async function handleCompose() {
         console.error('  --lang <zh|en>      语言 (默认自动检测 / auto-detect)');
         process.exit(1);
     }
-    const provider = (getArgValue('--provider') || 'deepseek');
+    const provider = (getArgValue('--provider') || process.env.AO_PROVIDER || 'deepseek');
     const cliProviders = ['claude-code', 'gemini-cli', 'copilot-cli', 'codex-cli', 'openclaw-cli', 'hermes-cli'];
-    const model = getArgValue('--model') || (cliProviders.includes(provider) ? '' :
+    const model = getArgValue('--model') || process.env.AO_MODEL || (cliProviders.includes(provider) ? '' :
         provider === 'deepseek' ? 'deepseek-chat' :
             provider === 'claude' ? 'claude-sonnet-4-20250514' :
                 'gpt-4o');
@@ -526,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',
@@ -543,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agency-orchestrator",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "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",