openteam 0.7.2 → 1.0.0

package/bin/openteam.js

@@ -7,30 +7,25 @@
 import { createRequire } from 'module';
 import { program } from 'commander';
 import {
-  cmdStart, cmdAttach, cmdList, cmdStop,
-  cmdInspect, cmdDashboard, cmdAgentAttach,
+  cmdStart, cmdList, cmdStop,
+  cmdInspect, cmdDashboard,
 } from '../src/interfaces/cli.js';
 
 const require = createRequire(import.meta.url);
 const { version } = require('../package.json');
 
-program.name('openteam').description('Team management for OpenCode').version(version);
+program.name('openteam').description('Agent team collaboration framework').version(version);
 
 program
   .command('start [team]')
   .description('启动团队（创建 tmux/zellij session）')
   .option('-d, --detach', '后台运行')
   .option('--dir <directory>', '项目目录')
+  .option('--cli <type>', 'CLI 类型（claude-code / opencode）', 'claude-code')
   .option('--tmux', '强制使用 tmux')
   .option('--zellij', '强制使用 zellij')
   .action(cmdStart);
 
-program
-  .command('attach [team] [agent]', { hidden: true })
-  .description('附加到 agent 会话')
-  .option('--dir <directory>', '项目目录')
-  .action(cmdAttach);
-
 program
   .command('list')
   .alias('ls')
@@ -45,7 +40,7 @@ program
 
 program
   .command('inspect <team>')
-  .description('查看团队详细状态与会话有效性')
+  .description('查看团队详细状态与 agent 在线情况')
   .option('--dir <directory>', '项目目录')
   .action(cmdInspect);
 
@@ -55,21 +50,23 @@ program
   .option('--dir <directory>', '项目目录')
   .action(cmdDashboard);
 
-// 内部命令（不在帮助中显示，由 layout / daemon 自动调用）
-program
-  .command('agent-attach <team> <agent>', { hidden: true })
-  .description('等待 agent 会话就绪后 attach')
-  .option('--dir <directory>', '项目目录')
-  .action(cmdAgentAttach);
-
+// 内部命令（不在帮助中显示）
 program
   .command('daemon <team>', { hidden: true })
-  .option('--port <port>', 'serve 端口', parseInt)
+  .option('--port <port>', 'server 端口', parseInt)
   .option('--dir <directory>', '项目目录')
   .option('--mux <type>', '复用器类型', 'tmux')
+  .option('--cli <type>', 'CLI 类型', 'claude-code')
   .action(async (teamName, options) => {
     const { runDaemon } = await import('../src/interfaces/daemon/index.js');
     await runDaemon(teamName, options.dir || process.cwd(), options);
   });
 
+program
+  .command('wrapper', { hidden: true })
+  .description('Wrapper 进程（由 daemon pane 自动调用）')
+  .action(async () => {
+    await import('../src/wrapper/index.js');
+  });
+
 program.parse();

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "openteam",
-  "version": "0.7.2",
-  "description": "Agent-centric team collaboration for OpenCode",
+  "version": "1.0.0",
+  "description": "Agent-centric team collaboration framework",
   "type": "module",
-  "main": "./src/index.js",
   "bin": {
     "openteam": "./bin/openteam.js"
   },
@@ -17,10 +16,10 @@
     "test": "node test/smoke.js"
   },
   "keywords": [
-    "opencode",
     "agent",
     "team",
-    "collaboration"
+    "collaboration",
+    "mcp"
   ],
   "author": "goodfish",
   "license": "MIT",
@@ -29,8 +28,10 @@
     "url": "git+https://github.com/opencode-dev/openteam.git"
   },
   "dependencies": {
-    "@opencode-ai/plugin": "^1.2.18",
+    "@modelcontextprotocol/sdk": "^1.27.1",
     "blessed": "^0.1.81",
-    "commander": "^12.0.0"
+    "commander": "^12.0.0",
+    "node-pty": "^1.1.0",
+    "zod": "^4.3.6"
   }
 }

