openteam 1.0.6 → 1.0.8

package/package.json

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

package/src/interfaces/cli.js

@@ -16,7 +16,7 @@ import {
   listAllInstances,
 } from '../foundation/state.js';
 import { detectMultiplexer, getSessionState, hasSession, findSessionsByPrefix, attachSession, startSession, killSession, isInsideMux } from '../foundation/terminal.js';
-import { buildWrapperCmd } from './daemon/panes.js';
+import { buildWrapperCmd, buildWrapperOptions } from './daemon/panes.js';
 
 // ── 输出辅助 ──
 
@@ -156,13 +156,10 @@ export async function cmdStart(teamName, options) {
   const daemonCmd = `openteam daemon ${teamName} --port ${port} --dir "${projectDir}" --mux ${mux} --cli ${cliType}`;
 
   // zellij: 构建 wrapper 命令，由 team layout 的 stacked panes 自动调用
-  const cliArgs = teamConfig.cli_config?.[cliType]?.args || [];
-  const wrapperOptions = {
+  const wrapperOptions = buildWrapperOptions(teamConfig, {
     serverUrl: `http://127.0.0.1:${port}`,
     teamName, projectDir, cliType,
-    agents: teamConfig.agents,
-    cliArgs,
-  };
+  });
   const agentCmds = mux === 'zellij' ? teamConfig.agents.map(agent => ({
     name: agent,
     cmd: buildWrapperCmd(agent, wrapperOptions, { mux, sessionName }),

package/src/interfaces/daemon/index.js

@@ -14,7 +14,7 @@ import { DEFAULTS, getSessionName } from '../../foundation/constants.js';
 import { createLogger } from '../../foundation/logger.js';
 import { cleanMuxEnv } from '../../foundation/terminal.js';
 import { startServe, stopServe } from './serve.js';
-import { createAllAgentPanes, checkAndRespawn } from './panes.js';
+import { createAllAgentPanes, checkAndRespawn, buildWrapperOptions } from './panes.js';
 import { createEmbeddedDashboard } from '../dashboard/index.js';
 
 const log = createLogger('daemon');
@@ -70,7 +70,10 @@ export async function runDaemon(teamName, projectDir, options = {}) {
     started: new Date().toISOString(),
   });
 
-  // ── 2. 确保 agent/skill 软链接 ──
+  // ── 2. 读取 CLI 配置 ──
+  const keepDefaultSP = !!teamConfig.cli_config?.[cliType]?.keep_default_system_prompt;
+
+  // ── 3. 确保 agent/skill 软链接 ──
   const { ensureLinks } = await import('./links.js');
   const linkResult = ensureLinks({ teamName, projectDir, cliType, agents, skipAgentLinks: keepDefaultSP });
   if (!linkResult.ok) {
@@ -86,19 +89,10 @@ export async function runDaemon(teamName, projectDir, options = {}) {
     console.log(`已创建 ${linkResult.linked.length} 个链接`);
   }
 
-  // ── 3. wrapper 环境配置 ──
-  const cliConf = teamConfig.cli_config?.[cliType] || {};
-  const cliArgs = cliConf.args || [];
-  const keepDefaultSP = !!cliConf.keep_default_system_prompt;
-  const wrapperOptions = {
-    serverUrl: serve.url,
-    teamName,
-    projectDir,
-    cliType,
-    agents,
-    cliArgs,
-    keepDefaultSP,
-  };
+  // ── 4. wrapper 环境配置 ──
+  const wrapperOptions = buildWrapperOptions(teamConfig, {
+    serverUrl: serve.url, teamName, projectDir, cliType,
+  });
 
   // ── 4. 创建 agent panes ──
   // zellij: layout 已在 startSession 时创建好 stacked agents

package/src/interfaces/daemon/panes.js

@@ -152,3 +152,27 @@ export function buildWrapperCmd(agent, wrapperOptions, muxInfo) {
 
   return `env ${envVars.join(' ')} ${wrapperBin}`;
 }
+
+/**
+ * 从 teamConfig 构建 wrapperOptions — 唯一入口，消除重复构建
+ *
+ * @param {object} teamConfig - 团队配置
+ * @param {object} runtime - 运行时信息
+ * @param {string} runtime.serverUrl
+ * @param {string} runtime.teamName
+ * @param {string} runtime.projectDir
+ * @param {string} runtime.cliType
+ * @returns {object} wrapperOptions
+ */
+export function buildWrapperOptions(teamConfig, { serverUrl, teamName, projectDir, cliType }) {
+  const cliConf = teamConfig.cli_config?.[cliType] || {};
+  return {
+    serverUrl,
+    teamName,
+    projectDir,
+    cliType,
+    agents: teamConfig.agents,
+    cliArgs: cliConf.args || [],
+    keepDefaultSP: !!cliConf.keep_default_system_prompt,
+  };
+}

package/src/wrapper/index.js

@@ -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 辅助函数 ──