openteam 1.0.7 → 1.0.9

package/examples/dev-team/readme.md

@@ -32,45 +32,23 @@ Each role has skills that guide its workflow stages:
 
 - **PM**: `requirement-clarification`, `prd-generation`, `system-discovery`
 - **Architect**: `codebase-mapping`, `implementation-planning`, `architecture-review`
+- **Developer**: `incremental-implementation`, `self-verification`
 - **QA**: `test-plan-design`, `acceptance-testing`, `bug-reporting`
 
 ## Deployment
 
-### 1) Copy team config and agent prompts
+### 1) Install the team
 
 ```bash
-# Create team directory
-mkdir -p ~/.opencode/agents/<team-name>
-
-# Copy team config (edit "name" field to match your team name)
-cp team.json ~/.opencode/agents/<team-name>/
-
-# Copy agent prompts into the team directory
-cp pm.md architect.md developer.md qa.md ~/.opencode/agents/<team-name>/
-```
-
-Agent prompts live in the team directory alongside `team.json`.
-
-### 2) Install skills
-
-```bash
-cp -r skills/* ~/.opencode/skills/
+openteam setup dev-team
 ```
 
-### 3) Configure OpenCode plugin
-
-Add to `~/.opencode/opencode.json`:
-
-```json
-{
-  "plugin": ["openteam"]
-}
-```
+This copies agent prompts to `~/.openteam/agents/`, skills to `~/.openteam/skills/`, and team config to `~/.openteam/teams/<team-name>/team.json`.
 
-### 4) Start the team
+### 2) Start the team
 
 ```bash
 openteam start <team-name>
 ```
 