package/src/adapters/base.js

@@ -0,0 +1,73 @@
+/**
+ * CLI 适配器基类 + 工厂函数
+ *
+ * 每个适配器封装特定 CLI 工具的启动参数、MCP 配置方式等差异。
+ * adapters/ 是基础层 — 只提供 CLI 命令构建，不含业务逻辑。
+ */
+
+/**
+ * CLI 适配器基类
+ */
+export class BaseAdapter {
+  /**
+   * CLI 二进制名称
+   * @returns {string}
+   */
+  get binary() {
+    throw new Error('subclass must implement binary getter');
+  }
+
+  /**
+   * 构建 CLI 启动命令参数（数组形式，第一个元素是二进制名）
+   * @param {object} params
+   * @param {string} params.agent - agent 名称
+   * @param {string} params.systemPrompt - 追加的系统提示词
+   * @param {string} params.mcpConfigPath - MCP 配置文件路径
+   * @param {string} params.cwd - 工作目录
+   * @returns {string[]} 命令数组，如 ['claude', '--agent', 'pm', ...]
+   */
+  buildLaunchArgs({ agent, systemPrompt, mcpConfigPath, cwd, extraArgs = [] }) {
+    throw new Error('subclass must implement buildLaunchArgs');
+  }
+
+  /**
+   * 构建 MCP 配置对象
+   * 返回可写入 JSON 文件的配置，让 CLI 知道如何连接 openteam MCP server。
+   * @param {object} params
+   * @param {string} params.serverUrl - openteam server URL
+   * @param {string} params.agent - agent 名称
+   * @returns {object} MCP 配置 JSON
+   */
+  buildMcpConfig({ serverUrl, agent }) {
+    throw new Error('subclass must implement buildMcpConfig');
+  }
+
+  /**
+   * MCP 配置文件路径（每个 agent 独立，避免多 agent 覆盖冲突）
+   * @param {string} projectDir - 项目目录
+   * @param {string} agent - agent 名称
+   * @returns {string} MCP 配置文件的绝对路径
+   */
+  getMcpConfigPath(projectDir, agent) {
+    throw new Error('subclass must implement getMcpConfigPath');
+  }
+}
+
+/**
+ * 适配器工厂
+ * @param {string} cliType - CLI 类型标识（'claude-code' | 'opencode'）
+ * @returns {BaseAdapter}
+ */
+export async function createAdapter(cliType) {
+  // 动态 import 避免启动时加载所有适配器
+  const adapters = {
+    'claude-code': () => import('./claude-code.js').then(m => new m.ClaudeCodeAdapter()),
+    'opencode': () => import('./opencode.js').then(m => new m.OpenCodeAdapter()),
+  };
+
+  const factory = adapters[cliType];
+  if (!factory) {
+    throw new Error(`Unknown CLI type: "${cliType}". Available: ${Object.keys(adapters).join(', ')}`);
+  }
+  return factory();
+}

package/src/adapters/claude-code.js

@@ -0,0 +1,48 @@
+/**
+ * Claude Code CLI 适配器
+ *
+ * claude code CLI 关键 flags：
+ *   --agent <name>                 agent 模式
+ *   --append-system-prompt <text>  追加系统提示词
+ *   --mcp-config <path>           加载 MCP 配置文件
+ *   --strict-mcp-config           只用 --mcp-config 指定的 MCP server
+ *
+ * MCP 配置格式（.mcp.json 风格）：
+ *   { "openteam": { "type": "http", "url": "http://host:port/mcp?agent=xxx" } }
+ */
+
+import os from 'os';
+import path from 'path';
+import { BaseAdapter } from './base.js';
+
+export class ClaudeCodeAdapter extends BaseAdapter {
+  get binary() { return 'claude'; }
+
+  buildLaunchArgs({ agent, systemPrompt, mcpConfigPath, cwd, extraArgs = [] }) {
+    const args = [this.binary];
+    if (agent) args.push('--agent', agent);
+    if (systemPrompt) args.push('--append-system-prompt', systemPrompt);
+    if (mcpConfigPath) args.push('--mcp-config', mcpConfigPath);
+    args.push(...extraArgs);
+    return args;
+  }
+
+  buildMcpConfig({ serverUrl, agent }) {
+    // claude code --mcp-config 格式：需要 mcpServers 包裹
+    return {
+      mcpServers: {
+        openteam: {
+          type: 'http',
+          url: `${serverUrl}/mcp?agent=${encodeURIComponent(agent)}`,
+        },
+      },
+    };
+  }
+
+  getMcpConfigPath(projectDir, agent) {
+    // 用临时目录避免污染项目的 .mcp.json（可能有用户自己的 MCP 配置）
+    // 每个 agent 独立文件，避免多 agent 覆盖冲突
+    // wrapper 通过 --mcp-config 显式传入这个路径
+    return path.join(os.tmpdir(), `openteam-mcp-${agent}-${encodeURIComponent(path.basename(projectDir))}.json`);
+  }
+}

