opc-agent 4.1.1 → 4.1.2

package/USABILITY-ISSUES.md

@@ -0,0 +1,73 @@
+# OPC Agent 易用性问题清单
+
+日期: 2026-04-20
+目标: 易用性超过 OpenClaw 和 DeerFlow
+
+## 🔴 Critical (新用户第一次就遇到)
+
+### C1: .env 和 oad.yaml 配置矛盾
+- .env 设了 `OPC_LLM_BASE_URL=https://api.openai.com/v1` 和 `OPC_LLM_MODEL=gpt-4o-mini`
+- 但 oad.yaml 里 `provider: deepseek`, `model: deepseek-chat`
+- 新用户困惑：到底听谁的？
+- **修复**: init 时让用户选 provider，.env 和 oad.yaml 统一生成
+
+### C2: .env 占位符 API key 导致 401
+- 默认 `OPC_LLM_API_KEY=your-api-key-here` 导致第一次对话直接 401
+- 用户看到 "Incorrect API key" 错误，不知道怎么修
+- **修复**: init 时提示输入 API key 或选择 Ollama(免费本地)
+- 如果没配 key，chat 应该给友好提示而不是 raw 401 JSON
+
+### C3: agent.yaml vs oad.yaml 双配置文件
+- init 生成了 agent.yaml 和 oad.yaml 两个文件
+- doctor 检查 agent.yaml 但 runtime 读 oad.yaml
+- **修复**: 统一用一个文件
+
+## 🟡 Important (影响体验但不致命)
+
+### I1: opc doctor 误报
+- "agent.yaml exists: Not found" — 但实际有 oad.yaml
+- "TypeScript installed: Not found" — 但 npx tsx 能跑
+- "Ollama running: Not running" — 不是所有用户都用 Ollama
+- "DeepBrain package: Not installed" — 但 opc-agent 自带内存 fallback
+- **修复**: doctor 应该检查 oad.yaml，对非必须项给 warning 不给 ❌
+
+### I2: Chat 401 错误消息不友好
+- 返回 raw SSE `data: {"error":"LLM API error 401: {...}"}` 
+- Web UI 应该显示 "请先配置 API Key" + 指引
+- **修复**: 前端拦截 401，显示配置指引
+
+### I3: Studio /api/dashboard 404
+- Dashboard API 不存在
+- **修复**: 实现或移除 dashboard 入口
+
+### I4: DeepBrain fallback 无声失败
+- 日志显示 `[DeepBrainMemory] deepbrain package not found, using in-memory fallback`
+- 用户不知道记忆没有持久化
+- **修复**: 首次运行时提示，或默认用文件存储
+
+### I5: 没有一键安装脚本
+- OpenClaw 有 `curl | sh` 一键安装
+- 我们需要 `npm install -g opc-agent`，还要自己装 Node
+- **修复**: 做一个安装脚本，检测 OS、装 Node、装 opc-agent
+
+## 🟢 Nice-to-have
+
+### N1: 没有 `opc quickstart` 命令
+- OpenClaw 五分钟上手，我们还是多步手动流程
+- **修复**: 做一个交互式 quickstart，一步到位
+
+### N2: init 模板缺少 Ollama 选项
+- 很多用户想用免费本地模型
+- **修复**: init 时加 Ollama 选项，自动配 ollama provider
+
+### N3: README.md 内容单薄
+- 缺少截图、GIF、快速上手步骤
+- **修复**: 丰富 README
+
+### N4: Studio agent 数据来自旧缓存
+- API 返回 "name: Updated Bot" 而不是 "my-first-agent"
+- **修复**: 确保从 oad.yaml 实时读取
+
+### N5: cron-engine 默认 9 个任务
+- 新建的 agent 不应该有预设的 cron 任务
+- **修复**: 新 agent 默认 0 个 cron 任务

package/dist/channels/web.js

@@ -211,7 +211,7 @@ async function send(){
       for(const line of lines){
         if(!line.startsWith('data: '))continue;
         const dd=line.slice(6);if(dd==='[DONE]')continue;
-        try{const j=JSON.parse(dd);if(j.content)full+=j.content;if(j.error)full='Error: '+j.error;}catch{}
+        try{const j=JSON.parse(dd);if(j.content)full+=j.content;if(j.error){if(j.error.includes('401')||j.error.toLowerCase().includes('api key')||j.error.toLowerCase().includes('unauthorized')){full='⚠️ 请先配置 API Key。编辑项目根目录的 .env 文件，设置 OPC_LLM_API_KEY。';}else{full='Error: '+j.error;}}}catch{}
       }
       d.innerHTML=renderMd(full)+'<span class="cursor"></span>';
       msgs.scrollTop=msgs.scrollHeight;
@@ -220,7 +220,13 @@ async function send(){
     const rx=document.createElement('div');rx.className='reactions';
     rx.innerHTML='<button data-r="👍" onclick="react(this)">👍</button><button data-r="👎" onclick="react(this)">👎</button>';
     wrap.appendChild(rx);
-  }catch(e){d.className='msg error';d.textContent='Error: '+e.message;}
+  }catch(e){
+    d.className='msg error';
+    const errMsg=e.message||'';
+    if(errMsg.includes('401')||errMsg.includes('HTTP 401')){
+      d.innerHTML='⚠️ <b>请先配置 API Key</b><br>编辑项目根目录的 <code>.env</code> 文件，设置 <code>OPC_LLM_API_KEY</code> 为你的实际 API Key。';
+    }else{d.textContent='Error: '+errMsg;}
+  }
   sending=false;btn.disabled=false;input.focus();
 }
 