-This launches the daemon, serve process, and enters the PM (leader) session.
+This launches the daemon, server, and agent panes in a tmux/zellij session.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openteam",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Agent-centric team collaboration framework",
   "type": "module",
   "bin": {

package/src/adapters/base.js

@@ -42,6 +42,15 @@ export class BaseAdapter {
     throw new Error('subclass must implement buildMcpConfig');
   }
 
+  /**
+   * 返回 CLI 特定的工具调用指引，追加到系统提示词中。
+   * 不同 CLI 对 MCP 工具有不同的命名/调用约定，需要显式告知 agent。
+   * @returns {string} 工具调用指引文本
+   */
+  buildToolGuide() {
+    throw new Error('subclass must implement buildToolGuide');
+  }
+
   /**
    * MCP 配置文件路径（每个 agent 独立，避免多 agent 覆盖冲突）
    * @param {string} projectDir - 项目目录

package/src/adapters/claude-code.js

@@ -45,6 +45,10 @@ export class ClaudeCodeAdapter extends BaseAdapter {
     };
   }
 
+  buildToolGuide() {
+    return 'Use the openteam MCP server tools: msg (messaging) and taskboard (task management).';
+  }
+
   getMcpConfigPath(projectDir, agent) {
     // 用临时目录避免污染项目的 .mcp.json（可能有用户自己的 MCP 配置）
     // 每个 agent 独立文件，避免多 agent 覆盖冲突

package/src/adapters/opencode.js

@@ -30,6 +30,11 @@ export class OpenCodeAdapter extends BaseAdapter {
     };
   }
 
+  buildToolGuide() {
+    // TODO: opencode 的 MCP 工具命名规则待确认
+    return 'Use the openteam MCP server tools: msg (messaging) and taskboard (task management).';
+  }
+
   getMcpConfigPath(projectDir, agent) {
     // TODO: opencode 的 MCP 配置路径待确认
     return path.join(os.tmpdir(), `openteam-mcp-opencode-${agent}-${encodeURIComponent(path.basename(projectDir))}.json`);

package/src/foundation/logger.js

@@ -1,10 +1,9 @@
 /**
  * 日志系统
  *
- * error 级别始终写入日志文件（无需配置）
- * debug/info/warn 需要启用：
- *   OPENTEAM_LOG=1       启用日志
- *   OPENTEAM_LOG_LEVEL=debug|info|warn|error
+ * info/warn/error 默认写入日志文件，无需配置。
+ * debug 需要启用：
+ *   OPENTEAM_DEBUG=1      启用 debug 级别日志
  *   OPENTEAM_LOG_STDERR=1 调试时镜像到 stderr（便于 daemon/serve 捕获）
  *
  * 日志文件: ~/.openteam/openteam.log
@@ -14,29 +13,16 @@ import fs from 'fs';
 import path from 'path';
 import { PATHS } from './constants.js';
 
-const LOG_LEVELS = {
-  debug: 0,
-  info: 1,
-  warn: 2,
-  error: 3,
-};
-
 // 延迟求值：首次写日志时才读配置，避免循环依赖
 let resolved = false;
-let isEnabled = false;
-let minLevel = LOG_LEVELS.info;
+let debugEnabled = false;
 let mirrorToStderr = false;
 
 function resolve() {
   if (resolved) return;
   resolved = true;
 
-  const envLog = process.env.OPENTEAM_LOG;
-  const envLevel = process.env.OPENTEAM_LOG_LEVEL;
-
-  isEnabled = !!envLog && envLog !== '';
-  const levelStr = envLevel || 'info';
-  minLevel = LOG_LEVELS[levelStr] ?? LOG_LEVELS.info;
+  debugEnabled = process.env.OPENTEAM_DEBUG === '1';
   mirrorToStderr = process.env.OPENTEAM_LOG_STDERR === '1';
 }
 
@@ -71,9 +57,8 @@ function writeToFile(formatted) {
 
 function log(level, module, message, data = null) {
   resolve();
-  // error 始终记录，其余需要 OPENTEAM_LOG=1
-  if (!isEnabled && level !== 'error') return;
-  if (LOG_LEVELS[level] < minLevel) return;
+  // debug 需要 OPENTEAM_DEBUG=1，其余默认写入
+  if (level === 'debug' && !debugEnabled) return;
 
   const formatted = formatMessage(level, module, message, data);
   writeToFile(formatted);

package/src/interfaces/daemon/index.js

@@ -26,9 +26,6 @@ const HEALTH_CHECK_INTERVAL = 10000;
 export async function runDaemon(teamName, projectDir, options = {}) {
   // 标记 daemon 进程，logger 据此跳过 console.error（避免破坏 blessed TUI）
   process.env.OPENTEAM_DAEMON = '1';
-  // daemon 及其子进程（wrapper）默认启用日志
-  if (!process.env.OPENTEAM_LOG) process.env.OPENTEAM_LOG = '1';
-
   // ── 校验 ──
   const validation = validateTeamConfig(teamName);
   if (!validation.valid) {

package/src/wrapper/index.js

@@ -63,7 +63,7 @@ async function main() {
   const mcpConfigPath = writeMcpConfig(adapter, serverUrl, agent, projectDir);
 
   // ── 3. 构建系统提示词 + 注入策略 ──
-  const systemPrompt = buildSystemPrompt(agent, team, agents, cliType);
+  const systemPrompt = buildSystemPrompt(agent, team, agents, cliType, adapter);
   let systemPromptFile = null;
 
   if (keepDefaultSP) {
@@ -115,18 +115,24 @@ async function main() {
 
   // ── 5. 启动消息轮询 ──
   let polling = true;
+  let injecting = false; // 注入锁，防止轮询重入导致消息交叉
   const pollTimer = setInterval(async () => {
-    if (!polling) return;
+    if (!polling || injecting) return;
     try {
       // 上报活动状态
       const active = (Date.now() - lastPtyOutput) < ACTIVE_THRESHOLD;
       heartbeat(serverUrl, agent, active).catch(() => {});
 
       const messages = await pullMessages(serverUrl, agent);
-      for (const msg of messages) {
-        injectMessage(ptyProcess, msg.message);
+      if (messages.length > 0) {
+        injecting = true;
+        for (const msg of messages) {
+          await injectMessage(ptyProcess, msg.message);
+        }
+        injecting = false;
       }
     } catch (err) {
+      injecting = false;
       log.warn('wrapper.poll.error', { error: err.message });
     }
   }, POLL_INTERVAL);
@@ -160,20 +166,30 @@ async function main() {
 
 // ── 消息注入 ──
 
+const INJECT_ENTER_DELAY = 200;    // 写入文本后等待 TUI 渲染再发 Enter
+const INJECT_BETWEEN_DELAY = 300;  // 两条消息之间的间隔，确保前一条已提交
+
 /**
  * 通过 PTY master 注入消息到 CLI
- * 使用 bracketed paste 模式，防止多行消息被逐行执行
+ * 返回 Promise，resolve 后才能注入下一条
  */
 function injectMessage(ptyProcess, message) {
-  try {
-    // 消息中的 \n 保持原样 — claude code 中 \n(0x0a) = 换行，\r(0x0d) = 提交
-    ptyProcess.write(message);
-    // 延迟发送 Enter 提交 — 确保 TUI 完成文本渲染
-    setTimeout(() => ptyProcess.write('\r'), 100);
-    log.info('wrapper.inject.ok', { preview: message.slice(0, 50) });
-  } catch (err) {
-    log.warn('wrapper.inject.failed', { error: err.message, preview: message.slice(0, 50) });
-  }
+  return new Promise((resolve) => {
+    try {
+      // 消息中的 \n 保持原样 — claude code 中 \n(0x0a) = 换行，\r(0x0d) = 提交
+      ptyProcess.write(message);
+      // 延迟发送 Enter 提交 — 确保 TUI 完成文本渲染
+      setTimeout(() => {
+        ptyProcess.write('\r');
+        log.info('wrapper.inject.ok', { preview: message.slice(0, 50) });
+        // 再等一段时间让 TUI 处理提交，然后才允许下一条
+        setTimeout(resolve, INJECT_BETWEEN_DELAY);
+      }, INJECT_ENTER_DELAY);
+    } catch (err) {
+      log.warn('wrapper.inject.failed', { error: err.message, preview: message.slice(0, 50) });
+      resolve();
+    }
+  });
 }
 
 // ── HTTP 辅助函数 ──
@@ -286,7 +302,7 @@ function cleanupTempFile(filePath) {
 
 // ── 系统提示词 ──
 
-function buildSystemPrompt(agent, team, agents, cliType) {
+function buildSystemPrompt(agent, team, agents, cliType, adapter) {
   const teammates = agents.filter(a => a !== agent);
   const lines = [
     `You are agent "${agent}" in team "${team}".`,
@@ -295,13 +311,16 @@ function buildSystemPrompt(agent, team, agents, cliType) {
     lines.push(`Team members: ${agents.join(', ')}. Your teammates: ${teammates.join(', ')}.`);
   }
   lines.push(
-    'Use the msg tool to communicate with other agents.',
+    'Use the msg tool to communicate with other agents. You MUST actually invoke the tool — never just claim you sent a message.',
     'Messages without [from xxx] prefix are from the boss — reply directly in your output.',
     'Messages with [from <agent>] are from team agents — reply using msg tool.',
     'NEVER use msg(who="boss") — boss is in your session, not an agent.',
     'Use taskboard tool to manage tasks: create (leader only), done, list.',
   );
 
+  // adapter 提供 CLI 特定的工具调用指引
+  lines.push('', adapter.buildToolGuide());
+
   // Claude Code 特有：记忆目录隔离
   if (cliType === 'claude-code') {
     lines.push(
@@ -315,7 +334,7 @@ function buildSystemPrompt(agent, team, agents, cliType) {
     );
   }
 
-  return lines.join(' ');
+  return lines.join('\n');
 }
 
 main().catch(err => {