package/src/adapters/opencode.js

@@ -0,0 +1,37 @@
+/**
+ * OpenCode CLI 适配器
+ *
+ * TODO: opencode 的 CLI flags 和 MCP 配置方式待确认。
+ * 当前实现基于推测，联调时根据实际文档调整。
+ */
+
+import os from 'os';
+import path from 'path';
+import { BaseAdapter } from './base.js';
+
+export class OpenCodeAdapter extends BaseAdapter {
+  get binary() { return 'opencode'; }
+
+  buildLaunchArgs({ agent, systemPrompt, mcpConfigPath, cwd, extraArgs = [] }) {
+    const args = [this.binary];
+    // TODO: opencode 的 system prompt 和 agent 参数待确认
+    if (systemPrompt) args.push('--prompt', systemPrompt);
+    args.push(...extraArgs);
+    return args;
+  }
+
+  buildMcpConfig({ serverUrl, agent }) {
+    // TODO: opencode 的 MCP 配置格式待确认
+    return {
+      openteam: {
+        type: 'http',
+        url: `${serverUrl}/mcp?agent=${encodeURIComponent(agent)}`,
+      },
+    };
+  }
+
+  getMcpConfigPath(projectDir, agent) {
+    // TODO: opencode 的 MCP 配置路径待确认
+    return path.join(os.tmpdir(), `openteam-mcp-opencode-${agent}-${encodeURIComponent(path.basename(projectDir))}.json`);
+  }
+}

package/src/capabilities/taskboard.js

@@ -1,19 +1,29 @@
 /**
  * 任务看板 — 创建/完成/依赖检查/自动通知
+ *
+ * 通知通过 hub.deliver() 投递到消息队列，由 wrapper 轮询取走注入 CLI。
  */
 
 import { loadTasks, saveTasks } from '../foundation/tasks.js';
-import { deliverMessage } from './messaging.js';
 import { isAgentInTeam, getTeamLeader } from '../foundation/config.js';
 import { createLogger } from '../foundation/logger.js';
 
 const log = createLogger('taskboard');
 
 /**
- * 创建任务（仅 leader 可调，权限校验由 tools.js 负责）
+ * 创建任务（仅 leader 可调，权限校验由 mcp.js 负责）
+ * @param {object} params
+ * @param {string} params.teamName
+ * @param {string} params.projectDir
+ * @param {MessageHub} params.hub - 消息中枢
+ * @param {string} params.title
+ * @param {string} params.description
+ * @param {string} params.assignee
+ * @param {number[]} params.dependsOn
+ * @param {string} params.trace
  * @returns {{ ok: true, task: object, triggered: string[] } | { ok: false, error: string }}
  */