package/dist/cli.js

@@ -124,7 +124,7 @@ async function select(question, options) {
 program
     .name('opc')
     .description('OPC Agent - Open Agent Framework for business workstations')
-    .version('2.0.0');
+    .version(require('../package.json').version);
 // ── Init command ─────────────────────────────────────────────
 program
     .command('init')
@@ -186,7 +186,7 @@ program
         }
         const roleDisplayName = roleMeta.name || matched.role;
         const roleDescription = roleMeta.name_zh ? `${roleMeta.name} (${roleMeta.name_zh})` : (roleMeta.name || matched.role);
-        console.log(`  ${icon.info} Matched role: ${color.cyan(matched.category + '/' + matched.role)} — ${roleDisplayName}`);
+        console.log(`  ${icon.info} Matched role: ${color.cyan(matched.category + '/' + matched.role)} - ${roleDisplayName}`);
         // Create directories
         fs.mkdirSync(dir, { recursive: true });
         fs.mkdirSync(path.join(dir, 'src', 'skills'), { recursive: true });
@@ -205,9 +205,9 @@ program
         // Company-specific knowledge belongs to Desk (closed-source), not here.
         const workstationSeedFromRole = workstationMatch?.[0]?.trim() || '';
         fs.writeFileSync(path.join(dir, 'brain-seeds', 'workstation.md'), workstationSeedFromRole || `# Workstation Knowledge\n\n## Tools & Environment\n\nCommon tools and setup for this workstation role.\n\n## Workflows\n\nStandard operating procedures and workflows.\n\n## Best Practices\n\nIndustry best practices for this role.\n`);
-        // agent.yaml with role system prompt and brain seeds
+        // oad.yaml with role system prompt and brain seeds（不再生成 agent.yaml）
         const firstLine = systemPromptContent.split('\n').find((l) => l.trim() && !l.startsWith('#'))?.trim() || 'You are a helpful AI assistant.';
