agency-orchestrator 0.6.12 → 0.6.14

package/dist/cli.js

@@ -433,10 +433,12 @@ async function handleInit() {
         if (cfgModel)
             updates.AO_MODEL = cfgModel;
         if (cfgBaseUrl) {
-            // Route to the env var the matching connector already reads
+            // Route to the env var the matching connector already reads.
+            // 每个 provider 写到自己专属的 BASE_URL env，避免 issue #16 的跨污染
             const p = (cfgProvider || '').toLowerCase();
             const urlVar = p === 'ollama' ? 'OLLAMA_BASE_URL' :
-                'OPENAI_BASE_URL';
+                p === 'deepseek' ? 'DEEPSEEK_BASE_URL' :
+                    'OPENAI_BASE_URL';
             updates[urlVar] = cfgBaseUrl;
         }
         if (cfgApiKey) {

package/dist/connectors/factory.js

@@ -28,9 +28,11 @@ export function createConnector(config) {
         case 'claude':
             return new ClaudeConnector(config.api_key);
         case 'deepseek':
+            // 不 fallback OPENAI_BASE_URL — issue #16: 用户设了 OPENAI_BASE_URL=openai.com 后切到
+            // deepseek 会用 OpenAI endpoint + DeepSeek key 调，得到 405。每个 provider 用自己专属 env
             return new OpenAICompatibleConnector({
                 apiKey: config.api_key || process.env.DEEPSEEK_API_KEY,
-                baseUrl: config.base_url || process.env.OPENAI_BASE_URL || 'https://api.deepseek.com/v1',
+                baseUrl: config.base_url || process.env.DEEPSEEK_BASE_URL || 'https://api.deepseek.com/v1',
             });
         case 'openai':
             return new OpenAICompatibleConnector({

package/dist/connectors/openai-compatible.d.ts

@@ -7,7 +7,8 @@
 import type { LLMConnector, LLMResult, LLMConfig } from '../types.js';
 export declare class OpenAICompatibleConnector implements LLMConnector {
     private apiKey;
-    private baseUrl;
+    /** 只读暴露给外部 debug / 测试用，运行时不可变 */
+    readonly baseUrl: string;
     constructor(options?: {
         apiKey?: string;
         baseUrl?: string;

package/dist/connectors/openai-compatible.js

@@ -11,6 +11,7 @@ function estimateTokens(text) {
 }
 export class OpenAICompatibleConnector {
     apiKey;
+    /** 只读暴露给外部 debug / 测试用，运行时不可变 */
     baseUrl;
     constructor(options = {}) {
         this.apiKey = options.apiKey || process.env.OPENAI_API_KEY || '';

package/dist/core/parser.js

@@ -65,6 +65,12 @@ export function validateWorkflow(workflow) {
     const stepById = new Map(workflow.steps.map(s => [s.id, s]));
     // step.output 唯一性检查：两个 step 不能 output 到同一个变量名
     // 否则下游引用拿到的值取决于 context Map 的写入顺序，不可预期
+    //
+    // 两类合法例外不报错：
+    // 1. any_completed 分支收敛：下游用 depends_on_mode: any_completed 引用这些
+    //    重名 step（任一分支完成即走，重名 output 是有意设计）
+    // 2. loop 迭代覆盖：重名 step 中有任一个带 loop 字段（种子 step + loop step
+    //    反复覆盖同名 output，是常见的"原地修改"迭代模式，如 write/revise/brand_review 链）
     const outputToSteps = new Map();
     for (const step of workflow.steps) {
         if (!step.output)
@@ -74,9 +80,17 @@ export function validateWorkflow(workflow) {
         outputToSteps.set(step.output, owners);
     }
     for (const [outName, owners] of outputToSteps) {
-        if (owners.length > 1) {
-            errors.push(`output 变量 "${outName}" 被多个 step 同时产出: ${owners.join(', ')}（重名会让下游引用结果不确定）`);
-        }
+        if (owners.length <= 1)
+            continue;
+        const ownerSet = new Set(owners);
+        const hasAnyCompletedConsumer = workflow.steps.some(s => s.depends_on_mode === 'any_completed'
+            && s.depends_on?.some(d => ownerSet.has(d)));
+        if (hasAnyCompletedConsumer)
+            continue;
+        const hasLoopOwner = owners.some(id => stepById.get(id)?.loop);
+        if (hasLoopOwner)
+            continue;
+        errors.push(`output 变量 "${outName}" 被多个 step 同时产出: ${owners.join(', ')}（重名会让下游引用结果不确定）`);
     }
     // 计算每个 step 的 DAG 上游 step ids（递归 depends_on 闭包，不含自身）。
     // 用于校验"变量必须来自 inputs 或当前 step 的上游"——和 autoFix 的拓扑约束保持一致

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agency-orchestrator",
-  "version": "0.6.12",
+  "version": "0.6.14",
   "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",
@@ -64,7 +64,7 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
-    "test": "npx tsx test/run.ts && npx tsx test/condition.ts && npx tsx test/cli.ts && npx tsx test/compose.ts && npx tsx test/demo.ts && npx tsx test/e2e.ts && npx tsx test/e2e-condition.ts && npx tsx test/e2e-loop.ts && npx tsx test/mcp.ts",
+    "test": "npx tsx test/run.ts && npx tsx test/condition.ts && npx tsx test/cli.ts && npx tsx test/compose.ts && npx tsx test/demo.ts && npx tsx test/factory-custom.ts && npx tsx test/step-llm.ts && npx tsx test/step-llm-yaml.ts && npx tsx test/stdin-limit.ts && npx tsx test/compose-name.ts && npx tsx test/e2e.ts && npx tsx test/e2e-condition.ts && npx tsx test/e2e-loop.ts && npx tsx test/mcp.ts",
     "prepublishOnly": "npm run build"
   },
   "files": [

package/workflows/investment-analysis.yaml

@@ -87,7 +87,7 @@ steps:
 
       每条风险明确标「发生概率」（高/中/低）。
     output: risk
-    depends_on: [research]
+    depends_on: [research, financial]
 
   - id: cfo_opinion
     role: "finance/finance-financial-forecaster"

package/workflows/legal-consultation.yaml

@@ -97,7 +97,7 @@ steps:
 
       ⚠️ 所有法条引用不确定处必须明确标「需核实最新法规」。
     output: risk_analysis
-    depends_on: [intake]
+    depends_on: [intake, document_review]
 
   - id: opinion
     role: "legal/legal-policy-writer"

package/workflows/marketing/xiaohongshu-content.yaml

@@ -81,7 +81,7 @@ steps:
 
       风格参考：小红书当前热门的视觉趋势。
     output: visual_plan
-    depends_on: [topic_planning]
+    depends_on: [topic_planning, write_notes]
 
   - id: optimize
     role: "marketing/marketing-xiaohongshu-operator"