-export async function createTask({ teamName, projectDir, serveUrl, title, description, assignee, dependsOn = [], trace }) {
+export async function createTask({ teamName, projectDir, hub, title, description, assignee, dependsOn = [], trace }) {
   // 1. 校验 assignee 在团队中
   if (!isAgentInTeam(teamName, assignee)) {
     return { ok: false, error: `团队中没有 "${assignee}"` };
@@ -45,16 +55,23 @@ export async function createTask({ teamName, projectDir, serveUrl, title, descri
   log.info('task.created', { trace, id: task.id, title, assignee, dependsOn });
 
   // 4. 检查依赖是否已满足，满足则通知
-  const triggered = await notifyIfReady(task, data.tasks, teamName, projectDir, serveUrl, trace);
+  const triggered = notifyIfReady(task, data.tasks, hub, trace);
 
   return { ok: true, task, triggered };
 }
 
 /**
  * 完成任务
+ * @param {object} params
+ * @param {string} params.teamName
+ * @param {string} params.projectDir
+ * @param {MessageHub} params.hub - 消息中枢
+ * @param {string} params.agentName
+ * @param {number} params.taskId
+ * @param {string} params.trace
  * @returns {{ ok: true, task: object, triggered: string[] } | { ok: false, error: string }}
  */
-export async function completeTask({ teamName, projectDir, serveUrl, agentName, taskId, trace }) {
+export async function completeTask({ teamName, projectDir, hub, agentName, taskId, trace }) {
   const data = loadTasks(teamName, projectDir);
   const task = data.tasks.find(t => t.id === taskId);
 
@@ -74,7 +91,7 @@ export async function completeTask({ teamName, projectDir, serveUrl, agentName,
   for (const t of data.tasks) {
     if (t.status !== 'pending') continue;
     if (t.dependsOn.length === 0) continue;
-    if (!t.dependsOn.includes(taskId)) continue; // 不依赖刚完成的任务，跳过
+    if (!t.dependsOn.includes(taskId)) continue;
 
     const allDone = t.dependsOn.every(depId => {
       const dep = data.tasks.find(d => d.id === depId);
@@ -82,7 +99,7 @@ export async function completeTask({ teamName, projectDir, serveUrl, agentName,
     });
 
     if (allDone) {
-      const result = await notifyAssignee(t, teamName, projectDir, serveUrl, trace);
+      const result = notifyAssignee(t, hub, trace);
       triggered.push(`#${t.id} ${t.title} → ${t.assignee} (${result})`);
     }
   }
@@ -92,7 +109,7 @@ export async function completeTask({ teamName, projectDir, serveUrl, agentName,
   if (leader && leader !== agentName) {
     const leaderMsg = `[task #${taskId} done] ${task.title} — ${agentName} 已完成`;
     try {
-      await deliverMessage({ to: leader, message: leaderMsg, teamName, projectDir, serveUrl, trace });
+      hub.deliver({ from: agentName, to: leader, message: leaderMsg });
     } catch (err) {
       log.warn('notifyLeader failed', { trace, taskId, leader, error: err.message });
     }
@@ -114,10 +131,10 @@ export function listTasks(teamName, projectDir) {
 /**
  * 检查任务依赖是否满足，满足则通知 assignee
  */
-async function notifyIfReady(task, allTasks, teamName, projectDir, serveUrl, trace) {
+function notifyIfReady(task, allTasks, hub, trace) {
   if (task.dependsOn.length === 0) {
     // 无依赖，立即通知
-    const result = await notifyAssignee(task, teamName, projectDir, serveUrl, trace);
+    const result = notifyAssignee(task, hub, trace);
     return [`#${task.id} ${task.title} → ${task.assignee} (${result})`];
   }
 
@@ -127,7 +144,7 @@ async function notifyIfReady(task, allTasks, teamName, projectDir, serveUrl, tra
   });
 
   if (allDone) {
-    const result = await notifyAssignee(task, teamName, projectDir, serveUrl, trace);
+    const result = notifyAssignee(task, hub, trace);
     return [`#${task.id} ${task.title} → ${task.assignee} (${result})`];
   }
 
@@ -137,13 +154,14 @@ async function notifyIfReady(task, allTasks, teamName, projectDir, serveUrl, tra
 /**
  * 发送任务就绪通知（通知失败不影响任务操作本身）
  */
-async function notifyAssignee(task, teamName, projectDir, serveUrl, trace) {
+function notifyAssignee(task, hub, trace) {
   const message = task.description
     ? `[task #${task.id}] ${task.title}：${task.description}`
     : `[task #${task.id}] ${task.title}`;
 
   try {
-    return await deliverMessage({ to: task.assignee, message, teamName, projectDir, serveUrl, trace });
+    const result = hub.deliver({ from: 'system', to: task.assignee, message });
+    return `${task.assignee}: ${result.online ? 'delivered' : 'queued'}`;
   } catch (err) {
     log.warn('notifyAssignee failed', { trace, taskId: task.id, assignee: task.assignee, error: err.message });
     return `${task.assignee}: 通知失败 (${err.message})`;

package/src/foundation/config.js

@@ -71,16 +71,17 @@ export function isAgentInTeam(teamName, agentName) {
 
 /**
  * List all teams
+ * 扫描 ~/.openteam/teams/ 下含 team.json 的目录
  */
 export function listTeams() {
-  if (!fs.existsSync(PATHS.AGENTS_DIR)) return [];
+  if (!fs.existsSync(PATHS.TEAMS_DIR)) return [];
 
-  const entries = fs.readdirSync(PATHS.AGENTS_DIR, { withFileTypes: true });
+  const entries = fs.readdirSync(PATHS.TEAMS_DIR, { withFileTypes: true });
   const teams = [];
 
   for (const entry of entries) {
     if (!entry.isDirectory()) continue;
-    const teamConfigPath = path.join(PATHS.AGENTS_DIR, entry.name, FILES.TEAM_CONFIG);
+    const teamConfigPath = path.join(PATHS.TEAMS_DIR, entry.name, FILES.TEAM_CONFIG);
     if (fs.existsSync(teamConfigPath)) {
       teams.push(entry.name);
     }

package/src/foundation/constants.js

@@ -5,17 +5,17 @@ import crypto from 'crypto';
 const homeDir = os.homedir();
 
 export const PATHS = {
-  OPENCODE_DIR: path.join(homeDir, '.opencode'),
-  AGENTS_DIR: path.join(homeDir, '.opencode/agents'),
   OPENTEAM_DIR: path.join(homeDir, '.openteam'),
   SETTINGS: path.join(homeDir, '.openteam', 'settings.json'),
+  AGENTS_DEFS_DIR: path.join(homeDir, '.openteam', 'agents'),   // agent 定义（所有团队共享）
+  SKILLS_DIR: path.join(homeDir, '.openteam', 'skills'),         // skill 定义
+  TEAMS_DIR: path.join(homeDir, '.openteam', 'teams'),           // 团队配置 + 运行时状态
 };
 
 export const FILES = {
   TEAM_CONFIG: 'team.json',
   STATE: '.state.json',
-  RUNTIME: '.runtime.json',
-  ACTIVE_SESSIONS: '.active-sessions.json',
+  RUNTIME: '.runtime.json',              // 迁移兼容用
   TASKS: '.tasks.json',
 };
 
@@ -26,7 +26,7 @@ export const DEFAULTS = {
 };
 
 export function getTeamDir(teamName) {
-  return path.join(PATHS.AGENTS_DIR, teamName);
+  return path.join(PATHS.TEAMS_DIR, teamName);
 }
 
 /**
@@ -38,10 +38,10 @@ export function projectDirHash(projectDir) {
 
 /**
  * 获取团队的项目级状态目录（纯计算，不创建）
- * 路径: ~/.opencode/agents/<teamName>/<hash>/
+ * 路径: ~/.openteam/teams/<teamName>/<hash>/
  */
 export function getTeamStateDir(teamName, projectDir) {
-  return path.join(PATHS.AGENTS_DIR, teamName, projectDirHash(projectDir));
+  return path.join(PATHS.TEAMS_DIR, teamName, projectDirHash(projectDir));
 }
 
 /**