-        fs.writeFileSync(path.join(dir, 'agent.yaml'), `apiVersion: opc/v1
+        fs.writeFileSync(path.join(dir, 'oad.yaml'), `apiVersion: opc/v1
 kind: Agent
 metadata:
   name: ${name}
@@ -251,14 +251,14 @@ spec:
         if (roleData.files['oad.yaml']) {
             fs.writeFileSync(path.join(dir, 'oad.yaml'), roleData.files['oad.yaml']);
         }
-        // src/index.ts — entry point (same as generic)
+        // src/index.ts - entry point (same as generic)
         fs.writeFileSync(path.join(dir, 'src', 'index.ts'), `import { AgentRuntime } from 'opc-agent';
 import { EchoSkill } from './skills/echo';
 import { readFileSync, existsSync } from 'fs';
 
 async function main() {
   const runtime = new AgentRuntime();
-  const config = await runtime.loadConfig('./agent.yaml');
+  const config = await runtime.loadConfig('./oad.yaml');
 
   const soul = existsSync('./SOUL.md') ? readFileSync('./SOUL.md', 'utf-8') : '';
   const context = existsSync('./CONTEXT.md') ? readFileSync('./CONTEXT.md', 'utf-8') : '';
@@ -305,15 +305,15 @@ export class EchoSkill extends BaseSkill {
         fs.writeFileSync(path.join(dir, 'package.json'), JSON.stringify({ name, version: '1.0.0', private: true, scripts: { start: 'opc run', dev: 'opc dev', chat: 'opc chat', build: 'tsc' }, dependencies: { 'opc-agent': '^1.3.0' }, devDependencies: { typescript: '^5.5.0', tsx: '^4.0.0' } }, null, 2));
         // .gitignore, .env.example, .env
         fs.writeFileSync(path.join(dir, '.gitignore'), 'node_modules\ndist\n.env\n.opc-knowledge.json\ndata/\n');
-        fs.writeFileSync(path.join(dir, '.env.example'), `# LLM API Configuration\nOPC_LLM_API_KEY=your-api-key-here\nOPC_LLM_BASE_URL=https://api.openai.com/v1\nOPC_LLM_MODEL=gpt-4o-mini\n`);
-        fs.writeFileSync(path.join(dir, '.env'), `OPC_LLM_API_KEY=your-api-key-here\nOPC_LLM_BASE_URL=https://api.openai.com/v1\nOPC_LLM_MODEL=gpt-4o-mini\n`);
+        fs.writeFileSync(path.join(dir, '.env.example'), `# LLM API Configuration\n# Ollama (免费本地，默认，无需 API key):\nOPC_LLM_BASE_URL=http://localhost:11434/v1\nOPC_LLM_MODEL=qwen2.5\n\n# 如需使用商业模型，取消以下注释:\n# OPC_LLM_API_KEY=your-api-key-here\n# OPC_LLM_BASE_URL=https://api.deepseek.com/v1\n# OPC_LLM_MODEL=deepseek-chat\n`);
+        fs.writeFileSync(path.join(dir, '.env'), `# Ollama (免费本地) - 无需 API key\nOPC_LLM_BASE_URL=http://localhost:11434/v1\nOPC_LLM_MODEL=qwen2.5\n`);
         // README.md
         fs.writeFileSync(path.join(dir, 'README.md'), `# ${name}\n\nCreated with [OPC Agent](https://github.com/Deepleaper/opc-agent) using the \`${matched.category}/${matched.role}\` workstation role.\n\n## Quick Start\n\n\`\`\`bash\nnpm install\nollama pull qwen2.5\nnpx tsx src/index.ts\n\`\`\`\n\nOpen [http://localhost:3000](http://localhost:3000)\n`);
         // Dockerfile + docker-compose
-        fs.writeFileSync(path.join(dir, 'Dockerfile'), `FROM node:22-alpine\nWORKDIR /app\nCOPY package.json package-lock.json* ./\nRUN npm ci --production 2>/dev/null || npm install --production\nCOPY oad.yaml agent.yaml .env* ./\nCOPY src/ ./src/\nCOPY prompts/ ./prompts/ 2>/dev/null || true\nEXPOSE 3000\nCMD ["npx", "opc", "run"]\n`);
-        fs.writeFileSync(path.join(dir, 'docker-compose.yml'), `version: '3.8'\nservices:\n  agent:\n    build: .\n    ports:\n      - "3000:3000"\n    env_file:\n      - .env\n    volumes:\n      - ./agent.yaml:/app/agent.yaml:ro\n    restart: unless-stopped\n`);
+        fs.writeFileSync(path.join(dir, 'Dockerfile'), `FROM node:22-alpine\nWORKDIR /app\nCOPY package.json package-lock.json* ./\nRUN npm ci --production 2>/dev/null || npm install --production\nCOPY oad.yaml .env* ./\nCOPY src/ ./src/\nCOPY prompts/ ./prompts/ 2>/dev/null || true\nEXPOSE 3000\nCMD ["npx", "opc", "run"]\n`);
+        fs.writeFileSync(path.join(dir, 'docker-compose.yml'), `version: '3.8'\nservices:\n  agent:\n    build: .\n    ports:\n      - "3000:3000"\n    env_file:\n      - .env\n    volumes:\n      - ./oad.yaml:/app/oad.yaml:ro\n    restart: unless-stopped\n`);
         console.log(`\n${icon.success} Created agent project: ${color.bold(name + '/')} from role ${color.cyan(matched.category + '/' + matched.role)}`);
-        console.log(`   ${icon.file} agent.yaml       - Agent definition with role system prompt`);
+        console.log(`   ${icon.file} oad.yaml         - Agent definition with role system prompt`);
         console.log(`   ${icon.file} SOUL.md          - Role personality (${systemPromptContent.split('\n').length} lines)`);
         console.log(`   ${icon.file} CONTEXT.md       - Role context & documentation`);
         console.log(`   ${icon.file} brain-seeds/     - 3-tier brain seed knowledge`);
@@ -344,7 +344,7 @@ export class EchoSkill extends BaseSkill {
         }
     }
     catch {
-        // Hub unreachable — fall back to bundled templates
+        // Hub unreachable - fall back to bundled templates
     }
     let template;
     let selectedHubTemplate;
@@ -364,6 +364,116 @@ export class EchoSkill extends BaseSkill {
     else {
         template = await select('Select a template:', Object.entries(TEMPLATES).map(([value, { label }]) => ({ value, label })));
     }
+    // ── LLM Provider 选择（Ollama-first）──
+    let llmProvider = 'ollama';
+    let llmModel = 'qwen2.5';
+    let llmBaseUrl = 'http://localhost:11434/v1';
+    let llmApiKey = '';
+    let ollamaRunning = false;
+    let modelNames = [];
+    // 无论 --yes 还是交互式，都先检测 Ollama
+    try {
+        const controller = new AbortController();
+        const ollamaTimeout = setTimeout(() => controller.abort(), 3000);
+        const ollamaRes = await fetch('http://localhost:11434/api/tags', { signal: controller.signal });
+        clearTimeout(ollamaTimeout);
+        const ollamaData = await ollamaRes.json();
+        modelNames = (ollamaData.models || []).map((m) => m.name || m.model);
+        ollamaRunning = true;
+        if (opts.yes && modelNames.length > 0) {
+            // --yes 模式：自动选第一个已有模型
+            llmModel = modelNames[0];
+        }
+    }
+    catch {
+        ollamaRunning = false;
+    }
+    if (!opts.yes) {
+        if (ollamaRunning) {
+            console.log(`\n  ${icon.info} ${color.dim('正在检测 Ollama...')}`);
+            console.log(`  ${icon.success} Ollama 已运行，发现 ${modelNames.length} 个模型`);
+            // 选择 provider
+            llmProvider = await select('选择 LLM 引擎:', [
+                { value: 'ollama', label: '🟢 Ollama (免费本地，推荐) - 已检测到运行中' },
+                { value: 'deepseek', label: '🔵 DeepSeek - 高性价比国产模型' },
+                { value: 'openai', label: '⚪ OpenAI (GPT-4o)' },
+                { value: 'anthropic', label: '🟣 Anthropic (Claude)' },
+                { value: 'custom', label: '⚙️  自定义 (手动输入 Base URL)' },
+            ]);
+            if (llmProvider === 'ollama') {
+                // 选择本地模型
+                const defaultModel = modelNames.includes('qwen2.5') ? 'qwen2.5' : (modelNames.includes('llama3') ? 'llama3' : (modelNames[0] || 'qwen2.5'));
+                if (modelNames.length > 0) {
+                    llmModel = await select('选择 Ollama 模型:', modelNames.map((m) => ({ value: m, label: m + (m === defaultModel ? ' (推荐)' : '') })));
+                }
+                else {
+                    console.log(`  ${color.yellow('⚠️')}  没有发现已下载的模型，将使用默认 qwen2.5`);
+                    console.log(`     运行 ${color.cyan('ollama pull qwen2.5')} 下载模型`);
+                    llmModel = 'qwen2.5';
+                }
+            }
+        }
+        else {
+            // Ollama not running
+            console.log(`\n  ${icon.info} ${color.dim('正在检测 Ollama...')}`);
+            console.log(`  ${color.yellow('⚠️')}  Ollama 未运行或未安装`);
+            llmProvider = await select('选择 LLM 引擎:', [
+                { value: 'ollama', label: '🟢 Ollama (免费本地，推荐) - 需先安装: https://ollama.ai' },
+                { value: 'deepseek', label: '🔵 DeepSeek - 高性价比国产模型' },
+                { value: 'openai', label: '⚪ OpenAI (GPT-4o)' },
+                { value: 'anthropic', label: '🟣 Anthropic (Claude)' },
+                { value: 'custom', label: '⚙️  自定义 (手动输入 Base URL)' },
+            ]);
+            if (llmProvider === 'ollama') {
+                console.log(`\n  ${icon.info} Ollama 安装指南:`);
+                console.log(`     1. 访问 ${color.cyan('https://ollama.ai')} 下载并安装`);
+                console.log(`     2. 运行 ${color.cyan('ollama pull qwen2.5')} 下载推荐模型`);
+                console.log(`     3. 然后 ${color.cyan('opc run')} 即可开始对话\n`);
+                llmModel = 'qwen2.5';
+            }
+        }
+        // 商业模型需要 API key
+        if (llmProvider === 'deepseek') {
+            llmBaseUrl = 'https://api.deepseek.com/v1';
+            llmModel = 'deepseek-chat';
+            llmApiKey = await promptUser('输入 DeepSeek API Key (可稍后在 .env 中配置，直接回车跳过)');
+            if (!llmApiKey) {
+                console.log(`  ${icon.info} 稍后在 ${color.cyan('.env')} 文件中设置 ${color.bold('OPC_LLM_API_KEY')}`);
+            }
+        }
+        else if (llmProvider === 'openai') {
+            llmBaseUrl = 'https://api.openai.com/v1';
+            llmModel = 'gpt-4o-mini';
+            llmApiKey = await promptUser('输入 OpenAI API Key (可稍后在 .env 中配置，直接回车跳过)');
+            if (!llmApiKey) {
+                console.log(`  ${icon.info} 稍后在 ${color.cyan('.env')} 文件中设置 ${color.bold('OPC_LLM_API_KEY')}`);
+            }
+        }
+        else if (llmProvider === 'anthropic') {
+            llmBaseUrl = 'https://api.anthropic.com/v1';
+            llmModel = 'claude-sonnet-4-20250514';
+            llmApiKey = await promptUser('输入 Anthropic API Key (可稍后在 .env 中配置，直接回车跳过)');
+            if (!llmApiKey) {
+                console.log(`  ${icon.info} 稍后在 ${color.cyan('.env')} 文件中设置 ${color.bold('OPC_LLM_API_KEY')}`);
+            }
+        }
+        else if (llmProvider === 'custom') {
+            llmBaseUrl = await promptUser('输入 Base URL', 'http://localhost:11434/v1');
+            llmModel = await promptUser('输入模型名称', 'qwen2.5');
+            llmApiKey = await promptUser('输入 API Key (可选，直接回车跳过)');
+            // 尝试推断 provider
+            if (llmBaseUrl.includes('deepseek.com'))
+                llmProvider = 'deepseek';
+            else if (llmBaseUrl.includes('openai.com'))
+                llmProvider = 'openai';
+            else if (llmBaseUrl.includes('anthropic.com'))
+                llmProvider = 'anthropic';
+            else if (llmBaseUrl.includes('localhost:11434'))
+                llmProvider = 'ollama';
+            else
+                llmProvider = 'openai'; // OpenAI-compatible fallback
+        }
+    }
     const dir = path.resolve(name);
     if (fs.existsSync(dir)) {
         console.error(`\n${icon.error} Directory ${color.bold(name)} already exists.`);
@@ -374,37 +484,16 @@ export class EchoSkill extends BaseSkill {
     const factory = TEMPLATES[template]?.factory ?? customer_service_1.createCustomerServiceConfig;
     const config = factory();
     config.metadata.name = name;
+    // 用用户选择的 provider 和 model 覆盖模板默认值
+    config.spec.model = llmModel;
+    config.spec.provider = { default: llmProvider };
     // Ensure web channel exists
     if (!config.spec.channels.some((c) => c.type === 'web')) {
         config.spec.channels.push({ type: 'web', port: 3000 });
     }
+    // 只生成 oad.yaml，不生成 agent.yaml
     fs.writeFileSync(path.join(dir, 'oad.yaml'), yaml.dump(config, { lineWidth: 120 }));
-    // agent.yaml — standalone OAD config for runtime usage
-    fs.writeFileSync(path.join(dir, 'agent.yaml'), `apiVersion: opc/v1
-kind: Agent
-metadata:
-  name: ${name}
-  version: 1.0.0
-  description: My AI Agent
-spec:
-  model: qwen2.5
-  provider:
-    default: ollama
-  systemPrompt: |
-    You are a helpful AI assistant named ${name}.
-    Be concise, helpful, and friendly.
-  channels:
-    - type: web
-      port: 3000
-  memory:
-    shortTerm: true
-    longTerm:
-      provider: deepbrain
-  skills:
-    - name: echo
-      description: Echo test skill
-`);
-    // src/index.ts — entry point
+    // src/index.ts - entry point
     fs.writeFileSync(path.join(dir, 'src', 'index.ts'), `import { AgentRuntime } from 'opc-agent';
 import { EchoSkill } from './skills/echo';
 import { readFileSync, existsSync } from 'fs';
@@ -413,7 +502,7 @@ async function main() {
   const runtime = new AgentRuntime();
 
   // Load OAD config
-  const config = await runtime.loadConfig('./agent.yaml');
+  const config = await runtime.loadConfig('./oad.yaml');
 
   // Load personality and context files
   const soul = existsSync('./SOUL.md') ? readFileSync('./SOUL.md', 'utf-8') : '';
@@ -439,7 +528,7 @@ async function main() {
 
 main().catch(console.error);
 `);
-    // src/skills/echo.ts — example skill
+    // src/skills/echo.ts - example skill
     fs.writeFileSync(path.join(dir, 'src', 'skills', 'echo.ts'), `import { BaseSkill } from 'opc-agent';
 import type { AgentContext, Message, SkillResult } from 'opc-agent';
 
@@ -477,23 +566,39 @@ export class EchoSkill extends BaseSkill {
     }, null, 2));
     // .env.example
     fs.writeFileSync(path.join(dir, '.env.example'), `# LLM API Configuration
-OPC_LLM_API_KEY=your-api-key-here
-OPC_LLM_BASE_URL=https://api.openai.com/v1
-OPC_LLM_MODEL=gpt-4o-mini
+# Ollama (免费本地，默认):
+# OPC_LLM_BASE_URL=http://localhost:11434/v1
+# OPC_LLM_MODEL=qwen2.5
+# (Ollama 无需 API key)
 
-# For DeepSeek:
+# DeepSeek:
+# OPC_LLM_API_KEY=your-deepseek-key
 # OPC_LLM_BASE_URL=https://api.deepseek.com/v1
 # OPC_LLM_MODEL=deepseek-chat
 
-# For local Ollama (default in agent.yaml):
-# OPC_LLM_BASE_URL=http://localhost:11434/v1
-# OPC_LLM_MODEL=qwen2.5
-`);
-    // .env (copy of example)
-    fs.writeFileSync(path.join(dir, '.env'), `OPC_LLM_API_KEY=your-api-key-here
-OPC_LLM_BASE_URL=https://api.openai.com/v1
-OPC_LLM_MODEL=gpt-4o-mini
+# OpenAI:
+# OPC_LLM_API_KEY=your-openai-key
+# OPC_LLM_BASE_URL=https://api.openai.com/v1
+# OPC_LLM_MODEL=gpt-4o-mini
+
+# Anthropic:
+# OPC_LLM_API_KEY=your-anthropic-key
+# OPC_LLM_BASE_URL=https://api.anthropic.com/v1
+# OPC_LLM_MODEL=claude-sonnet-4-20250514
 `);
+    // .env - 根据用户选择生成正确的配置
+    const envLines = [];
+    if (llmProvider === 'ollama') {
+        envLines.push('# Ollama (免费本地) - 无需 API key');
+        envLines.push(`OPC_LLM_BASE_URL=${llmBaseUrl}`);
+        envLines.push(`OPC_LLM_MODEL=${llmModel}`);
+    }
+    else {
+        envLines.push(`OPC_LLM_API_KEY=${llmApiKey || 'your-api-key-here'}`);
+        envLines.push(`OPC_LLM_BASE_URL=${llmBaseUrl}`);
+        envLines.push(`OPC_LLM_MODEL=${llmModel}`);
+    }
+    fs.writeFileSync(path.join(dir, '.env'), envLines.join('\n') + '\n');
     // package.json
     fs.writeFileSync(path.join(dir, 'package.json'), JSON.stringify({
         name,
@@ -520,7 +625,7 @@ OPC_LLM_MODEL=gpt-4o-mini
 WORKDIR /app
 COPY package.json package-lock.json* ./
 RUN npm ci --production 2>/dev/null || npm install --production
-COPY oad.yaml agent.yaml .env* ./
+COPY oad.yaml .env* ./
 COPY src/ ./src/
 COPY prompts/ ./prompts/ 2>/dev/null || true
 EXPOSE 3000
@@ -536,7 +641,7 @@ services:
     env_file:
       - .env
     volumes:
-      - ./agent.yaml:/app/agent.yaml:ro
+      - ./oad.yaml:/app/oad.yaml:ro
     restart: unless-stopped
 `);
     // README.md
@@ -577,8 +682,7 @@ npx opc chat   # CLI chat
 
 \`\`\`
 ${name}/
-├── agent.yaml          # OAD agent config (used by src/index.ts)
-├── oad.yaml            # OAD config (used by opc CLI)
+├── oad.yaml            # Agent 配置 (唯一配置文件)
 ├── src/
 │   ├── index.ts        # Entry point
 │   └── skills/
@@ -589,9 +693,9 @@ ${name}/
 
 ## Configuration
 
-Edit \`agent.yaml\` to customize your agent's personality, skills, and behavior.
+Edit \`oad.yaml\` to customize your agent's personality, skills, and behavior.
 `);
-    // SOUL.md — agent personality
+    // SOUL.md - agent personality
     const createdDate = new Date().toISOString().split('T')[0];
     fs.writeFileSync(path.join(dir, 'SOUL.md'), `# ${name} Personality
 
@@ -607,7 +711,7 @@ Edit \`agent.yaml\` to customize your agent's personality, skills, and behavior.
 
 ## Communication Style
 - Use clear, simple language
-- Be direct — answer the question first, then explain
+- Be direct - answer the question first, then explain
 - Use markdown formatting when helpful
 
 ## Rules
@@ -615,7 +719,7 @@ Edit \`agent.yaml\` to customize your agent's personality, skills, and behavior.
 - Ask for clarification when the request is ambiguous
 - Never make up information
 `);
-    // CONTEXT.md — project context
+    // CONTEXT.md - project context
     fs.writeFileSync(path.join(dir, 'CONTEXT.md'), `# Project Context
 
 ## About This Agent
@@ -631,7 +735,8 @@ on startup to understand the project context.
 - Add company policies here
 `);
     console.log(`\n${icon.success} Created agent project: ${color.bold(name + '/')}`);
-    console.log(`   ${icon.file} agent.yaml       - Agent definition (OAD)`);
+    console.log(`   ${icon.file} oad.yaml         - Agent 配置 (${llmProvider}/${llmModel})`);
+    console.log(`   ${icon.file} .env             - 环境变量${llmProvider === 'ollama' ? '' : ' (API Key)'}`);
     console.log(`   ${icon.file} src/index.ts     - Entry point`);
     console.log(`   ${icon.file} src/skills/echo.ts - Example skill`);
     console.log(`   ${icon.file} SOUL.md          - Agent personality`);
@@ -656,14 +761,24 @@ on startup to understand the project context.
             }
         }
         catch {
-            // Brain-seed download failed — non-fatal, project still usable
+            // Brain-seed download failed - non-fatal, project still usable
         }
     }
     console.log(`\n${color.bold('Next steps:')}`);
     console.log(`   1. cd ${name}`);
     console.log(`   2. npm install`);
