agency-orchestrator 0.4.1 → 0.4.2

package/dist/connectors/cli-base.d.ts

@@ -2,7 +2,7 @@ import type { LLMConnector, LLMResult, LLMConfig } from '../types.js';
 export interface CLIConnectorConfig {
     /** CLI 命令名 */
     command: string;
-    /** 显示名称（用于错误消���） */
+    /** 显示名称（用于错误消息） */
     displayName: string;
     /** 构建命令行参数 */
     buildArgs: (fullPrompt: string, config: LLMConfig) => string[];

package/dist/connectors/cli-base.js

@@ -1,8 +1,8 @@
 /**
  * CLI Connector 通用基类
- * 通过本地 AI CLI 工具调用，使用用户的订阅���度，无需 API key
+ * 通过本地 AI CLI 工具调用，使用用户的订阅额度，无需 API key
  *
- * 支持: Claude Code / Gemini CLI / Copilot CLI / Codex CLI
+ * 支持: Claude Code / Gemini CLI / Copilot CLI / Codex CLI / OpenClaw CLI
  */
 import { execFile } from 'node:child_process';
 import { promisify } from 'node:util';
@@ -19,7 +19,7 @@ export class CLIBaseConnector {
         const args = this.cfg.buildArgs(fullPrompt, config);
         const timeout = config.timeout || 180000;
         try {
-            const { stdout } = await execFileAsync(this.cfg.command, args, {
+            const { stdout, stderr } = await execFileAsync(this.cfg.command, args, {
                 timeout,
                 maxBuffer: 10 * 1024 * 1024,
                 env: { ...process.env },
@@ -27,6 +27,9 @@ export class CLIBaseConnector {
             const content = this.cfg.parseOutput
                 ? this.cfg.parseOutput(stdout)
                 : stdout.trim();
+            if (!content && stderr) {
+                throw new Error(`${this.cfg.displayName} 返回空内容，stderr: ${stderr.slice(0, 500)}`);
+            }
             return {
                 content,
                 usage: {
@@ -37,7 +40,12 @@ export class CLIBaseConnector {
         }
         catch (err) {
             if (err.killed || err.signal === 'SIGTERM') {
-                throw new Error(`${this.cfg.displayName} 超时 (${timeout}ms)`);
+                throw new Error(`${this.cfg.displayName} 超时 (${timeout / 1000}s)，可在 YAML 中设置 timeout 增加等待时间`);
+            }
+            // 区分"未安装"和"执行失败"
+            if (err.code === 'ENOENT') {
+                throw new Error(`找不到 ${this.cfg.command} 命令，请先安装 ${this.cfg.displayName}\n` +
+                    `参考: https://github.com/jnMetaCode/agency-orchestrator#llm-配置`);
             }
             throw new Error(`${this.cfg.displayName} 调用失败: ${err.message}`);
         }

package/dist/connectors/openclaw-cli.d.ts

@@ -4,6 +4,10 @@
  *
  * 安装: npm install -g openclaw@latest
  * 认证: openclaw onboard --install-daemon（引导配置）
+ *
+ * 注意: openclaw agent 必须指定 --agent <id>，否则会报
+ * "Pass --to <E.164>, --session-id, or --agent to choose a session"
+ * 默认使用 "main" agent，可通过 YAML model 字段或 OPENCLAW_AGENT 环境变量覆盖
  */
 import { CLIBaseConnector } from './cli-base.js';
 export declare class OpenClawCLIConnector extends CLIBaseConnector {

package/dist/connectors/openclaw-cli.js

@@ -4,6 +4,10 @@
  *
  * 安装: npm install -g openclaw@latest
  * 认证: openclaw onboard --install-daemon（引导配置）
+ *
+ * 注意: openclaw agent 必须指定 --agent <id>，否则会报
+ * "Pass --to <E.164>, --session-id, or --agent to choose a session"
+ * 默认使用 "main" agent，可通过 YAML model 字段或 OPENCLAW_AGENT 环境变量覆盖
  */
 import { CLIBaseConnector } from './cli-base.js';
 export class OpenClawCLIConnector extends CLIBaseConnector {
@@ -11,8 +15,22 @@ export class OpenClawCLIConnector extends CLIBaseConnector {
         super({
             command: 'openclaw',
             displayName: 'OpenClaw CLI',
-            buildArgs: (prompt, _config) => {
-                return ['agent', '--message', prompt];
+            buildArgs: (prompt, config) => {
+                // model 字段复用为 agent id，例如 model: "my-agent"
+                const agentId = config.model || process.env.OPENCLAW_AGENT || 'main';
+                return ['agent', '--agent', agentId, '--message', prompt];
+            },
+            parseOutput: (stdout) => {
+                // OpenClaw 的 stdout 可能混入插件日志（如 ShellWard 的 ANSI 彩色输出）
+                // 过滤掉 [plugins] 前缀行和 ANSI 控制码行
+                return stdout
+                    .split('\n')
+                    .filter(line => {
+                    const clean = line.replace(/\x1b\[[0-9;]*m/g, '').trim();
+                    return clean && !clean.startsWith('[plugins]');
+                })
+                    .join('\n')
+                    .trim();
             },
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agency-orchestrator",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Multi-agent YAML workflow engine — 186 AI roles, auto DAG parallelism, zero code. Use your existing subscription (Claude Max / ChatGPT Plus / Copilot / Gemini free) — no API key needed. Industry first.",
   "keywords": [
     "multi-agent",

package/workflows/content-pipeline.yaml

@@ -5,7 +5,7 @@ agents_dir: "agency-agents-zh"
 
 llm:
   provider: "claude"
-  model: "claude-sonnet-4-6"
+  model: "claude-sonnet-4-20250514"
   max_tokens: 4096
 
 concurrency: 2