-    console.log(`   3. npx tsx src/index.ts   ${color.dim('# or: npx opc run')}`);
-    console.log(`   4. Open http://localhost:3000\n`);
+    if (llmProvider === 'ollama' && !ollamaRunning) {
+        console.log(`   3. ollama pull ${llmModel}   ${color.dim('# 下载模型')}`);
+        console.log(`   4. npx opc run              ${color.dim('# 启动 Agent')}`);
+    }
+    else if (llmProvider !== 'ollama' && !llmApiKey) {
+        console.log(`   3. 编辑 .env 设置 OPC_LLM_API_KEY`);
+        console.log(`   4. npx opc run`);
+    }
+    else {
+        console.log(`   3. npx opc run              ${color.dim('# 启动 Agent')}`);
+    }
+    console.log(`   Open http://localhost:3000\n`);
     console.log(`${color.dim('💡 Tip: Use --role to start from a workstation template:')}`);
     console.log(`${color.dim('   opc init my-agent --role customer-service')}`);
     console.log(`${color.dim('   opc init --list-roles  (see all roles)')}\n`);
@@ -713,7 +828,7 @@ program
     // Print startup banner
     const bannerLines = [
         '╔══════════════════════════════════════╗',
-        '║  🤖 OPC Agent — Interactive Chat     ║',
+        '║  🤖 OPC Agent - Interactive Chat     ║',
         `║  Agent: ${(agentName + ' v' + agentVersion).padEnd(27)}║`,
         `║  Model: ${((providerName + '/' + (model ?? 'default')).slice(0, 27)).padEnd(27)}║`,
         `║  Skills: ${(String(skillNames.length) + ' loaded').padEnd(26)}║`,
@@ -740,12 +855,12 @@ program
         }
         if (lower === '/help') {
             console.log(`\n  ${color.bold('Available commands:')}`);
-            console.log(`  ${color.cyan('/help')}    — Show this help`);
-            console.log(`  ${color.cyan('/quit')}    — Exit chat (/exit also works)`);
-            console.log(`  ${color.cyan('/clear')}   — Clear conversation history`);
-            console.log(`  ${color.cyan('/skills')}  — List registered skills`);
-            console.log(`  ${color.cyan('/memory')}  — Show memory stats`);
-            console.log(`  ${color.cyan('/info')}    — Show agent info\n`);
+            console.log(`  ${color.cyan('/help')}    - Show this help`);
+            console.log(`  ${color.cyan('/quit')}    - Exit chat (/exit also works)`);
+            console.log(`  ${color.cyan('/clear')}   - Clear conversation history`);
+            console.log(`  ${color.cyan('/skills')}  - List registered skills`);
+            console.log(`  ${color.cyan('/memory')}  - Show memory stats`);
+            console.log(`  ${color.cyan('/info')}    - Show agent info\n`);
             return true;
         }
         if (lower === '/clear') {
@@ -1460,7 +1575,7 @@ protocolCmd.command('list')
     const protocols = config?.spec?.protocols || {};
     const items = [
         { name: 'a2a', description: 'Agent-to-Agent protocol', enabled: !!protocols.a2a?.enabled, detail: protocols.a2a?.port ? `port ${protocols.a2a.port}` : '' },
-        { name: 'agui', description: 'AG-UI — Agent-User Interaction (SSE)', enabled: !!protocols.agui?.enabled, detail: protocols.agui?.path || '/agui' },
+        { name: 'agui', description: 'AG-UI - Agent-User Interaction (SSE)', enabled: !!protocols.agui?.enabled, detail: protocols.agui?.path || '/agui' },
     ];
     console.log(`\n${icon.gear} ${color.bold('Protocols')}\n`);
     for (const p of items) {
@@ -1593,7 +1708,7 @@ brainCmd
     .description('Show brain stats (pages, tiers, last evolve)')
     .option('--url <url>', 'DeepBrain server URL', 'http://localhost:3333')
     .action(async (opts) => {
-    console.log(`\n${icon.gear} ${color.bold('DeepBrain Status')} — ${color.dim(opts.url)}\n`);
+    console.log(`\n${icon.gear} ${color.bold('DeepBrain Status')} - ${color.dim(opts.url)}\n`);
     try {
         const res = await fetch(`${opts.url}/api/stats`);
         if (!res.ok)
@@ -1626,7 +1741,7 @@ brainCmd
 brainCmd
     .command('seed')
     .description('Import brain seed files into memory')
-    .option('-f, --file <file>', 'OAD file', 'agent.yaml')
+    .option('-f, --file <file>', 'OAD file', 'oad.yaml')
     .option('--status', 'Check if seeds have been imported')
     .option('--reset', 'Re-import seeds (clear marker and re-seed)')
     .action(async (opts) => {
@@ -1696,7 +1811,7 @@ brainCmd
             console.log(`  ${color.cyan(c.slug)} → ${c.fromTier} → ${c.toTier} (confidence: ${(c.confidence * 100).toFixed(0)}%)`);
         }
         if (opts.dryRun) {
-            console.log(`\n  ${icon.info} Dry run — no changes made.\n`);
+            console.log(`\n  ${icon.info} Dry run - no changes made.\n`);
         }
         else {
             console.log(`\n  ${icon.success} Promoted ${result.promoted} knowledge entries.\n`);
@@ -2145,7 +2260,7 @@ program
         return;
     }
     // Create a minimal mock agent for eval (real usage would load from OAD)
-    const oadPath = path.resolve('agent.yaml');
+    const oadPath = path.resolve(fs.existsSync('oad.yaml') ? 'oad.yaml' : 'agent.yaml');
     let agent;
     if (fs.existsSync(oadPath)) {
         const runtime = new runtime_1.AgentRuntime();
@@ -2154,7 +2269,7 @@ program
         agent = runtime.agent;
     }
     if (!agent) {
-        console.log(`${icon.warn} No agent.yaml found — running with dry-run mock agent.`);
+        console.log(`${icon.warn} No oad.yaml or agent.yaml found - running with dry-run mock agent.`);
         agent = { chat: async (input) => `[mock response to: ${input}]` };
     }
     const evaluator = new eval_1.AgentEvaluator(agent);
@@ -2214,7 +2329,7 @@ guardrailsCmd
     console.log();
     const result = await manager.checkInput(message);
     if (result.passed) {
-        console.log(color.green('✓ PASSED — no violations'));
+        console.log(color.green('✓ PASSED - no violations'));
     }
     else {
         if (result.blocked)
@@ -2243,7 +2358,7 @@ program
     .action(async (opts) => {
     console.log(color.bold('🎤 Voice Conversation Mode'));
     console.log(`  STT: ${opts.stt} | TTS: ${opts.tts} | Voice: ${opts.voice ?? 'default'} | Language: ${opts.language}`);
-    console.log(color.dim('  (Voice conversation requires audio input integration — use as library)'));
+    console.log(color.dim('  (Voice conversation requires audio input integration - use as library)'));
     console.log();
     console.log('To use voice in your agent:');
     console.log(color.cyan(`
@@ -2307,7 +2422,7 @@ keysCmd
 });
 // ── Approve command ───────────────────────────────────────────
 const approveCmd = program.command('approve').description('Manage command approvals');
-// Singleton for CLI — in real usage this would be loaded from daemon state
+// Singleton for CLI - in real usage this would be loaded from daemon state
 const approvalManager = new approval_1.ApprovalManager();
 approveCmd
     .command('list')
@@ -2439,7 +2554,7 @@ a2aCmd
     const { oadToAgentCard } = require('./protocols/a2a');
     const oad = loadOADFile();
     if (!oad) {
-        console.log(`${icon.error} No agent.yaml found`);
+        console.log(`${icon.error} No oad.yaml or agent.yaml found`);
         return;
     }
     const card = oadToAgentCard(oad, 'http://localhost:3001');
@@ -2479,7 +2594,7 @@ a2aCmd
 function loadOADFile() {
     const fs = require('fs');
     const yaml = require('js-yaml');
-    for (const name of ['agent.yaml', 'agent.yml']) {
+    for (const name of ['oad.yaml', 'agent.yaml', 'agent.yml']) {
         if (fs.existsSync(name)) {
             return yaml.load(fs.readFileSync(name, 'utf-8'));
         }
@@ -2487,7 +2602,7 @@ function loadOADFile() {
     return null;
 }
 // ── MCP Server Commands ────────────────────────────────────
-const mcpCmd = program.command('mcp').description('MCP server commands — expose agent as MCP tools');
+const mcpCmd = program.command('mcp').description('MCP server commands - expose agent as MCP tools');
 mcpCmd
     .command('serve')
     .option('--http <port>', 'Start HTTP+SSE mode on given port')
@@ -2516,7 +2631,7 @@ mcpCmd
         console.log(`${icon.info} Tools: ${server.getToolCount()}`);
     }
     else {
-        console.error(`${icon.success} MCP server (stdio) started — ${server.getToolCount()} tools`);
+        console.error(`${icon.success} MCP server (stdio) started - ${server.getToolCount()} tools`);
         await server.serveStdio();
     }
 });
@@ -2565,7 +2680,7 @@ mcpCmd
         console.log(`${icon.info} Tools: ${server.getToolCount()}`);
     }
     else {
-        console.error(`${icon.success} MCP server ${color.cyan(name)} (stdio) — ${server.getToolCount()} tools`);
+        console.error(`${icon.success} MCP server ${color.cyan(name)} (stdio) - ${server.getToolCount()} tools`);
         await server.serveStdio();
     }
 });